annotate h264.c @ 2548:bca31bc0cbae libavcodec

spam
author michael
date Sun, 06 Mar 2005 19:59:37 +0000
parents c5781912ad8a
children 615995277bc5
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 */
2471
805431763e84 fixing missaligned memory accesses in fill_rectangle()
michael
parents: 2454
diff changeset
185 uint8_t non_zero_count_cache[6*8] __align8;
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
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 */
2471
805431763e84 fixing missaligned memory accesses in fill_rectangle()
michael
parents: 2454
diff changeset
191 int16_t mv_cache[2][5*8][2] __align8;
805431763e84 fixing missaligned memory accesses in fill_rectangle()
michael
parents: 2454
diff changeset
192 int8_t ref_cache[2][5*8] __align8;
1168
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;
2395
81516be6d0e4 vismv for h264 displayed incorrect motion vectors.
lorenm
parents: 2392
diff changeset
206 int b_stride; //FIXME use s->b4_stride
1168
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
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
258 int use_weight;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
259 int use_weight_chroma;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
260 int luma_log2_weight_denom;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
261 int chroma_log2_weight_denom;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
262 int luma_weight[2][16];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
263 int luma_offset[2][16];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
264 int chroma_weight[2][16][2];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
265 int chroma_offset[2][16][2];
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
266 int implicit_weight[16][16];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
267
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
268 //deblock
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
269 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
270 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
271 int slice_beta_offset;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
272
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
273 int redundant_pic_count;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
274
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
275 int direct_spatial_mv_pred;
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
276 int dist_scale_factor[16];
2537
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
277 int map_col_to_list0[2][16];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
278
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
279 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
280 * num_ref_idx_l0/1_active_minus1 + 1
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
281 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
282 int ref_count[2];// FIXME split for AFF
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
283 Picture *short_ref[16];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
284 Picture *long_ref[16];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
285 Picture default_ref_list[2][32];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
286 Picture ref_list[2][32]; //FIXME size?
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
287 Picture field_ref_list[2][32]; //FIXME size?
2409
26778a857b5b Sort B-frames into display order.
lorenm
parents: 2404
diff changeset
288 Picture *delayed_pic[16]; //FIXME size?
2537
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
289 int delayed_output_poc;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
290
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
291 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
292 * memory management control operations buffer.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
293 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
294 MMCO mmco[MAX_MMCO_COUNT];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
295 int mmco_index;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
296
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
297 int long_ref_count; ///< number of actual long term references
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
298 int short_ref_count; ///< number of actual short term references
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
299
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
300 //data partitioning
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
301 GetBitContext intra_gb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
302 GetBitContext inter_gb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
303 GetBitContext *intra_gb_ptr;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
304 GetBitContext *inter_gb_ptr;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
305
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
306 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
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 /**
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
309 * Cabac
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
310 */
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
311 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
312 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
313 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
314
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
315 /* 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
316 uint16_t *cbp_table;
2314
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
317 int top_cbp;
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
318 int left_cbp;
1956
0eb2947f56f6 h264 hurry up fix and a tiny cabac clean patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1935
diff changeset
319 /* 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
320 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
321 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
322 int16_t (*mvd_table[2])[2];
2471
805431763e84 fixing missaligned memory accesses in fill_rectangle()
michael
parents: 2454
diff changeset
323 int16_t mvd_cache[2][5*8][2] __align8;
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
324 uint8_t *direct_table;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
325 uint8_t direct_cache[5*8];
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
326
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
327 }H264Context;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
328
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
329 static VLC coeff_token_vlc[4];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
330 static VLC chroma_dc_coeff_token_vlc;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
331
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
332 static VLC total_zeros_vlc[15];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
333 static VLC chroma_dc_total_zeros_vlc[3];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
334
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
335 static VLC run_vlc[6];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
336 static VLC run7_vlc;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
337
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
338 static void svq3_luma_dc_dequant_idct_c(DCTELEM *block, int qp);
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
339 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
340 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
341
1269
2498a7045b37 bigendian fix
michaelni
parents: 1266
diff changeset
342 static inline uint32_t pack16to32(int a, int b){
2498a7045b37 bigendian fix
michaelni
parents: 1266
diff changeset
343 #ifdef WORDS_BIGENDIAN
2498a7045b37 bigendian fix
michaelni
parents: 1266
diff changeset
344 return (b&0xFFFF) + (a<<16);
2498a7045b37 bigendian fix
michaelni
parents: 1266
diff changeset
345 #else
2498a7045b37 bigendian fix
michaelni
parents: 1266
diff changeset
346 return (a&0xFFFF) + (b<<16);
2498a7045b37 bigendian fix
michaelni
parents: 1266
diff changeset
347 #endif
2498a7045b37 bigendian fix
michaelni
parents: 1266
diff changeset
348 }
2498a7045b37 bigendian fix
michaelni
parents: 1266
diff changeset
349
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
350 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
351 * fill a rectangle.
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
352 * @param h height of the rectangle, should be a constant
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
353 * @param w width of the rectangle, should be a constant
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
354 * @param size the size of val (1 or 4), should be a constant
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
355 */
1187
f3c659bfdb8e minor cleanup / some warning fixes
michaelni
parents: 1184
diff changeset
356 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
357 uint8_t *p= (uint8_t*)vp;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
358 assert(size==1 || size==4);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
359
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
360 w *= size;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
361 stride *= size;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
362
2471
805431763e84 fixing missaligned memory accesses in fill_rectangle()
michael
parents: 2454
diff changeset
363 assert((((int)vp)&(FFMIN(w, STRIDE_ALIGN)-1)) == 0);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
364 //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
365 if(w==2 && h==2){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
366 *(uint16_t*)(p + 0)=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
367 *(uint16_t*)(p + stride)= size==4 ? val : val*0x0101;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
368 }else if(w==2 && h==4){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
369 *(uint16_t*)(p + 0*stride)=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
370 *(uint16_t*)(p + 1*stride)=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
371 *(uint16_t*)(p + 2*stride)=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
372 *(uint16_t*)(p + 3*stride)= size==4 ? val : val*0x0101;
1252
67ee8bab0f28 optimizations
michaelni
parents: 1250
diff changeset
373 }else if(w==4 && h==1){
67ee8bab0f28 optimizations
michaelni
parents: 1250
diff changeset
374 *(uint32_t*)(p + 0*stride)= size==4 ? val : val*0x01010101;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
375 }else if(w==4 && h==2){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
376 *(uint32_t*)(p + 0*stride)=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
377 *(uint32_t*)(p + 1*stride)= size==4 ? val : val*0x01010101;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
378 }else if(w==4 && h==4){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
379 *(uint32_t*)(p + 0*stride)=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
380 *(uint32_t*)(p + 1*stride)=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
381 *(uint32_t*)(p + 2*stride)=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
382 *(uint32_t*)(p + 3*stride)= size==4 ? val : val*0x01010101;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
383 }else if(w==8 && h==1){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
384 *(uint32_t*)(p + 0)=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
385 *(uint32_t*)(p + 4)= size==4 ? val : val*0x01010101;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
386 }else if(w==8 && h==2){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
387 *(uint32_t*)(p + 0 + 0*stride)=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
388 *(uint32_t*)(p + 4 + 0*stride)=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
389 *(uint32_t*)(p + 0 + 1*stride)=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
390 *(uint32_t*)(p + 4 + 1*stride)= size==4 ? val : val*0x01010101;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
391 }else if(w==8 && h==4){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
392 *(uint64_t*)(p + 0*stride)=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
393 *(uint64_t*)(p + 1*stride)=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
394 *(uint64_t*)(p + 2*stride)=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
395 *(uint64_t*)(p + 3*stride)= size==4 ? val*0x0100000001ULL : val*0x0101010101010101ULL;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
396 }else if(w==16 && h==2){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
397 *(uint64_t*)(p + 0+0*stride)=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
398 *(uint64_t*)(p + 8+0*stride)=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
399 *(uint64_t*)(p + 0+1*stride)=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
400 *(uint64_t*)(p + 8+1*stride)= size==4 ? val*0x0100000001ULL : val*0x0101010101010101ULL;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
401 }else if(w==16 && h==4){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
402 *(uint64_t*)(p + 0+0*stride)=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
403 *(uint64_t*)(p + 8+0*stride)=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
404 *(uint64_t*)(p + 0+1*stride)=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
405 *(uint64_t*)(p + 8+1*stride)=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
406 *(uint64_t*)(p + 0+2*stride)=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
407 *(uint64_t*)(p + 8+2*stride)=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
408 *(uint64_t*)(p + 0+3*stride)=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
409 *(uint64_t*)(p + 8+3*stride)= size==4 ? val*0x0100000001ULL : val*0x0101010101010101ULL;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
410 }else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
411 assert(0);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
412 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
413
2449
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
414 static inline void fill_caches(H264Context *h, int mb_type, int for_deblock){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
415 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
416 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
417 int topleft_xy, top_xy, topright_xy, left_xy[2];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
418 int topleft_type, top_type, topright_type, left_type[2];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
419 int left_block[4];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
420 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
421
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
422 //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
423
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
424 if(h->sps.mb_aff){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
425 //FIXME
1453
20a79b0e6d2a removed warnings
bellard
parents: 1371
diff changeset
426 topleft_xy = 0; /* avoid warning */
20a79b0e6d2a removed warnings
bellard
parents: 1371
diff changeset
427 top_xy = 0; /* avoid warning */
20a79b0e6d2a removed warnings
bellard
parents: 1371
diff changeset
428 topright_xy = 0; /* avoid warning */
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
429 }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
430 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
431 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
432 topright_xy= mb_xy+1 - s->mb_stride;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
433 left_xy[0] = mb_xy-1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
434 left_xy[1] = mb_xy-1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
435 left_block[0]= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
436 left_block[1]= 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
437 left_block[2]= 2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
438 left_block[3]= 3;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
439 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
440
2449
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
441 if(for_deblock){
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
442 topleft_type = h->slice_table[topleft_xy ] < 255 ? s->current_picture.mb_type[topleft_xy] : 0;
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
443 top_type = h->slice_table[top_xy ] < 255 ? s->current_picture.mb_type[top_xy] : 0;
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
444 topright_type= h->slice_table[topright_xy] < 255 ? s->current_picture.mb_type[topright_xy]: 0;
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
445 left_type[0] = h->slice_table[left_xy[0] ] < 255 ? s->current_picture.mb_type[left_xy[0]] : 0;
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
446 left_type[1] = h->slice_table[left_xy[1] ] < 255 ? s->current_picture.mb_type[left_xy[1]] : 0;
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
447 }else{
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
448 topleft_type = h->slice_table[topleft_xy ] == h->slice_num ? s->current_picture.mb_type[topleft_xy] : 0;
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
449 top_type = h->slice_table[top_xy ] == h->slice_num ? s->current_picture.mb_type[top_xy] : 0;
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
450 topright_type= h->slice_table[topright_xy] == h->slice_num ? s->current_picture.mb_type[topright_xy]: 0;
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
451 left_type[0] = h->slice_table[left_xy[0] ] == h->slice_num ? s->current_picture.mb_type[left_xy[0]] : 0;
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
452 left_type[1] = h->slice_table[left_xy[1] ] == h->slice_num ? s->current_picture.mb_type[left_xy[1]] : 0;
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
453 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
454
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
455 if(IS_INTRA(mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
456 h->topleft_samples_available=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
457 h->top_samples_available=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
458 h->left_samples_available= 0xFFFF;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
459 h->topright_samples_available= 0xEEEA;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
460
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
461 if(!IS_INTRA(top_type) && (top_type==0 || h->pps.constrained_intra_pred)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
462 h->topleft_samples_available= 0xB3FF;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
463 h->top_samples_available= 0x33FF;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
464 h->topright_samples_available= 0x26EA;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
465 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
466 for(i=0; i<2; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
467 if(!IS_INTRA(left_type[i]) && (left_type[i]==0 || h->pps.constrained_intra_pred)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
468 h->topleft_samples_available&= 0xDF5F;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
469 h->left_samples_available&= 0x5F5F;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
470 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
471 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
472
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
473 if(!IS_INTRA(topleft_type) && (topleft_type==0 || h->pps.constrained_intra_pred))
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
474 h->topleft_samples_available&= 0x7FFF;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
475
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
476 if(!IS_INTRA(topright_type) && (topright_type==0 || h->pps.constrained_intra_pred))
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
477 h->topright_samples_available&= 0xFBFF;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
478
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
479 if(IS_INTRA4x4(mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
480 if(IS_INTRA4x4(top_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
481 h->intra4x4_pred_mode_cache[4+8*0]= h->intra4x4_pred_mode[top_xy][4];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
482 h->intra4x4_pred_mode_cache[5+8*0]= h->intra4x4_pred_mode[top_xy][5];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
483 h->intra4x4_pred_mode_cache[6+8*0]= h->intra4x4_pred_mode[top_xy][6];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
484 h->intra4x4_pred_mode_cache[7+8*0]= h->intra4x4_pred_mode[top_xy][3];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
485 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
486 int pred;
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
487 if(!top_type || (IS_INTER(top_type) && h->pps.constrained_intra_pred))
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
488 pred= -1;
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
489 else{
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
490 pred= 2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
491 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
492 h->intra4x4_pred_mode_cache[4+8*0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
493 h->intra4x4_pred_mode_cache[5+8*0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
494 h->intra4x4_pred_mode_cache[6+8*0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
495 h->intra4x4_pred_mode_cache[7+8*0]= pred;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
496 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
497 for(i=0; i<2; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
498 if(IS_INTRA4x4(left_type[i])){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
499 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
500 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
501 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
502 int pred;
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
503 if(!left_type[i] || (IS_INTER(left_type[i]) && h->pps.constrained_intra_pred))
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
504 pred= -1;
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
505 else{
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
506 pred= 2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
507 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
508 h->intra4x4_pred_mode_cache[3+8*1 + 2*8*i]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
509 h->intra4x4_pred_mode_cache[3+8*2 + 2*8*i]= pred;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
510 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
511 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
512 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
513 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
514
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
515
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
516 /*
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
517 0 . T T. T T T T
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
518 1 L . .L . . . .
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
519 2 L . .L . . . .
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
520 3 . T TL . . . .
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
521 4 L . .L . . . .
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
522 5 L . .. . . . .
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
523 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
524 //FIXME constraint_intra_pred & partitioning & nnz (lets hope this is just a typo in the spec)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
525 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
526 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
527 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
528 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
529 h->non_zero_count_cache[7+8*0]= h->non_zero_count[top_xy][3];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
530
1899
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[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
532 h->non_zero_count_cache[2+8*0]= h->non_zero_count[top_xy][8];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
533
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
534 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
535 h->non_zero_count_cache[2+8*3]= h->non_zero_count[top_xy][11];
2314
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
536
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
537 h->top_cbp= h->cbp_table[top_xy];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
538 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
539 h->non_zero_count_cache[4+8*0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
540 h->non_zero_count_cache[5+8*0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
541 h->non_zero_count_cache[6+8*0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
542 h->non_zero_count_cache[7+8*0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
543
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
544 h->non_zero_count_cache[1+8*0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
545 h->non_zero_count_cache[2+8*0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
546
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
547 h->non_zero_count_cache[1+8*3]=
2314
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
548 h->non_zero_count_cache[2+8*3]= h->pps.cabac && !IS_INTRA(mb_type) ? 0 : 64;
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
549
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
550 if(IS_INTRA(mb_type)) h->top_cbp= 0x1C0;
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
551 else h->top_cbp= 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
552 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
553
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
554 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
555 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
556 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
557 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
558 h->non_zero_count_cache[0+8*4]= h->non_zero_count[left_xy[0]][12];
2314
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
559 h->left_cbp= h->cbp_table[left_xy[0]]; //FIXME interlacing
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
560 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
561 h->non_zero_count_cache[3+8*1]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
562 h->non_zero_count_cache[3+8*2]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
563 h->non_zero_count_cache[0+8*1]=
2314
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
564 h->non_zero_count_cache[0+8*4]= h->pps.cabac && !IS_INTRA(mb_type) ? 0 : 64;
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
565
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
566 if(IS_INTRA(mb_type)) h->left_cbp= 0x1C0;//FIXME interlacing
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
567 else h->left_cbp= 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
568 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
569
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
570 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
571 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
572 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
573 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
574 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
575 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
576 h->non_zero_count_cache[3+8*3]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
577 h->non_zero_count_cache[3+8*4]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
578 h->non_zero_count_cache[0+8*2]=
2314
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
579 h->non_zero_count_cache[0+8*5]= h->pps.cabac && !IS_INTRA(mb_type) ? 0 : 64;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
580 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
581
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
582 #if 1
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
583 //FIXME direct mb can skip much of this
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
584 if(IS_INTER(mb_type) || (IS_DIRECT(mb_type) && h->direct_spatial_mv_pred)){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
585 int list;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
586 for(list=0; list<2; list++){
2535
e0bf024629cf vismv didn't display 8x8 mvs in H.264
lorenm
parents: 2523
diff changeset
587 if(!USES_LIST(mb_type, list) && !IS_DIRECT(mb_type) && !for_deblock){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
588 /*if(!h->mv_cache_clean[list]){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
589 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
590 memset(h->ref_cache[list], PART_NOT_AVAILABLE, 8*5*sizeof(int8_t));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
591 h->mv_cache_clean[list]= 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
592 }*/
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
593 continue;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
594 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
595 h->mv_cache_clean[list]= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
596
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
597 if(IS_INTER(topleft_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
598 const int b_xy = h->mb2b_xy[topleft_xy] + 3 + 3*h->b_stride;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
599 const int b8_xy= h->mb2b8_xy[topleft_xy] + 1 + h->b8_stride;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
600 *(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
601 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
602 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
603 *(uint32_t*)h->mv_cache[list][scan8[0] - 1 - 1*8]= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
604 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
605 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
606
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
607 if(IS_INTER(top_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
608 const int b_xy= h->mb2b_xy[top_xy] + 3*h->b_stride;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
609 const int b8_xy= h->mb2b8_xy[top_xy] + h->b8_stride;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
610 *(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
611 *(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
612 *(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
613 *(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
614 h->ref_cache[list][scan8[0] + 0 - 1*8]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
615 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
616 h->ref_cache[list][scan8[0] + 2 - 1*8]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
617 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
618 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
619 *(uint32_t*)h->mv_cache [list][scan8[0] + 0 - 1*8]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
620 *(uint32_t*)h->mv_cache [list][scan8[0] + 1 - 1*8]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
621 *(uint32_t*)h->mv_cache [list][scan8[0] + 2 - 1*8]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
622 *(uint32_t*)h->mv_cache [list][scan8[0] + 3 - 1*8]= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
623 *(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
624 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
625
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
626 if(IS_INTER(topright_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
627 const int b_xy= h->mb2b_xy[topright_xy] + 3*h->b_stride;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
628 const int b8_xy= h->mb2b8_xy[topright_xy] + h->b8_stride;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
629 *(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
630 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
631 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
632 *(uint32_t*)h->mv_cache [list][scan8[0] + 4 - 1*8]= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
633 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
634 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
635
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
636 //FIXME unify cleanup or sth
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
637 if(IS_INTER(left_type[0])){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
638 const int b_xy= h->mb2b_xy[left_xy[0]] + 3;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
639 const int b8_xy= h->mb2b8_xy[left_xy[0]] + 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
640 *(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
641 *(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
642 h->ref_cache[list][scan8[0] - 1 + 0*8]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
643 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
644 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
645 *(uint32_t*)h->mv_cache [list][scan8[0] - 1 + 0*8]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
646 *(uint32_t*)h->mv_cache [list][scan8[0] - 1 + 1*8]= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
647 h->ref_cache[list][scan8[0] - 1 + 0*8]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
648 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
649 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
650
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
651 if(IS_INTER(left_type[1])){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
652 const int b_xy= h->mb2b_xy[left_xy[1]] + 3;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
653 const int b8_xy= h->mb2b8_xy[left_xy[1]] + 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
654 *(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
655 *(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
656 h->ref_cache[list][scan8[0] - 1 + 2*8]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
657 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
658 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
659 *(uint32_t*)h->mv_cache [list][scan8[0] - 1 + 2*8]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
660 *(uint32_t*)h->mv_cache [list][scan8[0] - 1 + 3*8]= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
661 h->ref_cache[list][scan8[0] - 1 + 2*8]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
662 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
663 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
664
2449
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
665 if(for_deblock)
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
666 continue;
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
667
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
668 h->ref_cache[list][scan8[5 ]+1] =
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
669 h->ref_cache[list][scan8[7 ]+1] =
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
670 h->ref_cache[list][scan8[13]+1] = //FIXME remove past 3 (init somewher else)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
671 h->ref_cache[list][scan8[4 ]] =
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
672 h->ref_cache[list][scan8[12]] = PART_NOT_AVAILABLE;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
673 *(uint32_t*)h->mv_cache [list][scan8[5 ]+1]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
674 *(uint32_t*)h->mv_cache [list][scan8[7 ]+1]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
675 *(uint32_t*)h->mv_cache [list][scan8[13]+1]= //FIXME remove past 3 (init somewher else)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
676 *(uint32_t*)h->mv_cache [list][scan8[4 ]]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
677 *(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
678
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
679 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
680 /* 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
681 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
682 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
683 *(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
684 }else{
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[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
686 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
687
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
688 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
689 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
690 *(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
691 *(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
692 *(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
693 *(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
694 }else{
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
695 *(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
696 *(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
697 *(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
698 *(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
699 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
700 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
701 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
702 *(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
703 *(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
704 }else{
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
705 *(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
706 *(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
707 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
708 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
709 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
710 *(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
711 *(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
712 }else{
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
713 *(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
714 *(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
715 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
716 *(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
717 *(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
718 *(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
719 *(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
720 *(uint32_t*)h->mvd_cache [list][scan8[12]]= 0;
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
721
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
722 if(h->slice_type == B_TYPE){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
723 fill_rectangle(&h->direct_cache[scan8[0]], 4, 4, 8, 0, 1);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
724
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
725 if(IS_DIRECT(top_type)){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
726 *(uint32_t*)&h->direct_cache[scan8[0] - 1*8]= 0x01010101;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
727 }else if(IS_8X8(top_type)){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
728 int b8_xy = h->mb2b8_xy[top_xy] + h->b8_stride;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
729 h->direct_cache[scan8[0] + 0 - 1*8]= h->direct_table[b8_xy];
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
730 h->direct_cache[scan8[0] + 2 - 1*8]= h->direct_table[b8_xy + 1];
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
731 }else{
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
732 *(uint32_t*)&h->direct_cache[scan8[0] - 1*8]= 0;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
733 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
734
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
735 //FIXME interlacing
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
736 if(IS_DIRECT(left_type[0])){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
737 h->direct_cache[scan8[0] - 1 + 0*8]=
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
738 h->direct_cache[scan8[0] - 1 + 2*8]= 1;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
739 }else if(IS_8X8(left_type[0])){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
740 int b8_xy = h->mb2b8_xy[left_xy[0]] + 1;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
741 h->direct_cache[scan8[0] - 1 + 0*8]= h->direct_table[b8_xy];
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
742 h->direct_cache[scan8[0] - 1 + 2*8]= h->direct_table[b8_xy + h->b8_stride];
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
743 }else{
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
744 h->direct_cache[scan8[0] - 1 + 0*8]=
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
745 h->direct_cache[scan8[0] - 1 + 2*8]= 0;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
746 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
747 }
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
748 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
749 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
750 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
751 #endif
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
752 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
753
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
754 static inline void write_back_intra_pred_mode(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
755 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
756 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
757
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
758 h->intra4x4_pred_mode[mb_xy][0]= h->intra4x4_pred_mode_cache[7+8*1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
759 h->intra4x4_pred_mode[mb_xy][1]= h->intra4x4_pred_mode_cache[7+8*2];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
760 h->intra4x4_pred_mode[mb_xy][2]= h->intra4x4_pred_mode_cache[7+8*3];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
761 h->intra4x4_pred_mode[mb_xy][3]= h->intra4x4_pred_mode_cache[7+8*4];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
762 h->intra4x4_pred_mode[mb_xy][4]= h->intra4x4_pred_mode_cache[4+8*4];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
763 h->intra4x4_pred_mode[mb_xy][5]= h->intra4x4_pred_mode_cache[5+8*4];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
764 h->intra4x4_pred_mode[mb_xy][6]= h->intra4x4_pred_mode_cache[6+8*4];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
765 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
766
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
767 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
768 * 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
769 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
770 static inline int check_intra4x4_pred_mode(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
771 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
772 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
773 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
774 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
775
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
776 if(!(h->top_samples_available&0x8000)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
777 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
778 int status= top[ h->intra4x4_pred_mode_cache[scan8[0] + i] ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
779 if(status<0){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
780 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
781 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
782 } else if(status){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
783 h->intra4x4_pred_mode_cache[scan8[0] + i]= status;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
784 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
785 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
786 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
787
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
788 if(!(h->left_samples_available&0x8000)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
789 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
790 int status= left[ h->intra4x4_pred_mode_cache[scan8[0] + 8*i] ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
791 if(status<0){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
792 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
793 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
794 } else if(status){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
795 h->intra4x4_pred_mode_cache[scan8[0] + 8*i]= status;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
796 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
797 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
798 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
799
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
800 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
801 } //FIXME cleanup like next
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
802
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
803 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
804 * 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
805 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
806 static inline int check_intra_pred_mode(H264Context *h, int mode){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
807 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
808 static const int8_t top [7]= {LEFT_DC_PRED8x8, 1,-1,-1};
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
809 static const int8_t left[7]= { TOP_DC_PRED8x8,-1, 2,-1,DC_128_PRED8x8};
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
810
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
811 if(mode < 0 || mode > 6) {
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
812 av_log(h->s.avctx, AV_LOG_ERROR, "out of range intra chroma pred mode at %d %d\n", s->mb_x, s->mb_y);
2163
b25df257eab0 segfault fix
michael
parents: 2116
diff changeset
813 return -1;
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
814 }
2163
b25df257eab0 segfault fix
michael
parents: 2116
diff changeset
815
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
816 if(!(h->top_samples_available&0x8000)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
817 mode= top[ mode ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
818 if(mode<0){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
819 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
820 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
821 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
822 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
823
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
824 if(!(h->left_samples_available&0x8000)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
825 mode= left[ mode ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
826 if(mode<0){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
827 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
828 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
829 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
830 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
831
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
832 return mode;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
833 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
834
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
835 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
836 * gets the predicted intra4x4 prediction mode.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
837 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
838 static inline int pred_intra_mode(H264Context *h, int n){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
839 const int index8= scan8[n];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
840 const int left= h->intra4x4_pred_mode_cache[index8 - 1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
841 const int top = h->intra4x4_pred_mode_cache[index8 - 8];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
842 const int min= FFMIN(left, top);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
843
1170
4710976004a5 #ifdef TRACE printf() -> tprintf()
michaelni
parents: 1169
diff changeset
844 tprintf("mode:%d %d min:%d\n", left ,top, min);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
845
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
846 if(min<0) return DC_PRED;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
847 else return min;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
848 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
849
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
850 static inline void write_back_non_zero_count(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
851 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
852 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
853
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
854 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
855 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
856 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
857 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
858 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
859 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
860 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
861
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
862 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
863 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
864 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
865
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
866 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
867 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
868 h->non_zero_count[mb_xy][12]=h->non_zero_count_cache[2+8*4];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
869 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
870
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
871 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
872 * gets the predicted number of non zero coefficients.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
873 * @param n block index
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
874 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
875 static inline int pred_non_zero_count(H264Context *h, int n){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
876 const int index8= scan8[n];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
877 const int left= h->non_zero_count_cache[index8 - 1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
878 const int top = h->non_zero_count_cache[index8 - 8];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
879 int i= left + top;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
880
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
881 if(i<64) i= (i+1)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
882
1170
4710976004a5 #ifdef TRACE printf() -> tprintf()
michaelni
parents: 1169
diff changeset
883 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
884
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
885 return i&31;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
886 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
887
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
888 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
889 const int topright_ref= h->ref_cache[list][ i - 8 + part_width ];
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
890
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
891 if(topright_ref != PART_NOT_AVAILABLE){
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
892 *C= h->mv_cache[list][ i - 8 + part_width ];
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
893 return topright_ref;
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
894 }else{
1170
4710976004a5 #ifdef TRACE printf() -> tprintf()
michaelni
parents: 1169
diff changeset
895 tprintf("topright MV not available\n");
4710976004a5 #ifdef TRACE printf() -> tprintf()
michaelni
parents: 1169
diff changeset
896
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
897 *C= h->mv_cache[list][ i - 8 - 1 ];
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
898 return h->ref_cache[list][ i - 8 - 1 ];
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
899 }
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
900 }
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
901
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
902 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
903 * gets the predicted MV.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
904 * @param n the block index
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
905 * @param part_width the width of the partition (4, 8,16) -> (1, 2, 4)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
906 * @param mx the x component of the predicted motion vector
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
907 * @param my the y component of the predicted motion vector
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
908 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
909 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
910 const int index8= scan8[n];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
911 const int top_ref= h->ref_cache[list][ index8 - 8 ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
912 const int left_ref= h->ref_cache[list][ index8 - 1 ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
913 const int16_t * const A= h->mv_cache[list][ index8 - 1 ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
914 const int16_t * const B= h->mv_cache[list][ index8 - 8 ];
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
915 const int16_t * C;
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
916 int diagonal_ref, match_count;
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
917
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
918 assert(part_width==1 || part_width==2 || part_width==4);
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
919
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
920 /* mv_cache
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
921 B . . A T T T T
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
922 U . . L . . , .
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
923 U . . L . . . .
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
924 U . . L . . , .
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
925 . . . L . . . .
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
926 */
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
927
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
928 diagonal_ref= fetch_diagonal_mv(h, &C, index8, list, part_width);
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
929 match_count= (diagonal_ref==ref) + (top_ref==ref) + (left_ref==ref);
2441
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
930 tprintf("pred_motion match_count=%d\n", match_count);
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
931 if(match_count > 1){ //most common
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
932 *mx= mid_pred(A[0], B[0], C[0]);
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
933 *my= mid_pred(A[1], B[1], C[1]);
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
934 }else if(match_count==1){
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
935 if(left_ref==ref){
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
936 *mx= A[0];
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
937 *my= A[1];
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
938 }else if(top_ref==ref){
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
939 *mx= B[0];
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
940 *my= B[1];
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
941 }else{
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
942 *mx= C[0];
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
943 *my= C[1];
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
944 }
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
945 }else{
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
946 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
947 *mx= A[0];
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
948 *my= A[1];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
949 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
950 *mx= mid_pred(A[0], B[0], C[0]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
951 *my= mid_pred(A[1], B[1], C[1]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
952 }
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
953 }
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_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
956 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
957
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
958 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
959 * gets the directionally predicted 16x8 MV.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
960 * @param n the block index
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
961 * @param mx the x component of the predicted motion vector
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
962 * @param my the y component of the predicted motion vector
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
963 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
964 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
965 if(n==0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
966 const int top_ref= h->ref_cache[list][ scan8[0] - 8 ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
967 const int16_t * const B= h->mv_cache[list][ scan8[0] - 8 ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
968
2402
f9d4e1eddbc5 - correct several errors on the deblocking accross slice boundaries.
michael
parents: 2401
diff changeset
969 tprintf("pred_16x8: (%2d %2d %2d) at %2d %2d %d list %d\n", top_ref, B[0], B[1], h->s.mb_x, h->s.mb_y, n, list);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
970
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
971 if(top_ref == ref){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
972 *mx= B[0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
973 *my= B[1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
974 return;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
975 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
976 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
977 const int left_ref= h->ref_cache[list][ scan8[8] - 1 ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
978 const int16_t * const A= h->mv_cache[list][ scan8[8] - 1 ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
979
2402
f9d4e1eddbc5 - correct several errors on the deblocking accross slice boundaries.
michael
parents: 2401
diff changeset
980 tprintf("pred_16x8: (%2d %2d %2d) at %2d %2d %d list %d\n", left_ref, A[0], A[1], h->s.mb_x, h->s.mb_y, n, list);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
981
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
982 if(left_ref == ref){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
983 *mx= A[0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
984 *my= A[1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
985 return;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
986 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
987 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
988
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
989 //RARE
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
990 pred_motion(h, n, 4, list, ref, mx, my);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
991 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
992
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
993 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
994 * gets the directionally predicted 8x16 MV.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
995 * @param n the block index
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
996 * @param mx the x component of the predicted motion vector
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
997 * @param my the y component of the predicted motion vector
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
998 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
999 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
1000 if(n==0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1001 const int left_ref= h->ref_cache[list][ scan8[0] - 1 ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1002 const int16_t * const A= h->mv_cache[list][ scan8[0] - 1 ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1003
2402
f9d4e1eddbc5 - correct several errors on the deblocking accross slice boundaries.
michael
parents: 2401
diff changeset
1004 tprintf("pred_8x16: (%2d %2d %2d) at %2d %2d %d list %d\n", left_ref, A[0], A[1], h->s.mb_x, h->s.mb_y, n, list);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1005
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1006 if(left_ref == ref){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1007 *mx= A[0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1008 *my= A[1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1009 return;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1010 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1011 }else{
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
1012 const int16_t * C;
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
1013 int diagonal_ref;
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
1014
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
1015 diagonal_ref= fetch_diagonal_mv(h, &C, scan8[4], list, 2);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1016
2402
f9d4e1eddbc5 - correct several errors on the deblocking accross slice boundaries.
michael
parents: 2401
diff changeset
1017 tprintf("pred_8x16: (%2d %2d %2d) at %2d %2d %d list %d\n", diagonal_ref, C[0], C[1], h->s.mb_x, h->s.mb_y, n, list);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1018
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
1019 if(diagonal_ref == ref){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1020 *mx= C[0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1021 *my= C[1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1022 return;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1023 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1024 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1025
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1026 //RARE
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1027 pred_motion(h, n, 2, list, ref, mx, my);
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 static inline void pred_pskip_motion(H264Context * const h, int * const mx, int * const my){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1031 const int top_ref = h->ref_cache[0][ scan8[0] - 8 ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1032 const int left_ref= h->ref_cache[0][ scan8[0] - 1 ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1033
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
1034 tprintf("pred_pskip: (%d) (%d) at %2d %2d\n", top_ref, left_ref, h->s.mb_x, h->s.mb_y);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1035
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1036 if(top_ref == PART_NOT_AVAILABLE || left_ref == PART_NOT_AVAILABLE
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1037 || (top_ref == 0 && *(uint32_t*)h->mv_cache[0][ scan8[0] - 8 ] == 0)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1038 || (left_ref == 0 && *(uint32_t*)h->mv_cache[0][ scan8[0] - 1 ] == 0)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1039
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1040 *mx = *my = 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1041 return;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1042 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1043
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1044 pred_motion(h, 0, 4, 0, 0, mx, my);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1045
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1046 return;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1047 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1048
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1049 static inline void direct_dist_scale_factor(H264Context * const h){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1050 const int poc = h->s.current_picture_ptr->poc;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1051 const int poc1 = h->ref_list[1][0].poc;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1052 int i;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1053 for(i=0; i<h->ref_count[0]; i++){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1054 int poc0 = h->ref_list[0][i].poc;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1055 int td = clip(poc1 - poc0, -128, 127);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1056 if(td == 0 /* FIXME || pic0 is a long-term ref */){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1057 h->dist_scale_factor[i] = 256;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1058 }else{
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1059 int tb = clip(poc - poc0, -128, 127);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1060 int tx = (16384 + (ABS(td) >> 1)) / td;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1061 h->dist_scale_factor[i] = clip((tb*tx + 32) >> 6, -1024, 1023);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1062 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1063 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1064 }
2537
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1065 static inline void direct_ref_list_init(H264Context * const h){
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1066 MpegEncContext * const s = &h->s;
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1067 Picture * const ref1 = &h->ref_list[1][0];
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1068 Picture * const cur = s->current_picture_ptr;
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1069 int list, i, j;
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1070 if(cur->pict_type == I_TYPE)
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1071 cur->ref_count[0] = 0;
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1072 if(cur->pict_type != B_TYPE)
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1073 cur->ref_count[1] = 0;
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1074 for(list=0; list<2; list++){
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1075 cur->ref_count[list] = h->ref_count[list];
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1076 for(j=0; j<h->ref_count[list]; j++)
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1077 cur->ref_poc[list][j] = h->ref_list[list][j].poc;
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1078 }
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1079 if(cur->pict_type != B_TYPE || h->direct_spatial_mv_pred)
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1080 return;
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1081 for(list=0; list<2; list++){
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1082 for(i=0; i<ref1->ref_count[list]; i++){
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1083 const int poc = ref1->ref_poc[list][i];
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1084 h->map_col_to_list0[list][i] = PART_NOT_AVAILABLE;
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1085 for(j=0; j<h->ref_count[list]; j++)
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1086 if(h->ref_list[list][j].poc == poc){
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1087 h->map_col_to_list0[list][i] = j;
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1088 break;
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1089 }
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1090 }
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1091 }
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1092 }
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1093
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1094 static inline void pred_direct_motion(H264Context * const h, int *mb_type){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1095 MpegEncContext * const s = &h->s;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1096 const int mb_xy = s->mb_x + s->mb_y*s->mb_stride;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1097 const int b8_xy = 2*s->mb_x + 2*s->mb_y*h->b8_stride;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1098 const int b4_xy = 4*s->mb_x + 4*s->mb_y*h->b_stride;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1099 const int mb_type_col = h->ref_list[1][0].mb_type[mb_xy];
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1100 const int16_t (*l1mv0)[2] = (const int16_t (*)[2]) &h->ref_list[1][0].motion_val[0][b4_xy];
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1101 const int8_t *l1ref0 = &h->ref_list[1][0].ref_index[0][b8_xy];
2537
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1102 const int8_t *l1ref1 = &h->ref_list[1][0].ref_index[1][b8_xy];
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1103 const int is_b8x8 = IS_8X8(*mb_type);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1104 int sub_mb_type;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1105 int i8, i4;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1106
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1107 if(IS_8X8(mb_type_col) && !h->sps.direct_8x8_inference_flag){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1108 /* FIXME save sub mb types from previous frames (or derive from MVs)
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1109 * so we know exactly what block size to use */
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1110 sub_mb_type = MB_TYPE_8x8|MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2; /* B_SUB_4x4 */
2536
943b0615fc93 oops, other half of the vismv patch
lorenm
parents: 2535
diff changeset
1111 *mb_type = MB_TYPE_8x8|MB_TYPE_L0L1;
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1112 }else if(!is_b8x8 && (IS_16X16(mb_type_col) || IS_INTRA(mb_type_col))){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1113 sub_mb_type = MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2; /* B_SUB_8x8 */
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1114 *mb_type = MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2; /* B_16x16 */
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1115 }else{
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1116 sub_mb_type = MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2; /* B_SUB_8x8 */
2536
943b0615fc93 oops, other half of the vismv patch
lorenm
parents: 2535
diff changeset
1117 *mb_type = MB_TYPE_8x8|MB_TYPE_L0L1;
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1118 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1119 if(!is_b8x8)
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1120 *mb_type |= MB_TYPE_DIRECT2;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1121
2441
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
1122 tprintf("mb_type = %08x, sub_mb_type = %08x, is_b8x8 = %d, mb_type_col = %08x\n", *mb_type, sub_mb_type, is_b8x8, mb_type_col);
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
1123
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1124 if(h->direct_spatial_mv_pred){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1125 int ref[2];
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1126 int mv[2][2];
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1127 int list;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1128
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1129 /* ref = min(neighbors) */
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1130 for(list=0; list<2; list++){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1131 int refa = h->ref_cache[list][scan8[0] - 1];
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1132 int refb = h->ref_cache[list][scan8[0] - 8];
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1133 int refc = h->ref_cache[list][scan8[0] - 8 + 4];
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1134 if(refc == -2)
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1135 refc = h->ref_cache[list][scan8[0] - 8 - 1];
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1136 ref[list] = refa;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1137 if(ref[list] < 0 || (refb < ref[list] && refb >= 0))
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1138 ref[list] = refb;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1139 if(ref[list] < 0 || (refc < ref[list] && refc >= 0))
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1140 ref[list] = refc;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1141 if(ref[list] < 0)
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1142 ref[list] = -1;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1143 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1144
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1145 if(ref[0] < 0 && ref[1] < 0){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1146 ref[0] = ref[1] = 0;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1147 mv[0][0] = mv[0][1] =
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1148 mv[1][0] = mv[1][1] = 0;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1149 }else{
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1150 for(list=0; list<2; list++){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1151 if(ref[list] >= 0)
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1152 pred_motion(h, 0, 4, list, ref[list], &mv[list][0], &mv[list][1]);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1153 else
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1154 mv[list][0] = mv[list][1] = 0;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1155 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1156 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1157
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1158 if(ref[1] < 0){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1159 *mb_type &= ~MB_TYPE_P0L1;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1160 sub_mb_type &= ~MB_TYPE_P0L1;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1161 }else if(ref[0] < 0){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1162 *mb_type &= ~MB_TYPE_P0L0;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1163 sub_mb_type &= ~MB_TYPE_P0L0;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1164 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1165
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1166 if(IS_16X16(*mb_type)){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1167 fill_rectangle(&h->ref_cache[0][scan8[0]], 4, 4, 8, ref[0], 1);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1168 fill_rectangle(&h->ref_cache[1][scan8[0]], 4, 4, 8, ref[1], 1);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1169 if(!IS_INTRA(mb_type_col) && l1ref0[0] == 0 &&
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1170 ABS(l1mv0[0][0]) <= 1 && ABS(l1mv0[0][1]) <= 1){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1171 if(ref[0] > 0)
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1172 fill_rectangle(&h->mv_cache[0][scan8[0]], 4, 4, 8, pack16to32(mv[0][0],mv[0][1]), 4);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1173 else
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1174 fill_rectangle(&h->mv_cache[0][scan8[0]], 4, 4, 8, 0, 4);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1175 if(ref[1] > 0)
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1176 fill_rectangle(&h->mv_cache[1][scan8[0]], 4, 4, 8, pack16to32(mv[1][0],mv[1][1]), 4);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1177 else
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1178 fill_rectangle(&h->mv_cache[1][scan8[0]], 4, 4, 8, 0, 4);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1179 }else{
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1180 fill_rectangle(&h->mv_cache[0][scan8[0]], 4, 4, 8, pack16to32(mv[0][0],mv[0][1]), 4);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1181 fill_rectangle(&h->mv_cache[1][scan8[0]], 4, 4, 8, pack16to32(mv[1][0],mv[1][1]), 4);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1182 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1183 }else{
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1184 for(i8=0; i8<4; i8++){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1185 const int x8 = i8&1;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1186 const int y8 = i8>>1;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1187
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1188 if(is_b8x8 && !IS_DIRECT(h->sub_mb_type[i8]))
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1189 continue;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1190 h->sub_mb_type[i8] = sub_mb_type;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1191
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1192 fill_rectangle(&h->mv_cache[0][scan8[i8*4]], 2, 2, 8, pack16to32(mv[0][0],mv[0][1]), 4);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1193 fill_rectangle(&h->mv_cache[1][scan8[i8*4]], 2, 2, 8, pack16to32(mv[1][0],mv[1][1]), 4);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1194 fill_rectangle(&h->ref_cache[0][scan8[i8*4]], 2, 2, 8, ref[0], 1);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1195 fill_rectangle(&h->ref_cache[1][scan8[i8*4]], 2, 2, 8, ref[1], 1);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1196
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1197 /* col_zero_flag */
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1198 if(!IS_INTRA(mb_type_col) && l1ref0[x8 + y8*h->b8_stride] == 0){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1199 for(i4=0; i4<4; i4++){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1200 const int16_t *mv_col = l1mv0[x8*2 + (i4&1) + (y8*2 + (i4>>1))*h->b_stride];
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1201 if(ABS(mv_col[0]) <= 1 && ABS(mv_col[1]) <= 1){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1202 if(ref[0] == 0)
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1203 *(uint32_t*)h->mv_cache[0][scan8[i8*4+i4]] = 0;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1204 if(ref[1] == 0)
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1205 *(uint32_t*)h->mv_cache[1][scan8[i8*4+i4]] = 0;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1206 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1207 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1208 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1209 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1210 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1211 }else{ /* direct temporal mv pred */
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1212 if(IS_16X16(*mb_type)){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1213 fill_rectangle(&h->ref_cache[1][scan8[0]], 4, 4, 8, 0, 1);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1214 if(IS_INTRA(mb_type_col)){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1215 fill_rectangle(&h->ref_cache[0][scan8[0]], 4, 4, 8, 0, 1);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1216 fill_rectangle(&h-> mv_cache[0][scan8[0]], 4, 4, 8, 0, 4);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1217 fill_rectangle(&h-> mv_cache[1][scan8[0]], 4, 4, 8, 0, 4);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1218 }else{
2537
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1219 const int ref0 = l1ref0[0] >= 0 ? h->map_col_to_list0[0][l1ref0[0]]
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1220 : h->map_col_to_list0[1][l1ref1[0]];
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1221 assert(ref0 >= 0);
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1222 const int dist_scale_factor = h->dist_scale_factor[ref0];
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1223 const int16_t *mv_col = l1mv0[0];
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1224 int mv_l0[2];
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1225 mv_l0[0] = (dist_scale_factor * mv_col[0] + 128) >> 8;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1226 mv_l0[1] = (dist_scale_factor * mv_col[1] + 128) >> 8;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1227 fill_rectangle(&h->ref_cache[0][scan8[0]], 4, 4, 8, ref0, 1);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1228 fill_rectangle(&h-> mv_cache[0][scan8[0]], 4, 4, 8, pack16to32(mv_l0[0],mv_l0[1]), 4);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1229 fill_rectangle(&h-> mv_cache[1][scan8[0]], 4, 4, 8, pack16to32(mv_l0[0]-mv_col[0],mv_l0[1]-mv_col[1]), 4);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1230 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1231 }else{
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1232 for(i8=0; i8<4; i8++){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1233 const int x8 = i8&1;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1234 const int y8 = i8>>1;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1235 int ref0, dist_scale_factor;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1236
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1237 if(is_b8x8 && !IS_DIRECT(h->sub_mb_type[i8]))
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1238 continue;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1239 h->sub_mb_type[i8] = sub_mb_type;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1240 if(IS_INTRA(mb_type_col)){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1241 fill_rectangle(&h->ref_cache[0][scan8[i8*4]], 2, 2, 8, 0, 1);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1242 fill_rectangle(&h->ref_cache[1][scan8[i8*4]], 2, 2, 8, 0, 1);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1243 fill_rectangle(&h-> mv_cache[0][scan8[i8*4]], 2, 2, 8, 0, 4);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1244 fill_rectangle(&h-> mv_cache[1][scan8[i8*4]], 2, 2, 8, 0, 4);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1245 continue;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1246 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1247
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1248 ref0 = l1ref0[x8 + y8*h->b8_stride];
2537
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1249 if(ref0 >= 0)
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1250 ref0 = h->map_col_to_list0[0][ref0];
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1251 else
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1252 ref0 = h->map_col_to_list0[1][l1ref1[x8 + y8*h->b8_stride]];
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1253 assert(ref0 >= 0);
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1254 dist_scale_factor = h->dist_scale_factor[ref0];
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1255
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1256 fill_rectangle(&h->ref_cache[0][scan8[i8*4]], 2, 2, 8, ref0, 1);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1257 fill_rectangle(&h->ref_cache[1][scan8[i8*4]], 2, 2, 8, 0, 1);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1258 for(i4=0; i4<4; i4++){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1259 const int16_t *mv_col = l1mv0[x8*2 + (i4&1) + (y8*2 + (i4>>1))*h->b_stride];
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1260 int16_t *mv_l0 = h->mv_cache[0][scan8[i8*4+i4]];
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1261 mv_l0[0] = (dist_scale_factor * mv_col[0] + 128) >> 8;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1262 mv_l0[1] = (dist_scale_factor * mv_col[1] + 128) >> 8;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1263 *(uint32_t*)h->mv_cache[1][scan8[i8*4+i4]] =
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1264 pack16to32(mv_l0[0]-mv_col[0],mv_l0[1]-mv_col[1]);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1265 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1266 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1267 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1268 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1269 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1270
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1271 static inline void write_back_motion(H264Context *h, int mb_type){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1272 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1273 const int b_xy = 4*s->mb_x + 4*s->mb_y*h->b_stride;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1274 const int b8_xy= 2*s->mb_x + 2*s->mb_y*h->b8_stride;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1275 int list;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1276
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1277 for(list=0; list<2; list++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1278 int y;
2535
e0bf024629cf vismv didn't display 8x8 mvs in H.264
lorenm
parents: 2523
diff changeset
1279 if(!USES_LIST(mb_type, list)){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1280 if(1){ //FIXME skip or never read if mb_type doesnt use it
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1281 for(y=0; y<4; y++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1282 *(uint64_t*)s->current_picture.motion_val[list][b_xy + 0 + y*h->b_stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1283 *(uint64_t*)s->current_picture.motion_val[list][b_xy + 2 + y*h->b_stride]= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1284 }
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
1285 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
1286 /* FIXME needed ? */
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
1287 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
1288 *(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
1289 *(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
1290 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
1291 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1292 for(y=0; y<2; y++){
2365
b76a4977447a Fixed typo which caused incorrect motion prediction in B-frames. patch by (Loren Merritt <lorenm ta u tod washington tod edu>)
michael
parents: 2336
diff changeset
1293 *(uint16_t*)&s->current_picture.ref_index[list][b8_xy + y*h->b8_stride]= (LIST_NOT_USED&0xFF)*0x0101;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1294 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1295 }
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1296 continue;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1297 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1298
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1299 for(y=0; y<4; y++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1300 *(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
1301 *(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
1302 }
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
1303 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
1304 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
1305 *(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
1306 *(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
1307 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
1308 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1309 for(y=0; y<2; y++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1310 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
1311 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
1312 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1313 }
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1314
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1315 if(h->slice_type == B_TYPE && h->pps.cabac){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1316 if(IS_8X8(mb_type)){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1317 h->direct_table[b8_xy+1+0*h->b8_stride] = IS_DIRECT(h->sub_mb_type[1]) ? 1 : 0;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1318 h->direct_table[b8_xy+0+1*h->b8_stride] = IS_DIRECT(h->sub_mb_type[2]) ? 1 : 0;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1319 h->direct_table[b8_xy+1+1*h->b8_stride] = IS_DIRECT(h->sub_mb_type[3]) ? 1 : 0;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1320 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1321 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1322 }
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 * Decodes a network abstraction layer unit.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1326 * @param consumed is the number of bytes used as input
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1327 * @param length is the length of the array
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1328 * @param dst_length is the number of decoded bytes FIXME here or a decode rbsp ttailing?
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1329 * @returns decoded bytes, might be src+1 if no escapes
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1330 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1331 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
1332 int i, si, di;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1333 uint8_t *dst;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1334
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1335 // src[0]&0x80; //forbidden bit
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1336 h->nal_ref_idc= src[0]>>5;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1337 h->nal_unit_type= src[0]&0x1F;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1338
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1339 src++; length--;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1340 #if 0
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1341 for(i=0; i<length; i++)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1342 printf("%2X ", src[i]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1343 #endif
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1344 for(i=0; i+1<length; i+=2){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1345 if(src[i]) continue;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1346 if(i>0 && src[i-1]==0) i--;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1347 if(i+2<length && src[i+1]==0 && src[i+2]<=3){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1348 if(src[i+2]!=3){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1349 /* startcode, so we must be past the end */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1350 length=i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1351 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1352 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1353 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1354 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1355
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1356 if(i>=length-1){ //no escaped 0
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1357 *dst_length= length;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1358 *consumed= length+1; //+1 for the header
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1359 return src;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1360 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1361
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1362 h->rbsp_buffer= av_fast_realloc(h->rbsp_buffer, &h->rbsp_buffer_size, length);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1363 dst= h->rbsp_buffer;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1364
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1365 //printf("deoding esc\n");
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1366 si=di=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1367 while(si<length){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1368 //remove escapes (very rare 1:2^22)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1369 if(si+2<length && src[si]==0 && src[si+1]==0 && src[si+2]<=3){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1370 if(src[si+2]==3){ //escape
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1371 dst[di++]= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1372 dst[di++]= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1373 si+=3;
1957
54411768fa38 h264 nal decoding fix by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1956
diff changeset
1374 continue;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1375 }else //next start code
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1376 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1377 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1378
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1379 dst[di++]= src[si++];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1380 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1381
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1382 *dst_length= di;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1383 *consumed= si + 1;//+1 for the header
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1384 //FIXME store exact number of bits in the getbitcontext (its needed for decoding)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1385 return dst;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1386 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1387
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
1388 #if 0
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1389 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1390 * @param src the data which should be escaped
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1391 * @param dst the target buffer, dst+1 == src is allowed as a special case
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1392 * @param length the length of the src data
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1393 * @param dst_length the length of the dst array
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1394 * @returns length of escaped data in bytes or -1 if an error occured
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1395 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1396 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
1397 int i, escape_count, si, di;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1398 uint8_t *temp;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1399
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1400 assert(length>=0);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1401 assert(dst_length>0);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1402
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1403 dst[0]= (h->nal_ref_idc<<5) + h->nal_unit_type;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1404
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1405 if(length==0) return 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1406
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1407 escape_count= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1408 for(i=0; i<length; i+=2){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1409 if(src[i]) continue;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1410 if(i>0 && src[i-1]==0)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1411 i--;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1412 if(i+2<length && src[i+1]==0 && src[i+2]<=3){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1413 escape_count++;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1414 i+=2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1415 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1416 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1417
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1418 if(escape_count==0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1419 if(dst+1 != src)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1420 memcpy(dst+1, src, length);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1421 return length + 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1422 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1423
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1424 if(length + escape_count + 1> dst_length)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1425 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1426
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1427 //this should be damn rare (hopefully)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1428
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1429 h->rbsp_buffer= av_fast_realloc(h->rbsp_buffer, &h->rbsp_buffer_size, length + escape_count);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1430 temp= h->rbsp_buffer;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1431 //printf("encoding esc\n");
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1432
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1433 si= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1434 di= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1435 while(si < length){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1436 if(si+2<length && src[si]==0 && src[si+1]==0 && src[si+2]<=3){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1437 temp[di++]= 0; si++;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1438 temp[di++]= 0; si++;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1439 temp[di++]= 3;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1440 temp[di++]= src[si++];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1441 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1442 else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1443 temp[di++]= src[si++];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1444 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1445 memcpy(dst+1, temp, length+escape_count);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1446
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1447 assert(di == length+escape_count);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1448
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1449 return di + 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1450 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1451
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1452 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1453 * write 1,10,100,1000,... for alignment, yes its exactly inverse to mpeg4
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1454 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1455 static void encode_rbsp_trailing(PutBitContext *pb){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1456 int length;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1457 put_bits(pb, 1, 1);
1786
b7340afa261a get_bit_count -> put_bits_count
alex
parents: 1754
diff changeset
1458 length= (-put_bits_count(pb))&7;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1459 if(length) put_bits(pb, length, 0);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1460 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
1461 #endif
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1462
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1463 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1464 * identifies the exact end of the bitstream
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1465 * @return the length of the trailing, or 0 if damaged
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1466 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1467 static int decode_rbsp_trailing(uint8_t *src){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1468 int v= *src;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1469 int r;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1470
1170
4710976004a5 #ifdef TRACE printf() -> tprintf()
michaelni
parents: 1169
diff changeset
1471 tprintf("rbsp trailing %X\n", v);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1472
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1473 for(r=1; r<9; r++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1474 if(v&1) return r;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1475 v>>=1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1476 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1477 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1478 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1479
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1480 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1481 * idct tranforms the 16 dc values and dequantize them.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1482 * @param qp quantization parameter
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1483 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1484 static void h264_luma_dc_dequant_idct_c(DCTELEM *block, int qp){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1485 const int qmul= dequant_coeff[qp][0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1486 #define stride 16
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1487 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1488 int temp[16]; //FIXME check if this is a good idea
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1489 static const int x_offset[4]={0, 1*stride, 4* stride, 5*stride};
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1490 static const int y_offset[4]={0, 2*stride, 8* stride, 10*stride};
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1491
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1492 //memset(block, 64, 2*256);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1493 //return;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1494 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1495 const int offset= y_offset[i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1496 const int z0= block[offset+stride*0] + block[offset+stride*4];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1497 const int z1= block[offset+stride*0] - block[offset+stride*4];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1498 const int z2= block[offset+stride*1] - block[offset+stride*5];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1499 const int z3= block[offset+stride*1] + block[offset+stride*5];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1500
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1501 temp[4*i+0]= z0+z3;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1502 temp[4*i+1]= z1+z2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1503 temp[4*i+2]= z1-z2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1504 temp[4*i+3]= z0-z3;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1505 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1506
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1507 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1508 const int offset= x_offset[i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1509 const int z0= temp[4*0+i] + temp[4*2+i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1510 const int z1= temp[4*0+i] - temp[4*2+i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1511 const int z2= temp[4*1+i] - temp[4*3+i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1512 const int z3= temp[4*1+i] + temp[4*3+i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1513
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1514 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
1515 block[stride*2 +offset]= ((z1 + z2)*qmul + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1516 block[stride*8 +offset]= ((z1 - z2)*qmul + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1517 block[stride*10+offset]= ((z0 - z3)*qmul + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1518 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1519 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1520
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
1521 #if 0
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1522 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1523 * dct tranforms the 16 dc values.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1524 * @param qp quantization parameter ??? FIXME
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1525 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1526 static void h264_luma_dc_dct_c(DCTELEM *block/*, int qp*/){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1527 // const int qmul= dequant_coeff[qp][0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1528 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1529 int temp[16]; //FIXME check if this is a good idea
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1530 static const int x_offset[4]={0, 1*stride, 4* stride, 5*stride};
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1531 static const int y_offset[4]={0, 2*stride, 8* stride, 10*stride};
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1532
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1533 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1534 const int offset= y_offset[i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1535 const int z0= block[offset+stride*0] + block[offset+stride*4];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1536 const int z1= block[offset+stride*0] - block[offset+stride*4];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1537 const int z2= block[offset+stride*1] - block[offset+stride*5];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1538 const int z3= block[offset+stride*1] + block[offset+stride*5];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1539
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1540 temp[4*i+0]= z0+z3;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1541 temp[4*i+1]= z1+z2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1542 temp[4*i+2]= z1-z2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1543 temp[4*i+3]= z0-z3;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1544 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1545
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1546 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1547 const int offset= x_offset[i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1548 const int z0= temp[4*0+i] + temp[4*2+i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1549 const int z1= temp[4*0+i] - temp[4*2+i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1550 const int z2= temp[4*1+i] - temp[4*3+i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1551 const int z3= temp[4*1+i] + temp[4*3+i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1552
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1553 block[stride*0 +offset]= (z0 + z3)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1554 block[stride*2 +offset]= (z1 + z2)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1555 block[stride*8 +offset]= (z1 - z2)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1556 block[stride*10+offset]= (z0 - z3)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1557 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1558 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
1559 #endif
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
1560
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1561 #undef xStride
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1562 #undef stride
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1563
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1564 static void chroma_dc_dequant_idct_c(DCTELEM *block, int qp){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1565 const int qmul= dequant_coeff[qp][0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1566 const int stride= 16*2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1567 const int xStride= 16;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1568 int a,b,c,d,e;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1569
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1570 a= block[stride*0 + xStride*0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1571 b= block[stride*0 + xStride*1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1572 c= block[stride*1 + xStride*0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1573 d= block[stride*1 + xStride*1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1574
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1575 e= a-b;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1576 a= a+b;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1577 b= c-d;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1578 c= c+d;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1579
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1580 block[stride*0 + xStride*0]= ((a+c)*qmul + 0)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1581 block[stride*0 + xStride*1]= ((e+b)*qmul + 0)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1582 block[stride*1 + xStride*0]= ((a-c)*qmul + 0)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1583 block[stride*1 + xStride*1]= ((e-b)*qmul + 0)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1584 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1585
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
1586 #if 0
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1587 static void chroma_dc_dct_c(DCTELEM *block){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1588 const int stride= 16*2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1589 const int xStride= 16;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1590 int a,b,c,d,e;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1591
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1592 a= block[stride*0 + xStride*0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1593 b= block[stride*0 + xStride*1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1594 c= block[stride*1 + xStride*0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1595 d= block[stride*1 + xStride*1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1596
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1597 e= a-b;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1598 a= a+b;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1599 b= c-d;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1600 c= c+d;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1601
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1602 block[stride*0 + xStride*0]= (a+c);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1603 block[stride*0 + xStride*1]= (e+b);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1604 block[stride*1 + xStride*0]= (a-c);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1605 block[stride*1 + xStride*1]= (e-b);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1606 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
1607 #endif
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1608
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1609 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1610 * gets the chroma qp.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1611 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1612 static inline int get_chroma_qp(H264Context *h, int qscale){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1613
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1614 return chroma_qp[clip(qscale + h->pps.chroma_qp_index_offset, 0, 51)];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1615 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1616
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1617
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
1618 #if 0
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1619 static void h264_diff_dct_c(DCTELEM *block, uint8_t *src1, uint8_t *src2, int stride){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1620 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1621 //FIXME try int temp instead of block
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1622
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1623 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1624 const int d0= src1[0 + i*stride] - src2[0 + i*stride];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1625 const int d1= src1[1 + i*stride] - src2[1 + i*stride];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1626 const int d2= src1[2 + i*stride] - src2[2 + i*stride];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1627 const int d3= src1[3 + i*stride] - src2[3 + i*stride];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1628 const int z0= d0 + d3;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1629 const int z3= d0 - d3;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1630 const int z1= d1 + d2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1631 const int z2= d1 - d2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1632
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1633 block[0 + 4*i]= z0 + z1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1634 block[1 + 4*i]= 2*z3 + z2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1635 block[2 + 4*i]= z0 - z1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1636 block[3 + 4*i]= z3 - 2*z2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1637 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1638
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1639 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1640 const int z0= block[0*4 + i] + block[3*4 + i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1641 const int z3= block[0*4 + i] - block[3*4 + i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1642 const int z1= block[1*4 + i] + block[2*4 + i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1643 const int z2= block[1*4 + i] - block[2*4 + i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1644
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1645 block[0*4 + i]= z0 + z1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1646 block[1*4 + i]= 2*z3 + z2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1647 block[2*4 + i]= z0 - z1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1648 block[3*4 + i]= z3 - 2*z2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1649 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1650 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
1651 #endif
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1652
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1653 //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
1654 //FIXME check that gcc inlines this (and optimizes intra & seperate_dc stuff away)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1655 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
1656 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1657 const int * const quant_table= quant_coeff[qscale];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1658 const int bias= intra ? (1<<QUANT_SHIFT)/3 : (1<<QUANT_SHIFT)/6;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1659 const unsigned int threshold1= (1<<QUANT_SHIFT) - bias - 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1660 const unsigned int threshold2= (threshold1<<1);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1661 int last_non_zero;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1662
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1663 if(seperate_dc){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1664 if(qscale<=18){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1665 //avoid overflows
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1666 const int dc_bias= intra ? (1<<(QUANT_SHIFT-2))/3 : (1<<(QUANT_SHIFT-2))/6;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1667 const unsigned int dc_threshold1= (1<<(QUANT_SHIFT-2)) - dc_bias - 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1668 const unsigned int dc_threshold2= (dc_threshold1<<1);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1669
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1670 int level= block[0]*quant_coeff[qscale+18][0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1671 if(((unsigned)(level+dc_threshold1))>dc_threshold2){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1672 if(level>0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1673 level= (dc_bias + level)>>(QUANT_SHIFT-2);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1674 block[0]= level;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1675 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1676 level= (dc_bias - level)>>(QUANT_SHIFT-2);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1677 block[0]= -level;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1678 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1679 // last_non_zero = i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1680 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1681 block[0]=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1682 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1683 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1684 const int dc_bias= intra ? (1<<(QUANT_SHIFT+1))/3 : (1<<(QUANT_SHIFT+1))/6;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1685 const unsigned int dc_threshold1= (1<<(QUANT_SHIFT+1)) - dc_bias - 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1686 const unsigned int dc_threshold2= (dc_threshold1<<1);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1687
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1688 int level= block[0]*quant_table[0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1689 if(((unsigned)(level+dc_threshold1))>dc_threshold2){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1690 if(level>0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1691 level= (dc_bias + level)>>(QUANT_SHIFT+1);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1692 block[0]= level;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1693 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1694 level= (dc_bias - level)>>(QUANT_SHIFT+1);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1695 block[0]= -level;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1696 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1697 // last_non_zero = i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1698 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1699 block[0]=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1700 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1701 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1702 last_non_zero= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1703 i=1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1704 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1705 last_non_zero= -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1706 i=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1707 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1708
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1709 for(; i<16; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1710 const int j= scantable[i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1711 int level= block[j]*quant_table[j];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1712
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1713 // if( bias+level >= (1<<(QMAT_SHIFT - 3))
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1714 // || bias-level >= (1<<(QMAT_SHIFT - 3))){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1715 if(((unsigned)(level+threshold1))>threshold2){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1716 if(level>0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1717 level= (bias + level)>>QUANT_SHIFT;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1718 block[j]= level;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1719 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1720 level= (bias - level)>>QUANT_SHIFT;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1721 block[j]= -level;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1722 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1723 last_non_zero = i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1724 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1725 block[j]=0;
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
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1729 return last_non_zero;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1730 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1731
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1732 static void pred4x4_vertical_c(uint8_t *src, uint8_t *topright, int stride){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1733 const uint32_t a= ((uint32_t*)(src-stride))[0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1734 ((uint32_t*)(src+0*stride))[0]= a;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1735 ((uint32_t*)(src+1*stride))[0]= a;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1736 ((uint32_t*)(src+2*stride))[0]= a;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1737 ((uint32_t*)(src+3*stride))[0]= a;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1738 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1739
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1740 static void pred4x4_horizontal_c(uint8_t *src, uint8_t *topright, int stride){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1741 ((uint32_t*)(src+0*stride))[0]= src[-1+0*stride]*0x01010101;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1742 ((uint32_t*)(src+1*stride))[0]= src[-1+1*stride]*0x01010101;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1743 ((uint32_t*)(src+2*stride))[0]= src[-1+2*stride]*0x01010101;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1744 ((uint32_t*)(src+3*stride))[0]= src[-1+3*stride]*0x01010101;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1745 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1746
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1747 static void pred4x4_dc_c(uint8_t *src, uint8_t *topright, int stride){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1748 const int dc= ( src[-stride] + src[1-stride] + src[2-stride] + src[3-stride]
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1749 + 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
1750
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1751 ((uint32_t*)(src+0*stride))[0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1752 ((uint32_t*)(src+1*stride))[0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1753 ((uint32_t*)(src+2*stride))[0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1754 ((uint32_t*)(src+3*stride))[0]= dc* 0x01010101;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1755 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1756
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1757 static void pred4x4_left_dc_c(uint8_t *src, uint8_t *topright, int stride){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1758 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
1759
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1760 ((uint32_t*)(src+0*stride))[0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1761 ((uint32_t*)(src+1*stride))[0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1762 ((uint32_t*)(src+2*stride))[0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1763 ((uint32_t*)(src+3*stride))[0]= dc* 0x01010101;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1764 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1765
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1766 static void pred4x4_top_dc_c(uint8_t *src, uint8_t *topright, int stride){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1767 const int dc= ( src[-stride] + src[1-stride] + src[2-stride] + src[3-stride] + 2) >>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1768
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1769 ((uint32_t*)(src+0*stride))[0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1770 ((uint32_t*)(src+1*stride))[0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1771 ((uint32_t*)(src+2*stride))[0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1772 ((uint32_t*)(src+3*stride))[0]= dc* 0x01010101;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1773 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1774
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1775 static void pred4x4_128_dc_c(uint8_t *src, uint8_t *topright, int stride){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1776 ((uint32_t*)(src+0*stride))[0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1777 ((uint32_t*)(src+1*stride))[0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1778 ((uint32_t*)(src+2*stride))[0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1779 ((uint32_t*)(src+3*stride))[0]= 128U*0x01010101U;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1780 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1781
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1782
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1783 #define LOAD_TOP_RIGHT_EDGE\
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1784 const int t4= topright[0];\
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1785 const int t5= topright[1];\
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1786 const int t6= topright[2];\
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1787 const int t7= topright[3];\
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1788
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1789 #define LOAD_LEFT_EDGE\
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1790 const int l0= src[-1+0*stride];\
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1791 const int l1= src[-1+1*stride];\
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1792 const int l2= src[-1+2*stride];\
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1793 const int l3= src[-1+3*stride];\
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1794
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1795 #define LOAD_TOP_EDGE\
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1796 const int t0= src[ 0-1*stride];\
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1797 const int t1= src[ 1-1*stride];\
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1798 const int t2= src[ 2-1*stride];\
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1799 const int t3= src[ 3-1*stride];\
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1800
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1801 static void pred4x4_down_right_c(uint8_t *src, uint8_t *topright, int stride){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1802 const int lt= src[-1-1*stride];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1803 LOAD_TOP_EDGE
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1804 LOAD_LEFT_EDGE
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1805
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1806 src[0+3*stride]=(l3 + 2*l2 + l1 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1807 src[0+2*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1808 src[1+3*stride]=(l2 + 2*l1 + l0 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1809 src[0+1*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1810 src[1+2*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1811 src[2+3*stride]=(l1 + 2*l0 + lt + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1812 src[0+0*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1813 src[1+1*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1814 src[2+2*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1815 src[3+3*stride]=(l0 + 2*lt + t0 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1816 src[1+0*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1817 src[2+1*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1818 src[3+2*stride]=(lt + 2*t0 + t1 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1819 src[2+0*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1820 src[3+1*stride]=(t0 + 2*t1 + t2 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1821 src[3+0*stride]=(t1 + 2*t2 + t3 + 2)>>2;
1282
8988af3ae1e8 Warning and compatibility fixes.
mellum
parents: 1269
diff changeset
1822 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1823
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1824 static void pred4x4_down_left_c(uint8_t *src, uint8_t *topright, int stride){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1825 LOAD_TOP_EDGE
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1826 LOAD_TOP_RIGHT_EDGE
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1827 // LOAD_LEFT_EDGE
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1828
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1829 src[0+0*stride]=(t0 + t2 + 2*t1 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1830 src[1+0*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1831 src[0+1*stride]=(t1 + t3 + 2*t2 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1832 src[2+0*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1833 src[1+1*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1834 src[0+2*stride]=(t2 + t4 + 2*t3 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1835 src[3+0*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1836 src[2+1*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1837 src[1+2*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1838 src[0+3*stride]=(t3 + t5 + 2*t4 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1839 src[3+1*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1840 src[2+2*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1841 src[1+3*stride]=(t4 + t6 + 2*t5 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1842 src[3+2*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1843 src[2+3*stride]=(t5 + t7 + 2*t6 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1844 src[3+3*stride]=(t6 + 3*t7 + 2)>>2;
1282
8988af3ae1e8 Warning and compatibility fixes.
mellum
parents: 1269
diff changeset
1845 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1846
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1847 static void pred4x4_vertical_right_c(uint8_t *src, uint8_t *topright, int stride){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1848 const int lt= src[-1-1*stride];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1849 LOAD_TOP_EDGE
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1850 LOAD_LEFT_EDGE
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1851 const __attribute__((unused)) int unu= l3;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1852
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1853 src[0+0*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1854 src[1+2*stride]=(lt + t0 + 1)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1855 src[1+0*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1856 src[2+2*stride]=(t0 + t1 + 1)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1857 src[2+0*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1858 src[3+2*stride]=(t1 + t2 + 1)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1859 src[3+0*stride]=(t2 + t3 + 1)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1860 src[0+1*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1861 src[1+3*stride]=(l0 + 2*lt + t0 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1862 src[1+1*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1863 src[2+3*stride]=(lt + 2*t0 + t1 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1864 src[2+1*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1865 src[3+3*stride]=(t0 + 2*t1 + t2 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1866 src[3+1*stride]=(t1 + 2*t2 + t3 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1867 src[0+2*stride]=(lt + 2*l0 + l1 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1868 src[0+3*stride]=(l0 + 2*l1 + l2 + 2)>>2;
1282
8988af3ae1e8 Warning and compatibility fixes.
mellum
parents: 1269
diff changeset
1869 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1870
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1871 static void pred4x4_vertical_left_c(uint8_t *src, uint8_t *topright, int stride){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1872 LOAD_TOP_EDGE
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1873 LOAD_TOP_RIGHT_EDGE
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1874 const __attribute__((unused)) int unu= t7;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1875
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1876 src[0+0*stride]=(t0 + t1 + 1)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1877 src[1+0*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1878 src[0+2*stride]=(t1 + t2 + 1)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1879 src[2+0*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1880 src[1+2*stride]=(t2 + t3 + 1)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1881 src[3+0*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1882 src[2+2*stride]=(t3 + t4+ 1)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1883 src[3+2*stride]=(t4 + t5+ 1)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1884 src[0+1*stride]=(t0 + 2*t1 + t2 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1885 src[1+1*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1886 src[0+3*stride]=(t1 + 2*t2 + t3 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1887 src[2+1*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1888 src[1+3*stride]=(t2 + 2*t3 + t4 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1889 src[3+1*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1890 src[2+3*stride]=(t3 + 2*t4 + t5 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1891 src[3+3*stride]=(t4 + 2*t5 + t6 + 2)>>2;
1282
8988af3ae1e8 Warning and compatibility fixes.
mellum
parents: 1269
diff changeset
1892 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1893
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1894 static void pred4x4_horizontal_up_c(uint8_t *src, uint8_t *topright, int stride){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1895 LOAD_LEFT_EDGE
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1896
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1897 src[0+0*stride]=(l0 + l1 + 1)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1898 src[1+0*stride]=(l0 + 2*l1 + l2 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1899 src[2+0*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1900 src[0+1*stride]=(l1 + l2 + 1)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1901 src[3+0*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1902 src[1+1*stride]=(l1 + 2*l2 + l3 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1903 src[2+1*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1904 src[0+2*stride]=(l2 + l3 + 1)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1905 src[3+1*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1906 src[1+2*stride]=(l2 + 2*l3 + l3 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1907 src[3+2*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1908 src[1+3*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1909 src[0+3*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1910 src[2+2*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1911 src[2+3*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1912 src[3+3*stride]=l3;
1282
8988af3ae1e8 Warning and compatibility fixes.
mellum
parents: 1269
diff changeset
1913 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1914
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1915 static void pred4x4_horizontal_down_c(uint8_t *src, uint8_t *topright, int stride){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1916 const int lt= src[-1-1*stride];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1917 LOAD_TOP_EDGE
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1918 LOAD_LEFT_EDGE
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1919 const __attribute__((unused)) int unu= t3;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1920
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1921 src[0+0*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1922 src[2+1*stride]=(lt + l0 + 1)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1923 src[1+0*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1924 src[3+1*stride]=(l0 + 2*lt + t0 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1925 src[2+0*stride]=(lt + 2*t0 + t1 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1926 src[3+0*stride]=(t0 + 2*t1 + t2 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1927 src[0+1*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1928 src[2+2*stride]=(l0 + l1 + 1)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1929 src[1+1*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1930 src[3+2*stride]=(lt + 2*l0 + l1 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1931 src[0+2*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1932 src[2+3*stride]=(l1 + l2+ 1)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1933 src[1+2*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1934 src[3+3*stride]=(l0 + 2*l1 + l2 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1935 src[0+3*stride]=(l2 + l3 + 1)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1936 src[1+3*stride]=(l1 + 2*l2 + l3 + 2)>>2;
1282
8988af3ae1e8 Warning and compatibility fixes.
mellum
parents: 1269
diff changeset
1937 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1938
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1939 static void pred16x16_vertical_c(uint8_t *src, int stride){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1940 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1941 const uint32_t a= ((uint32_t*)(src-stride))[0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1942 const uint32_t b= ((uint32_t*)(src-stride))[1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1943 const uint32_t c= ((uint32_t*)(src-stride))[2];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1944 const uint32_t d= ((uint32_t*)(src-stride))[3];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1945
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1946 for(i=0; i<16; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1947 ((uint32_t*)(src+i*stride))[0]= a;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1948 ((uint32_t*)(src+i*stride))[1]= b;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1949 ((uint32_t*)(src+i*stride))[2]= c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1950 ((uint32_t*)(src+i*stride))[3]= d;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1951 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1952 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1953
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1954 static void pred16x16_horizontal_c(uint8_t *src, int stride){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1955 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1956
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1957 for(i=0; i<16; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1958 ((uint32_t*)(src+i*stride))[0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1959 ((uint32_t*)(src+i*stride))[1]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1960 ((uint32_t*)(src+i*stride))[2]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1961 ((uint32_t*)(src+i*stride))[3]= src[-1+i*stride]*0x01010101;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1962 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1963 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1964
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1965 static void pred16x16_dc_c(uint8_t *src, int stride){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1966 int i, dc=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1967
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1968 for(i=0;i<16; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1969 dc+= src[-1+i*stride];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1970 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1971
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1972 for(i=0;i<16; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1973 dc+= src[i-stride];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1974 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1975
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1976 dc= 0x01010101*((dc + 16)>>5);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1977
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1978 for(i=0; i<16; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1979 ((uint32_t*)(src+i*stride))[0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1980 ((uint32_t*)(src+i*stride))[1]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1981 ((uint32_t*)(src+i*stride))[2]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1982 ((uint32_t*)(src+i*stride))[3]= dc;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1983 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1984 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1985
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1986 static void pred16x16_left_dc_c(uint8_t *src, int stride){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1987 int i, dc=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1988
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1989 for(i=0;i<16; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1990 dc+= src[-1+i*stride];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1991 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1992
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1993 dc= 0x01010101*((dc + 8)>>4);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1994
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1995 for(i=0; i<16; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1996 ((uint32_t*)(src+i*stride))[0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1997 ((uint32_t*)(src+i*stride))[1]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1998 ((uint32_t*)(src+i*stride))[2]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1999 ((uint32_t*)(src+i*stride))[3]= dc;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2000 }
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 void pred16x16_top_dc_c(uint8_t *src, int stride){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2004 int i, dc=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2005
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2006 for(i=0;i<16; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2007 dc+= src[i-stride];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2008 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2009 dc= 0x01010101*((dc + 8)>>4);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2010
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2011 for(i=0; i<16; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2012 ((uint32_t*)(src+i*stride))[0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2013 ((uint32_t*)(src+i*stride))[1]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2014 ((uint32_t*)(src+i*stride))[2]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2015 ((uint32_t*)(src+i*stride))[3]= dc;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2016 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2017 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2018
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2019 static void pred16x16_128_dc_c(uint8_t *src, int stride){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2020 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2021
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2022 for(i=0; i<16; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2023 ((uint32_t*)(src+i*stride))[0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2024 ((uint32_t*)(src+i*stride))[1]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2025 ((uint32_t*)(src+i*stride))[2]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2026 ((uint32_t*)(src+i*stride))[3]= 0x01010101U*128U;
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
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
2030 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
2031 int i, j, k;
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
2032 int a;
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
2033 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
2034 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
2035 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
2036 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
2037 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
2038 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
2039 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
2040 src1 += stride; src2 -= stride;
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
2041 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
2042 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
2043 }
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
2044 if(svq3){
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
2045 H = ( 5*(H/4) ) / 16;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
2046 V = ( 5*(V/4) ) / 16;
1330
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1322
diff changeset
2047
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1322
diff changeset
2048 /* required for 100% accuracy */
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1322
diff changeset
2049 i = H; H = V; V = i;
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
2050 }else{
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
2051 H = ( 5*H+32 ) >> 6;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
2052 V = ( 5*V+32 ) >> 6;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
2053 }
1184
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
2054
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
2055 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
2056 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
2057 int b = a;
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
2058 a += V;
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
2059 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
2060 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
2061 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
2062 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
2063 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
2064 b += 4*H;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2065 }
1184
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
2066 src += stride;
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
2067 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2068 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2069
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
2070 static void pred16x16_plane_c(uint8_t *src, int stride){
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
2071 pred16x16_plane_compat_c(src, stride, 0);
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
2072 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
2073
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2074 static void pred8x8_vertical_c(uint8_t *src, int stride){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2075 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2076 const uint32_t a= ((uint32_t*)(src-stride))[0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2077 const uint32_t b= ((uint32_t*)(src-stride))[1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2078
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2079 for(i=0; i<8; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2080 ((uint32_t*)(src+i*stride))[0]= a;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2081 ((uint32_t*)(src+i*stride))[1]= b;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2082 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2083 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2084
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2085 static void pred8x8_horizontal_c(uint8_t *src, int stride){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2086 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2087
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2088 for(i=0; i<8; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2089 ((uint32_t*)(src+i*stride))[0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2090 ((uint32_t*)(src+i*stride))[1]= src[-1+i*stride]*0x01010101;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2091 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2092 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2093
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2094 static void pred8x8_128_dc_c(uint8_t *src, int stride){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2095 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2096
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2097 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2098 ((uint32_t*)(src+i*stride))[0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2099 ((uint32_t*)(src+i*stride))[1]= 0x01010101U*128U;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2100 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2101 for(i=4; i<8; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2102 ((uint32_t*)(src+i*stride))[0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2103 ((uint32_t*)(src+i*stride))[1]= 0x01010101U*128U;
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 static void pred8x8_left_dc_c(uint8_t *src, int stride){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2108 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2109 int dc0, dc2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2110
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2111 dc0=dc2=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2112 for(i=0;i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2113 dc0+= src[-1+i*stride];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2114 dc2+= src[-1+(i+4)*stride];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2115 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2116 dc0= 0x01010101*((dc0 + 2)>>2);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2117 dc2= 0x01010101*((dc2 + 2)>>2);
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 ((uint32_t*)(src+i*stride))[0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2121 ((uint32_t*)(src+i*stride))[1]= dc0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2122 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2123 for(i=4; i<8; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2124 ((uint32_t*)(src+i*stride))[0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2125 ((uint32_t*)(src+i*stride))[1]= dc2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2126 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2127 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2128
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2129 static void pred8x8_top_dc_c(uint8_t *src, int stride){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2130 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2131 int dc0, dc1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2132
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2133 dc0=dc1=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2134 for(i=0;i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2135 dc0+= src[i-stride];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2136 dc1+= src[4+i-stride];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2137 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2138 dc0= 0x01010101*((dc0 + 2)>>2);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2139 dc1= 0x01010101*((dc1 + 2)>>2);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2140
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2141 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2142 ((uint32_t*)(src+i*stride))[0]= dc0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2143 ((uint32_t*)(src+i*stride))[1]= dc1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2144 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2145 for(i=4; i<8; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2146 ((uint32_t*)(src+i*stride))[0]= dc0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2147 ((uint32_t*)(src+i*stride))[1]= dc1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2148 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2149 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2150
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2151
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2152 static void pred8x8_dc_c(uint8_t *src, int stride){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2153 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2154 int dc0, dc1, dc2, dc3;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2155
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2156 dc0=dc1=dc2=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2157 for(i=0;i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2158 dc0+= src[-1+i*stride] + src[i-stride];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2159 dc1+= src[4+i-stride];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2160 dc2+= src[-1+(i+4)*stride];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2161 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2162 dc3= 0x01010101*((dc1 + dc2 + 4)>>3);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2163 dc0= 0x01010101*((dc0 + 4)>>3);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2164 dc1= 0x01010101*((dc1 + 2)>>2);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2165 dc2= 0x01010101*((dc2 + 2)>>2);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2166
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2167 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2168 ((uint32_t*)(src+i*stride))[0]= dc0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2169 ((uint32_t*)(src+i*stride))[1]= dc1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2170 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2171 for(i=4; i<8; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2172 ((uint32_t*)(src+i*stride))[0]= dc2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2173 ((uint32_t*)(src+i*stride))[1]= dc3;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2174 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2175 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2176
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2177 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
2178 int j, k;
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
2179 int a;
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
2180 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
2181 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
2182 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
2183 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
2184 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
2185 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
2186 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
2187 src1 += stride; src2 -= stride;
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
2188 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
2189 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
2190 }
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
2191 H = ( 17*H+16 ) >> 5;
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
2192 V = ( 17*V+16 ) >> 5;
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
2193
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
2194 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
2195 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
2196 int b = a;
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
2197 a += V;
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
2198 src[0] = cm[ (b ) >> 5 ];
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
2199 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
2200 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
2201 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
2202 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
2203 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
2204 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
2205 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
2206 src += stride;
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
2207 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2208 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2209
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2210 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
2211 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2212 int src_x_offset, int src_y_offset,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2213 qpel_mc_func *qpix_op, h264_chroma_mc_func chroma_op){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2214 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2215 const int mx= h->mv_cache[list][ scan8[n] ][0] + src_x_offset*8;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2216 const int my= h->mv_cache[list][ scan8[n] ][1] + src_y_offset*8;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2217 const int luma_xy= (mx&3) + ((my&3)<<2);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2218 uint8_t * src_y = pic->data[0] + (mx>>2) + (my>>2)*s->linesize;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2219 uint8_t * src_cb= pic->data[1] + (mx>>3) + (my>>3)*s->uvlinesize;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2220 uint8_t * src_cr= pic->data[2] + (mx>>3) + (my>>3)*s->uvlinesize;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2221 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
2222 int extra_height= extra_width;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2223 int emu=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2224 const int full_mx= mx>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2225 const int full_my= my>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2226
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2227 assert(pic->data[0]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2228
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2229 if(mx&7) extra_width -= 3;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2230 if(my&7) extra_height -= 3;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2231
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2232 if( full_mx < 0-extra_width
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2233 || full_my < 0-extra_height
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2234 || full_mx + 16/*FIXME*/ > s->width + extra_width
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2235 || full_my + 16/*FIXME*/ > s->height + extra_height){
1317
26c44d2433c1 make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents: 1282
diff changeset
2236 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
2237 src_y= s->edge_emu_buffer + 2 + 2*s->linesize;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2238 emu=1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2239 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2240
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2241 qpix_op[luma_xy](dest_y, src_y, s->linesize); //FIXME try variable height perhaps?
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2242 if(!square){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2243 qpix_op[luma_xy](dest_y + delta, src_y + delta, s->linesize);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2244 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2245
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2246 if(s->flags&CODEC_FLAG_GRAY) return;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2247
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2248 if(emu){
1317
26c44d2433c1 make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents: 1282
diff changeset
2249 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
2250 src_cb= s->edge_emu_buffer;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2251 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2252 chroma_op(dest_cb, src_cb, s->uvlinesize, chroma_height, mx&7, my&7);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2253
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2254 if(emu){
1317
26c44d2433c1 make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents: 1282
diff changeset
2255 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
2256 src_cr= s->edge_emu_buffer;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2257 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2258 chroma_op(dest_cr, src_cr, s->uvlinesize, chroma_height, mx&7, my&7);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2259 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2260
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2261 static inline void mc_part_std(H264Context *h, int n, int square, int chroma_height, int delta,
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2262 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2263 int x_offset, int y_offset,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2264 qpel_mc_func *qpix_put, h264_chroma_mc_func chroma_put,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2265 qpel_mc_func *qpix_avg, h264_chroma_mc_func chroma_avg,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2266 int list0, int list1){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2267 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2268 qpel_mc_func *qpix_op= qpix_put;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2269 h264_chroma_mc_func chroma_op= chroma_put;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2270
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2271 dest_y += 2*x_offset + 2*y_offset*s-> linesize;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2272 dest_cb += x_offset + y_offset*s->uvlinesize;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2273 dest_cr += x_offset + y_offset*s->uvlinesize;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2274 x_offset += 8*s->mb_x;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2275 y_offset += 8*s->mb_y;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2276
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2277 if(list0){
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
2278 Picture *ref= &h->ref_list[0][ h->ref_cache[0][ scan8[n] ] ];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2279 mc_dir_part(h, ref, n, square, chroma_height, delta, 0,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2280 dest_y, dest_cb, dest_cr, x_offset, y_offset,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2281 qpix_op, chroma_op);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2282
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2283 qpix_op= qpix_avg;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2284 chroma_op= chroma_avg;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2285 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2286
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2287 if(list1){
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
2288 Picture *ref= &h->ref_list[1][ h->ref_cache[1][ scan8[n] ] ];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2289 mc_dir_part(h, ref, n, square, chroma_height, delta, 1,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2290 dest_y, dest_cb, dest_cr, x_offset, y_offset,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2291 qpix_op, chroma_op);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2292 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2293 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2294
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2295 static inline void mc_part_weighted(H264Context *h, int n, int square, int chroma_height, int delta,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2296 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2297 int x_offset, int y_offset,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2298 qpel_mc_func *qpix_put, h264_chroma_mc_func chroma_put,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2299 h264_weight_func luma_weight_op, h264_weight_func chroma_weight_op,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2300 h264_biweight_func luma_weight_avg, h264_biweight_func chroma_weight_avg,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2301 int list0, int list1){
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2302 MpegEncContext * const s = &h->s;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2303
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2304 dest_y += 2*x_offset + 2*y_offset*s-> linesize;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2305 dest_cb += x_offset + y_offset*s->uvlinesize;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2306 dest_cr += x_offset + y_offset*s->uvlinesize;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2307 x_offset += 8*s->mb_x;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2308 y_offset += 8*s->mb_y;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2309
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2310 if(list0 && list1){
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2311 /* don't optimize for luma-only case, since B-frames usually
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2312 * use implicit weights => chroma too. */
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2313 uint8_t *tmp_cb = s->obmc_scratchpad;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2314 uint8_t *tmp_cr = tmp_cb + 8*s->uvlinesize;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2315 uint8_t *tmp_y = tmp_cr + 8*s->uvlinesize;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2316 int refn0 = h->ref_cache[0][ scan8[n] ];
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2317 int refn1 = h->ref_cache[1][ scan8[n] ];
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2318
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2319 mc_dir_part(h, &h->ref_list[0][refn0], n, square, chroma_height, delta, 0,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2320 dest_y, dest_cb, dest_cr,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2321 x_offset, y_offset, qpix_put, chroma_put);
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2322 mc_dir_part(h, &h->ref_list[1][refn1], n, square, chroma_height, delta, 1,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2323 tmp_y, tmp_cb, tmp_cr,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2324 x_offset, y_offset, qpix_put, chroma_put);
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2325
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2326 if(h->use_weight == 2){
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2327 int weight0 = h->implicit_weight[refn0][refn1];
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2328 int weight1 = 64 - weight0;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2329 luma_weight_avg( dest_y, tmp_y, s-> linesize, 5, weight0, weight1, 0, 0);
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2330 chroma_weight_avg(dest_cb, tmp_cb, s->uvlinesize, 5, weight0, weight1, 0, 0);
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2331 chroma_weight_avg(dest_cr, tmp_cr, s->uvlinesize, 5, weight0, weight1, 0, 0);
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2332 }else{
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2333 luma_weight_avg(dest_y, tmp_y, s->linesize, h->luma_log2_weight_denom,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2334 h->luma_weight[0][refn0], h->luma_weight[1][refn1],
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2335 h->luma_offset[0][refn0], h->luma_offset[1][refn1]);
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2336 chroma_weight_avg(dest_cb, tmp_cb, s->uvlinesize, h->chroma_log2_weight_denom,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2337 h->chroma_weight[0][refn0][0], h->chroma_weight[1][refn1][0],
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2338 h->chroma_offset[0][refn0][0], h->chroma_offset[1][refn1][0]);
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2339 chroma_weight_avg(dest_cr, tmp_cr, s->uvlinesize, h->chroma_log2_weight_denom,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2340 h->chroma_weight[0][refn0][1], h->chroma_weight[1][refn1][1],
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2341 h->chroma_offset[0][refn0][1], h->chroma_offset[1][refn1][1]);
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2342 }
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2343 }else{
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2344 int list = list1 ? 1 : 0;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2345 int refn = h->ref_cache[list][ scan8[n] ];
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2346 Picture *ref= &h->ref_list[list][refn];
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2347 mc_dir_part(h, ref, n, square, chroma_height, delta, list,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2348 dest_y, dest_cb, dest_cr, x_offset, y_offset,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2349 qpix_put, chroma_put);
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2350
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2351 luma_weight_op(dest_y, s->linesize, h->luma_log2_weight_denom,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2352 h->luma_weight[list][refn], h->luma_offset[list][refn]);
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2353 if(h->use_weight_chroma){
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2354 chroma_weight_op(dest_cb, s->uvlinesize, h->chroma_log2_weight_denom,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2355 h->chroma_weight[list][refn][0], h->chroma_offset[list][refn][0]);
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2356 chroma_weight_op(dest_cr, s->uvlinesize, h->chroma_log2_weight_denom,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2357 h->chroma_weight[list][refn][1], h->chroma_offset[list][refn][1]);
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2358 }
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2359 }
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2360 }
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2361
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2362 static inline void mc_part(H264Context *h, int n, int square, int chroma_height, int delta,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2363 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2364 int x_offset, int y_offset,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2365 qpel_mc_func *qpix_put, h264_chroma_mc_func chroma_put,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2366 qpel_mc_func *qpix_avg, h264_chroma_mc_func chroma_avg,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2367 h264_weight_func *weight_op, h264_biweight_func *weight_avg,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2368 int list0, int list1){
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2369 if((h->use_weight==2 && list0 && list1
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2370 && (h->implicit_weight[ h->ref_cache[0][scan8[n]] ][ h->ref_cache[1][scan8[n]] ] != 32))
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2371 || h->use_weight==1)
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2372 mc_part_weighted(h, n, square, chroma_height, delta, dest_y, dest_cb, dest_cr,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2373 x_offset, y_offset, qpix_put, chroma_put,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2374 weight_op[0], weight_op[3], weight_avg[0], weight_avg[3], list0, list1);
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2375 else
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2376 mc_part_std(h, n, square, chroma_height, delta, dest_y, dest_cb, dest_cr,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2377 x_offset, y_offset, qpix_put, chroma_put, qpix_avg, chroma_avg, list0, list1);
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2378 }
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2379
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2380 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
2381 qpel_mc_func (*qpix_put)[16], h264_chroma_mc_func (*chroma_put),
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2382 qpel_mc_func (*qpix_avg)[16], h264_chroma_mc_func (*chroma_avg),
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2383 h264_weight_func *weight_op, h264_biweight_func *weight_avg){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2384 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
2385 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2386 const int mb_type= s->current_picture.mb_type[mb_xy];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2387
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2388 assert(IS_INTER(mb_type));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2389
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2390 if(IS_16X16(mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2391 mc_part(h, 0, 1, 8, 0, dest_y, dest_cb, dest_cr, 0, 0,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2392 qpix_put[0], chroma_put[0], qpix_avg[0], chroma_avg[0],
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2393 &weight_op[0], &weight_avg[0],
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2394 IS_DIR(mb_type, 0, 0), IS_DIR(mb_type, 0, 1));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2395 }else if(IS_16X8(mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2396 mc_part(h, 0, 0, 4, 8, dest_y, dest_cb, dest_cr, 0, 0,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2397 qpix_put[1], chroma_put[0], qpix_avg[1], chroma_avg[0],
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2398 &weight_op[1], &weight_avg[1],
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2399 IS_DIR(mb_type, 0, 0), IS_DIR(mb_type, 0, 1));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2400 mc_part(h, 8, 0, 4, 8, dest_y, dest_cb, dest_cr, 0, 4,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2401 qpix_put[1], chroma_put[0], qpix_avg[1], chroma_avg[0],
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2402 &weight_op[1], &weight_avg[1],
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2403 IS_DIR(mb_type, 1, 0), IS_DIR(mb_type, 1, 1));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2404 }else if(IS_8X16(mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2405 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
2406 qpix_put[1], chroma_put[1], qpix_avg[1], chroma_avg[1],
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2407 &weight_op[2], &weight_avg[2],
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2408 IS_DIR(mb_type, 0, 0), IS_DIR(mb_type, 0, 1));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2409 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
2410 qpix_put[1], chroma_put[1], qpix_avg[1], chroma_avg[1],
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2411 &weight_op[2], &weight_avg[2],
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2412 IS_DIR(mb_type, 1, 0), IS_DIR(mb_type, 1, 1));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2413 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2414 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2415
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2416 assert(IS_8X8(mb_type));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2417
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2418 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2419 const int sub_mb_type= h->sub_mb_type[i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2420 const int n= 4*i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2421 int x_offset= (i&1)<<2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2422 int y_offset= (i&2)<<1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2423
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2424 if(IS_SUB_8X8(sub_mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2425 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
2426 qpix_put[1], chroma_put[1], qpix_avg[1], chroma_avg[1],
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2427 &weight_op[3], &weight_avg[3],
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2428 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2429 }else if(IS_SUB_8X4(sub_mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2430 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
2431 qpix_put[2], chroma_put[1], qpix_avg[2], chroma_avg[1],
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2432 &weight_op[4], &weight_avg[4],
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2433 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2434 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
2435 qpix_put[2], chroma_put[1], qpix_avg[2], chroma_avg[1],
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2436 &weight_op[4], &weight_avg[4],
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2437 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2438 }else if(IS_SUB_4X8(sub_mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2439 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
2440 qpix_put[2], chroma_put[2], qpix_avg[2], chroma_avg[2],
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2441 &weight_op[5], &weight_avg[5],
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2442 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2443 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
2444 qpix_put[2], chroma_put[2], qpix_avg[2], chroma_avg[2],
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2445 &weight_op[5], &weight_avg[5],
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2446 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2447 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2448 int j;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2449 assert(IS_SUB_4X4(sub_mb_type));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2450 for(j=0; j<4; j++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2451 int sub_x_offset= x_offset + 2*(j&1);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2452 int sub_y_offset= y_offset + (j&2);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2453 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
2454 qpix_put[2], chroma_put[2], qpix_avg[2], chroma_avg[2],
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2455 &weight_op[6], &weight_avg[6],
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2456 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2457 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2458 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2459 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2460 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2461 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2462
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2463 static void decode_init_vlc(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2464 static int done = 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2465
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2466 if (!done) {
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2467 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2468 done = 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2469
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2470 init_vlc(&chroma_dc_coeff_token_vlc, CHROMA_DC_COEFF_TOKEN_VLC_BITS, 4*5,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2471 &chroma_dc_coeff_token_len [0], 1, 1,
2370
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2365
diff changeset
2472 &chroma_dc_coeff_token_bits[0], 1, 1, 1);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2473
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2474 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2475 init_vlc(&coeff_token_vlc[i], COEFF_TOKEN_VLC_BITS, 4*17,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2476 &coeff_token_len [i][0], 1, 1,
2370
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2365
diff changeset
2477 &coeff_token_bits[i][0], 1, 1, 1);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2478 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2479
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2480 for(i=0; i<3; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2481 init_vlc(&chroma_dc_total_zeros_vlc[i], CHROMA_DC_TOTAL_ZEROS_VLC_BITS, 4,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2482 &chroma_dc_total_zeros_len [i][0], 1, 1,
2370
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2365
diff changeset
2483 &chroma_dc_total_zeros_bits[i][0], 1, 1, 1);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2484 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2485 for(i=0; i<15; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2486 init_vlc(&total_zeros_vlc[i], TOTAL_ZEROS_VLC_BITS, 16,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2487 &total_zeros_len [i][0], 1, 1,
2370
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2365
diff changeset
2488 &total_zeros_bits[i][0], 1, 1, 1);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2489 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2490
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2491 for(i=0; i<6; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2492 init_vlc(&run_vlc[i], RUN_VLC_BITS, 7,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2493 &run_len [i][0], 1, 1,
2370
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2365
diff changeset
2494 &run_bits[i][0], 1, 1, 1);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2495 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2496 init_vlc(&run7_vlc, RUN7_VLC_BITS, 16,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2497 &run_len [6][0], 1, 1,
2370
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2365
diff changeset
2498 &run_bits[6][0], 1, 1, 1);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2499 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2500 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2501
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2502 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2503 * Sets the intra prediction function pointers.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2504 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2505 static void init_pred_ptrs(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2506 // MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2507
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2508 h->pred4x4[VERT_PRED ]= pred4x4_vertical_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2509 h->pred4x4[HOR_PRED ]= pred4x4_horizontal_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2510 h->pred4x4[DC_PRED ]= pred4x4_dc_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2511 h->pred4x4[DIAG_DOWN_LEFT_PRED ]= pred4x4_down_left_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2512 h->pred4x4[DIAG_DOWN_RIGHT_PRED]= pred4x4_down_right_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2513 h->pred4x4[VERT_RIGHT_PRED ]= pred4x4_vertical_right_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2514 h->pred4x4[HOR_DOWN_PRED ]= pred4x4_horizontal_down_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2515 h->pred4x4[VERT_LEFT_PRED ]= pred4x4_vertical_left_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2516 h->pred4x4[HOR_UP_PRED ]= pred4x4_horizontal_up_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2517 h->pred4x4[LEFT_DC_PRED ]= pred4x4_left_dc_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2518 h->pred4x4[TOP_DC_PRED ]= pred4x4_top_dc_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2519 h->pred4x4[DC_128_PRED ]= pred4x4_128_dc_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2520
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2521 h->pred8x8[DC_PRED8x8 ]= pred8x8_dc_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2522 h->pred8x8[VERT_PRED8x8 ]= pred8x8_vertical_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2523 h->pred8x8[HOR_PRED8x8 ]= pred8x8_horizontal_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2524 h->pred8x8[PLANE_PRED8x8 ]= pred8x8_plane_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2525 h->pred8x8[LEFT_DC_PRED8x8]= pred8x8_left_dc_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2526 h->pred8x8[TOP_DC_PRED8x8 ]= pred8x8_top_dc_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2527 h->pred8x8[DC_128_PRED8x8 ]= pred8x8_128_dc_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2528
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2529 h->pred16x16[DC_PRED8x8 ]= pred16x16_dc_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2530 h->pred16x16[VERT_PRED8x8 ]= pred16x16_vertical_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2531 h->pred16x16[HOR_PRED8x8 ]= pred16x16_horizontal_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2532 h->pred16x16[PLANE_PRED8x8 ]= pred16x16_plane_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2533 h->pred16x16[LEFT_DC_PRED8x8]= pred16x16_left_dc_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2534 h->pred16x16[TOP_DC_PRED8x8 ]= pred16x16_top_dc_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2535 h->pred16x16[DC_128_PRED8x8 ]= pred16x16_128_dc_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2536 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2537
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2538 static void free_tables(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2539 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
2540 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
2541 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
2542 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
2543 av_freep(&h->mvd_table[1]);
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
2544 av_freep(&h->direct_table);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2545 av_freep(&h->non_zero_count);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2546 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
2547 av_freep(&h->top_border);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2548 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
2549
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2550 av_freep(&h->mb2b_xy);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2551 av_freep(&h->mb2b8_xy);
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2552
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2553 av_freep(&h->s.obmc_scratchpad);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2554 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2555
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2556 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2557 * allocates tables.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2558 * needs widzh/height
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2559 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2560 static int alloc_tables(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2561 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
2562 const int big_mb_num= s->mb_stride * (s->mb_height+1);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2563 int x,y;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2564
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2565 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
2566
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2567 CHECKED_ALLOCZ(h->non_zero_count , big_mb_num * 16 * sizeof(uint8_t))
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2568 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
2569 CHECKED_ALLOCZ(h->top_border , s->mb_width * (16+8+8) * sizeof(uint8_t))
2336
9cd834fc7325 segfault fix
michael
parents: 2317
diff changeset
2570 CHECKED_ALLOCZ(h->cbp_table, big_mb_num * sizeof(uint16_t))
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2571
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
2572 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
2573 CHECKED_ALLOCZ(h->chroma_pred_mode_table, big_mb_num * sizeof(uint8_t))
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
2574 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
2575 CHECKED_ALLOCZ(h->mvd_table[1], 32*big_mb_num * sizeof(uint16_t));
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
2576 CHECKED_ALLOCZ(h->direct_table, 32*big_mb_num * sizeof(uint8_t));
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
2577 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
2578
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2579 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
2580 h->slice_table= h->slice_table_base + s->mb_stride + 1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2581
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2582 CHECKED_ALLOCZ(h->mb2b_xy , big_mb_num * sizeof(uint16_t));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2583 CHECKED_ALLOCZ(h->mb2b8_xy , big_mb_num * sizeof(uint16_t));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2584 for(y=0; y<s->mb_height; y++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2585 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
2586 const int mb_xy= x + y*s->mb_stride;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2587 const int b_xy = 4*x + 4*y*h->b_stride;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2588 const int b8_xy= 2*x + 2*y*h->b8_stride;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2589
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2590 h->mb2b_xy [mb_xy]= b_xy;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2591 h->mb2b8_xy[mb_xy]= b8_xy;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2592 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2593 }
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2594
2417
991f39305057 10l (obmc_scratchpad not always initialize)
lorenm
parents: 2416
diff changeset
2595 s->obmc_scratchpad = NULL;
991f39305057 10l (obmc_scratchpad not always initialize)
lorenm
parents: 2416
diff changeset
2596
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2597 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2598 fail:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2599 free_tables(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2600 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2601 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2602
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2603 static void common_init(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2604 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2605
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2606 s->width = s->avctx->width;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2607 s->height = s->avctx->height;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2608 s->codec_id= s->avctx->codec->id;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2609
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2610 init_pred_ptrs(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2611
1698
420cac032278 svq3 fix
michael
parents: 1636
diff changeset
2612 s->unrestricted_mv=1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2613 s->decode=1; //FIXME
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2614 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2615
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2616 static int decode_init(AVCodecContext *avctx){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2617 H264Context *h= avctx->priv_data;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2618 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2619
1892
5ac49e7a1b8f init cleanup
michael
parents: 1786
diff changeset
2620 MPV_decode_defaults(s);
5ac49e7a1b8f init cleanup
michael
parents: 1786
diff changeset
2621
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2622 s->avctx = avctx;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2623 common_init(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2624
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2625 s->out_format = FMT_H264;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2626 s->workaround_bugs= avctx->workaround_bugs;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2627
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2628 // set defaults
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2629 // s->decode_mb= ff_h263_decode_mb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2630 s->low_delay= 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2631 avctx->pix_fmt= PIX_FMT_YUV420P;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2632
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2633 decode_init_vlc(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2634
2547
c5781912ad8a improved detection of "AVC1" style H.264 patch by (Mns Rullgrd <mru inprovide com>)
michael
parents: 2538
diff changeset
2635 if(avctx->extradata_size > 0 && avctx->extradata &&
c5781912ad8a improved detection of "AVC1" style H.264 patch by (Mns Rullgrd <mru inprovide com>)
michael
parents: 2538
diff changeset
2636 *(char *)avctx->extradata == 1){
2227
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
2637 h->is_avc = 1;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
2638 h->got_avcC = 0;
2547
c5781912ad8a improved detection of "AVC1" style H.264 patch by (Mns Rullgrd <mru inprovide com>)
michael
parents: 2538
diff changeset
2639 } else {
c5781912ad8a improved detection of "AVC1" style H.264 patch by (Mns Rullgrd <mru inprovide com>)
michael
parents: 2538
diff changeset
2640 h->is_avc = 0;
2227
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
2641 }
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
2642
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2643 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2644 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2645
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2646 static void frame_start(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2647 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2648 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2649
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2650 MPV_frame_start(s, s->avctx);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2651 ff_er_frame_start(s);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2652
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2653 assert(s->linesize && s->uvlinesize);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2654
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2655 for(i=0; i<16; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2656 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
2657 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
2658 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2659 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2660 h->block_offset[16+i]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2661 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
2662 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2663
2416
06b7d678b582 10l: scratchpad could be allocated before its size was known.
lorenm
parents: 2415
diff changeset
2664 /* can't be in alloc_tables because linesize isn't known there.
06b7d678b582 10l: scratchpad could be allocated before its size was known.
lorenm
parents: 2415
diff changeset
2665 * FIXME: redo bipred weight to not require extra buffer? */
06b7d678b582 10l: scratchpad could be allocated before its size was known.
lorenm
parents: 2415
diff changeset
2666 if(!s->obmc_scratchpad)
06b7d678b582 10l: scratchpad could be allocated before its size was known.
lorenm
parents: 2415
diff changeset
2667 s->obmc_scratchpad = av_malloc(16*s->linesize + 2*8*s->uvlinesize);
06b7d678b582 10l: scratchpad could be allocated before its size was known.
lorenm
parents: 2415
diff changeset
2668
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2669 // 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
2670 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2671
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2672 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
2673 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
2674 int i;
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2675
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2676 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
2677 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
2678 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
2679
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2680 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
2681 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
2682 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
2683 }
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2684
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2685 *(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
2686 *(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
2687
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2688 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
2689 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
2690 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
2691 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
2692 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
2693 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
2694 }
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2695 *(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
2696 *(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
2697 }
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2698 }
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2699
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2700 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
2701 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
2702 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
2703 uint64_t temp64;
2200
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
2704 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
2705 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
2706
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2707 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
2708 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
2709 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
2710
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2711 #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
2712 t= a;\
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2713 if(xchg)\
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2714 a= b;\
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2715 b= t;
2200
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
2716
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
2717 if(deblock_left){
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
2718 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
2719 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
2720 }
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
2721 }
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
2722
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
2723 if(deblock_top){
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
2724 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
2725 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
2726 }
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2727
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2728 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
2729 if(deblock_left){
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
2730 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
2731 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
2732 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
2733 }
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2734 }
2200
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
2735 if(deblock_top){
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
2736 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
2737 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
2738 }
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2739 }
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2740 }
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2741
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2742 static void hl_decode_mb(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2743 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2744 const int mb_x= s->mb_x;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2745 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
2746 const int mb_xy= mb_x + mb_y*s->mb_stride;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2747 const int mb_type= s->current_picture.mb_type[mb_xy];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2748 uint8_t *dest_y, *dest_cb, *dest_cr;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2749 int linesize, uvlinesize /*dct_offset*/;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2750 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2751
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2752 if(!s->decode)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2753 return;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2754
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2755 if(s->mb_skiped){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2756 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2757
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2758 dest_y = s->current_picture.data[0] + (mb_y * 16* s->linesize ) + mb_x * 16;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2759 dest_cb = s->current_picture.data[1] + (mb_y * 8 * s->uvlinesize) + mb_x * 8;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2760 dest_cr = s->current_picture.data[2] + (mb_y * 8 * s->uvlinesize) + mb_x * 8;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2761
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2762 if (h->mb_field_decoding_flag) {
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2763 linesize = s->linesize * 2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2764 uvlinesize = s->uvlinesize * 2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2765 if(mb_y&1){ //FIXME move out of this func?
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2766 dest_y -= s->linesize*15;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2767 dest_cb-= s->linesize*7;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2768 dest_cr-= s->linesize*7;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2769 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2770 } else {
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2771 linesize = s->linesize;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2772 uvlinesize = s->uvlinesize;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2773 // dct_offset = s->linesize * 16;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2774 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2775
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
2776 if (IS_INTRA_PCM(mb_type)) {
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
2777 unsigned int x, y;
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
2778
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
2779 // The pixels are stored in h->mb array in the same order as levels,
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
2780 // copy them in output in the correct order.
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
2781 for(i=0; i<16; i++) {
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
2782 for (y=0; y<4; y++) {
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
2783 for (x=0; x<4; x++) {
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
2784 *(dest_y + h->block_offset[i] + y*linesize + x) = h->mb[i*16+y*4+x];
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
2785 }
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
2786 }
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
2787 }
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
2788 for(i=16; i<16+4; i++) {
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
2789 for (y=0; y<4; y++) {
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
2790 for (x=0; x<4; x++) {
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
2791 *(dest_cb + h->block_offset[i] + y*uvlinesize + x) = h->mb[i*16+y*4+x];
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
2792 }
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
2793 }
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
2794 }
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
2795 for(i=20; i<20+4; i++) {
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
2796 for (y=0; y<4; y++) {
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
2797 for (x=0; x<4; x++) {
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
2798 *(dest_cr + h->block_offset[i] + y*uvlinesize + x) = h->mb[i*16+y*4+x];
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
2799 }
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
2800 }
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
2801 }
2509
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2802 } else {
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2803 if(IS_INTRA(mb_type)){
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2804 if(h->deblocking_filter)
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2805 xchg_mb_border(h, dest_y, dest_cb, dest_cr, linesize, uvlinesize, 1);
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2806
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2807 if(!(s->flags&CODEC_FLAG_GRAY)){
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2808 h->pred8x8[ h->chroma_pred_mode ](dest_cb, uvlinesize);
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2809 h->pred8x8[ h->chroma_pred_mode ](dest_cr, uvlinesize);
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2810 }
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2811
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2812 if(IS_INTRA4x4(mb_type)){
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2813 if(!s->encoding){
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2814 for(i=0; i<16; i++){
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2815 uint8_t * const ptr= dest_y + h->block_offset[i];
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2816 uint8_t *topright;
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2817 const int dir= h->intra4x4_pred_mode_cache[ scan8[i] ];
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2818 int tr;
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2819
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2820 if(dir == DIAG_DOWN_LEFT_PRED || dir == VERT_LEFT_PRED){
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2821 const int topright_avail= (h->topright_samples_available<<i)&0x8000;
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2822 assert(mb_y || linesize <= h->block_offset[i]);
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2823 if(!topright_avail){
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2824 tr= ptr[3 - linesize]*0x01010101;
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2825 topright= (uint8_t*) &tr;
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2826 }else if(i==5 && h->deblocking_filter){
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2827 tr= *(uint32_t*)h->top_border[mb_x+1];
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2828 topright= (uint8_t*) &tr;
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2829 }else
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2830 topright= ptr + 4 - linesize;
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2831 }else
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2832 topright= NULL;
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2833
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2834 h->pred4x4[ dir ](ptr, topright, linesize);
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2835 if(h->non_zero_count_cache[ scan8[i] ]){
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2836 if(s->codec_id == CODEC_ID_H264)
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2837 s->dsp.h264_idct_add(ptr, h->mb + i*16, linesize);
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2838 else
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2839 svq3_add_idct_c(ptr, h->mb + i*16, linesize, s->qscale, 0);
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2840 }
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2841 }
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2842 }
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2843 }else{
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2844 h->pred16x16[ h->intra16x16_pred_mode ](dest_y , linesize);
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2845 if(s->codec_id == CODEC_ID_H264)
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2846 h264_luma_dc_dequant_idct_c(h->mb, s->qscale);
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2847 else
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2848 svq3_luma_dc_dequant_idct_c(h->mb, s->qscale);
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2849 }
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2850 if(h->deblocking_filter)
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2851 xchg_mb_border(h, dest_y, dest_cb, dest_cr, linesize, uvlinesize, 0);
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2852 }else if(s->codec_id == CODEC_ID_H264){
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2853 hl_motion(h, dest_y, dest_cb, dest_cr,
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2854 s->dsp.put_h264_qpel_pixels_tab, s->dsp.put_h264_chroma_pixels_tab,
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2855 s->dsp.avg_h264_qpel_pixels_tab, s->dsp.avg_h264_chroma_pixels_tab,
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2856 s->dsp.weight_h264_pixels_tab, s->dsp.biweight_h264_pixels_tab);
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2857 }
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2858
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2859
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2860 if(!IS_INTRA4x4(mb_type)){
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2861 if(s->codec_id == CODEC_ID_H264){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2862 for(i=0; i<16; i++){
2509
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2863 if(h->non_zero_count_cache[ scan8[i] ] || h->mb[i*16]){ //FIXME benchmark weird rule, & below
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2864 uint8_t * const ptr= dest_y + h->block_offset[i];
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2865 s->dsp.h264_idct_add(ptr, h->mb + i*16, linesize);
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2866 }
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2867 }
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2868 }else{
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2869 for(i=0; i<16; i++){
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2870 if(h->non_zero_count_cache[ scan8[i] ] || h->mb[i*16]){ //FIXME benchmark weird rule, & below
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2871 uint8_t * const ptr= dest_y + h->block_offset[i];
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2872 svq3_add_idct_c(ptr, h->mb + i*16, linesize, s->qscale, IS_INTRA(mb_type) ? 1 : 0);
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
2873 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2874 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2875 }
2509
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2876 }
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2877
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2878 if(!(s->flags&CODEC_FLAG_GRAY)){
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2879 chroma_dc_dequant_idct_c(h->mb + 16*16, h->chroma_qp);
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2880 chroma_dc_dequant_idct_c(h->mb + 16*16+4*16, h->chroma_qp);
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2881 if(s->codec_id == CODEC_ID_H264){
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2882 for(i=16; i<16+4; i++){
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2883 if(h->non_zero_count_cache[ scan8[i] ] || h->mb[i*16]){
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2884 uint8_t * const ptr= dest_cb + h->block_offset[i];
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2885 s->dsp.h264_idct_add(ptr, h->mb + i*16, uvlinesize);
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2886 }
1250
fa181d095027 optimizations
michaelni
parents: 1234
diff changeset
2887 }
2509
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2888 for(i=20; i<20+4; i++){
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2889 if(h->non_zero_count_cache[ scan8[i] ] || h->mb[i*16]){
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2890 uint8_t * const ptr= dest_cr + h->block_offset[i];
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2891 s->dsp.h264_idct_add(ptr, h->mb + i*16, uvlinesize);
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2892 }
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2893 }
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2894 }else{
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2895 for(i=16; i<16+4; i++){
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2896 if(h->non_zero_count_cache[ scan8[i] ] || h->mb[i*16]){
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2897 uint8_t * const ptr= dest_cb + h->block_offset[i];
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2898 svq3_add_idct_c(ptr, h->mb + i*16, uvlinesize, chroma_qp[s->qscale + 12] - 12, 2);
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2899 }
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2900 }
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2901 for(i=20; i<20+4; i++){
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2902 if(h->non_zero_count_cache[ scan8[i] ] || h->mb[i*16]){
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2903 uint8_t * const ptr= dest_cr + h->block_offset[i];
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2904 svq3_add_idct_c(ptr, h->mb + i*16, uvlinesize, chroma_qp[s->qscale + 12] - 12, 2);
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
2905 }
1250
fa181d095027 optimizations
michaelni
parents: 1234
diff changeset
2906 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2907 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2908 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2909 }
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2910 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
2911 backup_mb_border(h, dest_y, dest_cb, dest_cr, linesize, uvlinesize);
2449
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
2912 fill_caches(h, mb_type, 1); //FIXME dont fill stuff which isnt used by filter_mb
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2913 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
2914 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2915 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2916
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2917 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2918 * fills the default_ref_list.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2919 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2920 static int fill_default_ref_list(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2921 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2922 int i;
2441
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
2923 int smallest_poc_greater_than_current = -1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2924 Picture sorted_short_ref[16];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2925
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2926 if(h->slice_type==B_TYPE){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2927 int out_i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2928 int limit= -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2929
2441
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
2930 /* sort frame according to poc in B slice */
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2931 for(out_i=0; out_i<h->short_ref_count; out_i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2932 int best_i=-1;
2255
507690ff49a2 assertion when playing AVC/H.264 streams fix by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2254
diff changeset
2933 int best_poc=INT_MAX;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2934
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2935 for(i=0; i<h->short_ref_count; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2936 const int poc= h->short_ref[i]->poc;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2937 if(poc > limit && poc < best_poc){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2938 best_poc= poc;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2939 best_i= i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2940 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2941 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2942
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2943 assert(best_i != -1);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2944
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2945 limit= best_poc;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2946 sorted_short_ref[out_i]= *h->short_ref[best_i];
2441
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
2947 tprintf("sorted poc: %d->%d poc:%d fn:%d\n", best_i, out_i, sorted_short_ref[out_i].poc, sorted_short_ref[out_i].frame_num);
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
2948 if (-1 == smallest_poc_greater_than_current) {
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
2949 if (h->short_ref[best_i]->poc >= s->current_picture_ptr->poc) {
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
2950 smallest_poc_greater_than_current = out_i;
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
2951 }
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
2952 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2953 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2954 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2955
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2956 if(s->picture_structure == PICT_FRAME){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2957 if(h->slice_type==B_TYPE){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2958 int list;
2441
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
2959 tprintf("current poc: %d, smallest_poc_greater_than_current: %d\n", s->current_picture_ptr->poc, smallest_poc_greater_than_current);
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
2960
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
2961 // find the largest poc
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2962 for(list=0; list<2; list++){
2441
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
2963 int index = 0;
2447
0237bb5ca0f0 simplify
michael
parents: 2441
diff changeset
2964 int j= -99;
0237bb5ca0f0 simplify
michael
parents: 2441
diff changeset
2965 int step= list ? -1 : 1;
0237bb5ca0f0 simplify
michael
parents: 2441
diff changeset
2966
0237bb5ca0f0 simplify
michael
parents: 2441
diff changeset
2967 for(i=0; i<h->short_ref_count && index < h->ref_count[list]; i++, j+=step) {
0237bb5ca0f0 simplify
michael
parents: 2441
diff changeset
2968 while(j<0 || j>= h->short_ref_count){
0237bb5ca0f0 simplify
michael
parents: 2441
diff changeset
2969 step = -step;
0237bb5ca0f0 simplify
michael
parents: 2441
diff changeset
2970 j= smallest_poc_greater_than_current + (step>>1);
2441
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
2971 }
2447
0237bb5ca0f0 simplify
michael
parents: 2441
diff changeset
2972 if(sorted_short_ref[j].reference != 3) continue;
0237bb5ca0f0 simplify
michael
parents: 2441
diff changeset
2973 h->default_ref_list[list][index ]= sorted_short_ref[j];
0237bb5ca0f0 simplify
michael
parents: 2441
diff changeset
2974 h->default_ref_list[list][index++].pic_id= sorted_short_ref[j].frame_num;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2975 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2976
2441
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
2977 for(i = 0; i < 16 && index < h->ref_count[ list ]; i++){
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
2978 if(h->long_ref[i] == NULL) continue;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2979 if(h->long_ref[i]->reference != 3) continue;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2980
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2981 h->default_ref_list[ list ][index ]= *h->long_ref[i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2982 h->default_ref_list[ list ][index++].pic_id= i;;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2983 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2984
2447
0237bb5ca0f0 simplify
michael
parents: 2441
diff changeset
2985 if(list && (smallest_poc_greater_than_current<=0 || smallest_poc_greater_than_current>=h->short_ref_count) && (1 < index)){
2441
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
2986 // swap the two first elements of L1 when
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
2987 // L0 and L1 are identical
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2988 Picture temp= h->default_ref_list[1][0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2989 h->default_ref_list[1][0] = h->default_ref_list[1][1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2990 h->default_ref_list[1][0] = temp;
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(index < h->ref_count[ list ])
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2994 memset(&h->default_ref_list[list][index], 0, sizeof(Picture)*(h->ref_count[ list ] - index));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2995 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2996 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2997 int index=0;
2537
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
2998 for(i=0; i<h->short_ref_count; i++){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2999 if(h->short_ref[i]->reference != 3) continue; //FIXME refernce field shit
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3000 h->default_ref_list[0][index ]= *h->short_ref[i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3001 h->default_ref_list[0][index++].pic_id= h->short_ref[i]->frame_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3002 }
2537
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
3003 for(i = 0; i < 16; i++){
2441
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3004 if(h->long_ref[i] == NULL) continue;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3005 if(h->long_ref[i]->reference != 3) continue;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3006 h->default_ref_list[0][index ]= *h->long_ref[i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3007 h->default_ref_list[0][index++].pic_id= i;;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3008 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3009 if(index < h->ref_count[0])
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3010 memset(&h->default_ref_list[0][index], 0, sizeof(Picture)*(h->ref_count[0] - index));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3011 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3012 }else{ //FIELD
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3013 if(h->slice_type==B_TYPE){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3014 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3015 //FIXME second field balh
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3016 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3017 }
2441
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3018 #ifdef TRACE
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3019 for (i=0; i<h->ref_count[0]; i++) {
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3020 tprintf("List0: %s fn:%d 0x%p\n", (h->default_ref_list[0][i].long_ref ? "LT" : "ST"), h->default_ref_list[0][i].pic_id, h->default_ref_list[0][i].data[0]);
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3021 }
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3022 if(h->slice_type==B_TYPE){
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3023 for (i=0; i<h->ref_count[1]; i++) {
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3024 tprintf("List1: %s fn:%d 0x%p\n", (h->default_ref_list[1][i].long_ref ? "LT" : "ST"), h->default_ref_list[1][i].pic_id, h->default_ref_list[0][i].data[0]);
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3025 }
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3026 }
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3027 #endif
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3028 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3029 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3030
2441
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3031 static void print_short_term(H264Context *h);
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3032 static void print_long_term(H264Context *h);
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3033
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3034 static int decode_ref_pic_list_reordering(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3035 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3036 int list;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3037
2441
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3038 print_short_term(h);
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3039 print_long_term(h);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3040 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
3041
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3042 for(list=0; list<2; list++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3043 memcpy(h->ref_list[list], h->default_ref_list[list], sizeof(Picture)*h->ref_count[list]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3044
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3045 if(get_bits1(&s->gb)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3046 int pred= h->curr_pic_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3047 int index;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3048
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3049 for(index=0; ; index++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3050 int reordering_of_pic_nums_idc= get_ue_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3051 int pic_id;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3052 int i;
2537
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
3053 Picture *ref = NULL;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3054
2284
6d26e105f68f h.264 ref list reordering bugfix patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2272
diff changeset
3055 if(reordering_of_pic_nums_idc==3)
6d26e105f68f h.264 ref list reordering bugfix patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2272
diff changeset
3056 break;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3057
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3058 if(index >= h->ref_count[list]){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
3059 av_log(h->s.avctx, AV_LOG_ERROR, "reference count overflow\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3060 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3061 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3062
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3063 if(reordering_of_pic_nums_idc<3){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3064 if(reordering_of_pic_nums_idc<2){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3065 const int abs_diff_pic_num= get_ue_golomb(&s->gb) + 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3066
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3067 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
3068 av_log(h->s.avctx, AV_LOG_ERROR, "abs_diff_pic_num overflow\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3069 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3070 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3071
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3072 if(reordering_of_pic_nums_idc == 0) pred-= abs_diff_pic_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3073 else pred+= abs_diff_pic_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3074 pred &= h->max_pic_num - 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3075
2537
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
3076 for(i= h->short_ref_count-1; i>=0; i--){
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
3077 ref = h->short_ref[i];
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
3078 if(ref->data[0] != NULL && ref->frame_num == pred && ref->long_ref == 0) // ignore non existing pictures by testing data[0] pointer
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3079 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3080 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3081 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3082 pic_id= get_ue_golomb(&s->gb); //long_term_pic_idx
2537
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
3083 ref = h->long_ref[pic_id];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3084 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3085
2485
2844b8cf4e11 H.264 multiplce instance in reference list patch by (Loic <lll+ffmpeg m4x org )
michael
parents: 2484
diff changeset
3086 if (i < 0) {
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
3087 av_log(h->s.avctx, AV_LOG_ERROR, "reference picture missing during reorder\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3088 memset(&h->ref_list[list][index], 0, sizeof(Picture)); //FIXME
2537
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
3089 } else {
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
3090 h->ref_list[list][index]= *ref;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3091 }
2284
6d26e105f68f h.264 ref list reordering bugfix patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2272
diff changeset
3092 }else{
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
3093 av_log(h->s.avctx, AV_LOG_ERROR, "illegal reordering_of_pic_nums_idc\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3094 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3095 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3096 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3097 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3098
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3099 if(h->slice_type!=B_TYPE) break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3100 }
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
3101
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
3102 if(h->slice_type==B_TYPE && !h->direct_spatial_mv_pred)
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
3103 direct_dist_scale_factor(h);
2537
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
3104 direct_ref_list_init(h);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3105 return 0;
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 static int pred_weight_table(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3109 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3110 int list, i;
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3111 int luma_def, chroma_def;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3112
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3113 h->use_weight= 0;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3114 h->use_weight_chroma= 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3115 h->luma_log2_weight_denom= get_ue_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3116 h->chroma_log2_weight_denom= get_ue_golomb(&s->gb);
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3117 luma_def = 1<<h->luma_log2_weight_denom;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3118 chroma_def = 1<<h->chroma_log2_weight_denom;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3119
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3120 for(list=0; list<2; list++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3121 for(i=0; i<h->ref_count[list]; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3122 int luma_weight_flag, chroma_weight_flag;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3123
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3124 luma_weight_flag= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3125 if(luma_weight_flag){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3126 h->luma_weight[list][i]= get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3127 h->luma_offset[list][i]= get_se_golomb(&s->gb);
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3128 if( h->luma_weight[list][i] != luma_def
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3129 || h->luma_offset[list][i] != 0)
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3130 h->use_weight= 1;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3131 }else{
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3132 h->luma_weight[list][i]= luma_def;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3133 h->luma_offset[list][i]= 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3134 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3135
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3136 chroma_weight_flag= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3137 if(chroma_weight_flag){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3138 int j;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3139 for(j=0; j<2; j++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3140 h->chroma_weight[list][i][j]= get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3141 h->chroma_offset[list][i][j]= get_se_golomb(&s->gb);
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3142 if( h->chroma_weight[list][i][j] != chroma_def
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3143 || h->chroma_offset[list][i][j] != 0)
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3144 h->use_weight_chroma= 1;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3145 }
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3146 }else{
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3147 int j;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3148 for(j=0; j<2; j++){
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3149 h->chroma_weight[list][i][j]= chroma_def;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3150 h->chroma_offset[list][i][j]= 0;
1168
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 if(h->slice_type != B_TYPE) break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3155 }
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3156 h->use_weight= h->use_weight || h->use_weight_chroma;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3157 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3158 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3159
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3160 static void implicit_weight_table(H264Context *h){
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3161 MpegEncContext * const s = &h->s;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3162 int ref0, ref1;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3163 int cur_poc = s->current_picture_ptr->poc;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3164
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3165 if( h->ref_count[0] == 1 && h->ref_count[1] == 1
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3166 && h->ref_list[0][0].poc + h->ref_list[1][0].poc == 2*cur_poc){
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3167 h->use_weight= 0;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3168 h->use_weight_chroma= 0;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3169 return;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3170 }
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3171
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3172 h->use_weight= 2;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3173 h->use_weight_chroma= 2;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3174 h->luma_log2_weight_denom= 5;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3175 h->chroma_log2_weight_denom= 5;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3176
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3177 /* FIXME: MBAFF */
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3178 for(ref0=0; ref0 < h->ref_count[0]; ref0++){
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3179 int poc0 = h->ref_list[0][ref0].poc;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3180 for(ref1=0; ref1 < h->ref_count[1]; ref1++){
2519
b34f2cac6a71 10l in implicit_weight_table
lorenm
parents: 2509
diff changeset
3181 int poc1 = h->ref_list[1][ref1].poc;
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3182 int td = clip(poc1 - poc0, -128, 127);
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3183 if(td){
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3184 int tb = clip(cur_poc - poc0, -128, 127);
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3185 int tx = (16384 + (ABS(td) >> 1)) / td;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3186 int dist_scale_factor = clip((tb*tx + 32) >> 6, -1024, 1023) >> 2;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3187 if(dist_scale_factor < -64 || dist_scale_factor > 128)
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3188 h->implicit_weight[ref0][ref1] = 32;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3189 else
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3190 h->implicit_weight[ref0][ref1] = 64 - dist_scale_factor;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3191 }else
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3192 h->implicit_weight[ref0][ref1] = 32;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3193 }
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3194 }
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3195 }
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3196
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3197 /**
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
3198 * instantaneous decoder refresh.
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3199 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3200 static void idr(H264Context *h){
2409
26778a857b5b Sort B-frames into display order.
lorenm
parents: 2404
diff changeset
3201 int i,j;
26778a857b5b Sort B-frames into display order.
lorenm
parents: 2404
diff changeset
3202
26778a857b5b Sort B-frames into display order.
lorenm
parents: 2404
diff changeset
3203 #define CHECK_DELAY(pic) \
26778a857b5b Sort B-frames into display order.
lorenm
parents: 2404
diff changeset
3204 for(j = 0; h->delayed_pic[j]; j++) \
26778a857b5b Sort B-frames into display order.
lorenm
parents: 2404
diff changeset
3205 if(pic == h->delayed_pic[j]){ \
26778a857b5b Sort B-frames into display order.
lorenm
parents: 2404
diff changeset
3206 pic->reference=1; \
26778a857b5b Sort B-frames into display order.
lorenm
parents: 2404
diff changeset
3207 break; \
26778a857b5b Sort B-frames into display order.
lorenm
parents: 2404
diff changeset
3208 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3209
2484
a3188eb4266c correct long term picture management patch by (Loic <lll+ffmpeg m4x org>)
michael
parents: 2471
diff changeset
3210 for(i=0; i<16; i++){
a3188eb4266c correct long term picture management patch by (Loic <lll+ffmpeg m4x org>)
michael
parents: 2471
diff changeset
3211 if (h->long_ref[i] != NULL) {
a3188eb4266c correct long term picture management patch by (Loic <lll+ffmpeg m4x org>)
michael
parents: 2471
diff changeset
3212 h->long_ref[i]->reference=0;
a3188eb4266c correct long term picture management patch by (Loic <lll+ffmpeg m4x org>)
michael
parents: 2471
diff changeset
3213 CHECK_DELAY(h->long_ref[i]);
a3188eb4266c correct long term picture management patch by (Loic <lll+ffmpeg m4x org>)
michael
parents: 2471
diff changeset
3214 h->long_ref[i]= NULL;
a3188eb4266c correct long term picture management patch by (Loic <lll+ffmpeg m4x org>)
michael
parents: 2471
diff changeset
3215 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3216 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3217 h->long_ref_count=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3218
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3219 for(i=0; i<h->short_ref_count; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3220 h->short_ref[i]->reference=0;
2409
26778a857b5b Sort B-frames into display order.
lorenm
parents: 2404
diff changeset
3221 CHECK_DELAY(h->short_ref[i]);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3222 h->short_ref[i]= NULL;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3223 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3224 h->short_ref_count=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3225 }
2409
26778a857b5b Sort B-frames into display order.
lorenm
parents: 2404
diff changeset
3226 #undef CHECK_DELAY
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3227
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3228 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3229 *
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3230 * @return the removed picture or NULL if an error occures
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3231 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3232 static Picture * remove_short(H264Context *h, int frame_num){
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
3233 MpegEncContext * const s = &h->s;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3234 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3235
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
3236 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
3237 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
3238
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3239 for(i=0; i<h->short_ref_count; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3240 Picture *pic= h->short_ref[i];
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
3241 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
3242 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
3243 if(pic->frame_num == frame_num){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3244 h->short_ref[i]= NULL;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3245 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
3246 h->short_ref_count--;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3247 return pic;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3248 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3249 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3250 return NULL;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3251 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3252
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3253 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3254 *
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3255 * @return the removed picture or NULL if an error occures
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3256 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3257 static Picture * remove_long(H264Context *h, int i){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3258 Picture *pic;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3259
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3260 pic= h->long_ref[i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3261 h->long_ref[i]= NULL;
2441
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3262 if(pic) h->long_ref_count--;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3263
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3264 return pic;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3265 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3266
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3267 /**
2441
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3268 * print short term list
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3269 */
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3270 static void print_short_term(H264Context *h) {
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3271 uint32_t i;
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3272 if(h->s.avctx->debug&FF_DEBUG_MMCO) {
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3273 av_log(h->s.avctx, AV_LOG_DEBUG, "short term list:\n");
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3274 for(i=0; i<h->short_ref_count; i++){
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3275 Picture *pic= h->short_ref[i];
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3276 av_log(h->s.avctx, AV_LOG_DEBUG, "%d fn:%d poc:%d %p\n", i, pic->frame_num, pic->poc, pic->data[0]);
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3277 }
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3278 }
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3279 }
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3280
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3281 /**
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3282 * print long term list
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3283 */
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3284 static void print_long_term(H264Context *h) {
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3285 uint32_t i;
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3286 if(h->s.avctx->debug&FF_DEBUG_MMCO) {
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3287 av_log(h->s.avctx, AV_LOG_DEBUG, "long term list:\n");
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3288 for(i = 0; i < 16; i++){
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3289 Picture *pic= h->long_ref[i];
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3290 if (pic) {
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3291 av_log(h->s.avctx, AV_LOG_DEBUG, "%d fn:%d poc:%d %p\n", i, pic->frame_num, pic->poc, pic->data[0]);
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3292 }
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3293 }
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3294 }
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3295 }
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3296
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3297 /**
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3298 * Executes the reference picture marking (memory management control operations).
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3299 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3300 static int execute_ref_pic_marking(H264Context *h, MMCO *mmco, int mmco_count){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3301 MpegEncContext * const s = &h->s;
2441
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3302 int i, j;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3303 int current_is_long=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3304 Picture *pic;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3305
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3306 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
3307 av_log(h->s.avctx, AV_LOG_DEBUG, "no mmco here\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3308
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3309 for(i=0; i<mmco_count; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3310 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
3311 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
3312
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3313 switch(mmco[i].opcode){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3314 case MMCO_SHORT2UNUSED:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3315 pic= remove_short(h, mmco[i].short_frame_num);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3316 if(pic==NULL) return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3317 pic->reference= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3318 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3319 case MMCO_SHORT2LONG:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3320 pic= remove_long(h, mmco[i].long_index);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3321 if(pic) pic->reference=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3322
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3323 h->long_ref[ mmco[i].long_index ]= remove_short(h, mmco[i].short_frame_num);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3324 h->long_ref[ mmco[i].long_index ]->long_ref=1;
2484
a3188eb4266c correct long term picture management patch by (Loic <lll+ffmpeg m4x org>)
michael
parents: 2471
diff changeset
3325 h->long_ref_count++;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3326 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3327 case MMCO_LONG2UNUSED:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3328 pic= remove_long(h, mmco[i].long_index);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3329 if(pic==NULL) return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3330 pic->reference= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3331 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3332 case MMCO_LONG:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3333 pic= remove_long(h, mmco[i].long_index);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3334 if(pic) pic->reference=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3335
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3336 h->long_ref[ mmco[i].long_index ]= s->current_picture_ptr;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3337 h->long_ref[ mmco[i].long_index ]->long_ref=1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3338 h->long_ref_count++;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3339
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3340 current_is_long=1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3341 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3342 case MMCO_SET_MAX_LONG:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3343 assert(mmco[i].long_index <= 16);
2441
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3344 // just remove the long term which index is greater than new max
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3345 for(j = mmco[i].long_index; j<16; j++){
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3346 pic = remove_long(h, j);
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3347 if (pic) pic->reference=0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3348 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3349 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3350 case MMCO_RESET:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3351 while(h->short_ref_count){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3352 pic= remove_short(h, h->short_ref[0]->frame_num);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3353 pic->reference=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3354 }
2441
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3355 for(j = 0; j < 16; j++) {
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3356 pic= remove_long(h, j);
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3357 if(pic) pic->reference=0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3358 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3359 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3360 default: assert(0);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3361 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3362 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3363
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3364 if(!current_is_long){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3365 pic= remove_short(h, s->current_picture_ptr->frame_num);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3366 if(pic){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3367 pic->reference=0;
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
3368 av_log(h->s.avctx, AV_LOG_ERROR, "illegal short term buffer state detected\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3369 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3370
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3371 if(h->short_ref_count)
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
3372 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
3373
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
3374 h->short_ref[0]= s->current_picture_ptr;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3375 h->short_ref[0]->long_ref=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3376 h->short_ref_count++;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3377 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3378
2441
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3379 print_short_term(h);
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3380 print_long_term(h);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3381 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3382 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3383
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3384 static int decode_ref_pic_marking(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3385 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3386 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3387
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3388 if(h->nal_unit_type == NAL_IDR_SLICE){ //FIXME fields
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3389 s->broken_link= get_bits1(&s->gb) -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3390 h->mmco[0].long_index= get_bits1(&s->gb) - 1; // current_long_term_idx
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3391 if(h->mmco[0].long_index == -1)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3392 h->mmco_index= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3393 else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3394 h->mmco[0].opcode= MMCO_LONG;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3395 h->mmco_index= 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3396 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3397 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3398 if(get_bits1(&s->gb)){ // adaptive_ref_pic_marking_mode_flag
2402
f9d4e1eddbc5 - correct several errors on the deblocking accross slice boundaries.
michael
parents: 2401
diff changeset
3399 for(i= 0; i<MAX_MMCO_COUNT; i++) {
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3400 MMCOOpcode opcode= get_ue_golomb(&s->gb);;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3401
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3402 h->mmco[i].opcode= opcode;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3403 if(opcode==MMCO_SHORT2UNUSED || opcode==MMCO_SHORT2LONG){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3404 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
3405 /* 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
3406 fprintf(stderr, "illegal short ref in memory management control operation %d\n", mmco);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3407 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3408 }*/
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3409 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3410 if(opcode==MMCO_SHORT2LONG || opcode==MMCO_LONG2UNUSED || opcode==MMCO_LONG || opcode==MMCO_SET_MAX_LONG){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3411 h->mmco[i].long_index= get_ue_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3412 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
3413 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
3414 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3415 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3416 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3417
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3418 if(opcode > MMCO_LONG){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
3419 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
3420 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3421 }
2255
507690ff49a2 assertion when playing AVC/H.264 streams fix by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2254
diff changeset
3422 if(opcode == MMCO_END)
507690ff49a2 assertion when playing AVC/H.264 streams fix by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2254
diff changeset
3423 break;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3424 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3425 h->mmco_index= i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3426 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3427 assert(h->long_ref_count + h->short_ref_count <= h->sps.ref_frame_count);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3428
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3429 if(h->long_ref_count + h->short_ref_count == h->sps.ref_frame_count){ //FIXME fields
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3430 h->mmco[0].opcode= MMCO_SHORT2UNUSED;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3431 h->mmco[0].short_frame_num= h->short_ref[ h->short_ref_count - 1 ]->frame_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3432 h->mmco_index= 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3433 }else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3434 h->mmco_index= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3435 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3436 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3437
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3438 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3439 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3440
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3441 static int init_poc(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3442 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3443 const int max_frame_num= 1<<h->sps.log2_max_frame_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3444 int field_poc[2];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3445
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3446 if(h->nal_unit_type == NAL_IDR_SLICE){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3447 h->frame_num_offset= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3448 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3449 if(h->frame_num < h->prev_frame_num)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3450 h->frame_num_offset= h->prev_frame_num_offset + max_frame_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3451 else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3452 h->frame_num_offset= h->prev_frame_num_offset;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3453 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3454
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3455 if(h->sps.poc_type==0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3456 const int max_poc_lsb= 1<<h->sps.log2_max_poc_lsb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3457
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3458 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
3459 h->poc_msb = h->prev_poc_msb + max_poc_lsb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3460 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
3461 h->poc_msb = h->prev_poc_msb - max_poc_lsb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3462 else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3463 h->poc_msb = h->prev_poc_msb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3464 //printf("poc: %d %d\n", h->poc_msb, h->poc_lsb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3465 field_poc[0] =
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3466 field_poc[1] = h->poc_msb + h->poc_lsb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3467 if(s->picture_structure == PICT_FRAME)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3468 field_poc[1] += h->delta_poc_bottom;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3469 }else if(h->sps.poc_type==1){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3470 int abs_frame_num, expected_delta_per_poc_cycle, expectedpoc;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3471 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3472
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3473 if(h->sps.poc_cycle_length != 0)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3474 abs_frame_num = h->frame_num_offset + h->frame_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3475 else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3476 abs_frame_num = 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3477
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3478 if(h->nal_ref_idc==0 && abs_frame_num > 0)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3479 abs_frame_num--;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3480
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3481 expected_delta_per_poc_cycle = 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3482 for(i=0; i < h->sps.poc_cycle_length; i++)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3483 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
3484
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3485 if(abs_frame_num > 0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3486 int poc_cycle_cnt = (abs_frame_num - 1) / h->sps.poc_cycle_length;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3487 int frame_num_in_poc_cycle = (abs_frame_num - 1) % h->sps.poc_cycle_length;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3488
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3489 expectedpoc = poc_cycle_cnt * expected_delta_per_poc_cycle;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3490 for(i = 0; i <= frame_num_in_poc_cycle; i++)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3491 expectedpoc = expectedpoc + h->sps.offset_for_ref_frame[ i ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3492 } else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3493 expectedpoc = 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3494
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3495 if(h->nal_ref_idc == 0)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3496 expectedpoc = expectedpoc + h->sps.offset_for_non_ref_pic;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3497
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3498 field_poc[0] = expectedpoc + h->delta_poc[0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3499 field_poc[1] = field_poc[0] + h->sps.offset_for_top_to_bottom_field;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3500
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3501 if(s->picture_structure == PICT_FRAME)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3502 field_poc[1] += h->delta_poc[1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3503 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3504 int poc;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3505 if(h->nal_unit_type == NAL_IDR_SLICE){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3506 poc= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3507 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3508 if(h->nal_ref_idc) poc= 2*(h->frame_num_offset + h->frame_num);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3509 else poc= 2*(h->frame_num_offset + h->frame_num) - 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3510 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3511 field_poc[0]= poc;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3512 field_poc[1]= poc;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3513 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3514
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3515 if(s->picture_structure != PICT_BOTTOM_FIELD)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3516 s->current_picture_ptr->field_poc[0]= field_poc[0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3517 if(s->picture_structure != PICT_TOP_FIELD)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3518 s->current_picture_ptr->field_poc[1]= field_poc[1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3519 if(s->picture_structure == PICT_FRAME) // FIXME field pix?
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3520 s->current_picture_ptr->poc= FFMIN(field_poc[0], field_poc[1]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3521
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3522 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3523 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3524
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3525 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3526 * decodes a slice header.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3527 * this will allso call MPV_common_init() and frame_start() as needed
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3528 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3529 static int decode_slice_header(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3530 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3531 int first_mb_in_slice, pps_id;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3532 int num_ref_idx_active_override_flag;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3533 static const uint8_t slice_type_map[5]= {P_TYPE, B_TYPE, I_TYPE, SP_TYPE, SI_TYPE};
2498
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
3534 int slice_type;
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
3535 int default_ref_list_done = 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3536
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3537 s->current_picture.reference= h->nal_ref_idc != 0;
2537
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
3538 s->dropable= h->nal_ref_idc == 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3539
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3540 first_mb_in_slice= get_ue_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3541
2498
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
3542 slice_type= get_ue_golomb(&s->gb);
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
3543 if(slice_type > 9){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
3544 av_log(h->s.avctx, AV_LOG_ERROR, "slice type too large (%d) at %d %d\n", h->slice_type, s->mb_x, s->mb_y);
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
3545 return -1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3546 }
2498
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
3547 if(slice_type > 4){
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
3548 slice_type -= 5;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3549 h->slice_type_fixed=1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3550 }else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3551 h->slice_type_fixed=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3552
2498
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
3553 slice_type= slice_type_map[ slice_type ];
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
3554 if (slice_type == I_TYPE
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
3555 || (h->slice_num != 0 && slice_type == h->slice_type) ) {
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
3556 default_ref_list_done = 1;
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
3557 }
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
3558 h->slice_type= slice_type;
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
3559
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3560 s->pict_type= h->slice_type; // to make a few old func happy, its wrong though
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3561
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3562 pps_id= get_ue_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3563 if(pps_id>255){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
3564 av_log(h->s.avctx, AV_LOG_ERROR, "pps_id out of range\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3565 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3566 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3567 h->pps= h->pps_buffer[pps_id];
1174
2de2a847af67 some checks to avoid segfault
michaelni
parents: 1170
diff changeset
3568 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
3569 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
3570 return -1;
2de2a847af67 some checks to avoid segfault
michaelni
parents: 1170
diff changeset
3571 }
2de2a847af67 some checks to avoid segfault
michaelni
parents: 1170
diff changeset
3572
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3573 h->sps= h->sps_buffer[ h->pps.sps_id ];
1174
2de2a847af67 some checks to avoid segfault
michaelni
parents: 1170
diff changeset
3574 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
3575 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
3576 return -1;
2de2a847af67 some checks to avoid segfault
michaelni
parents: 1170
diff changeset
3577 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3578
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3579 s->mb_width= h->sps.mb_width;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3580 s->mb_height= h->sps.mb_height;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3581
2395
81516be6d0e4 vismv for h264 displayed incorrect motion vectors.
lorenm
parents: 2392
diff changeset
3582 h->b_stride= s->mb_width*4 + 1;
81516be6d0e4 vismv for h264 displayed incorrect motion vectors.
lorenm
parents: 2392
diff changeset
3583 h->b8_stride= s->mb_width*2 + 1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3584
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
3585 s->resync_mb_x = s->mb_x = first_mb_in_slice % s->mb_width;
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
3586 s->resync_mb_y = s->mb_y = first_mb_in_slice / s->mb_width; //FIXME AFFW
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3587
1371
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
3588 s->width = 16*s->mb_width - 2*(h->sps.crop_left + h->sps.crop_right );
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3589 if(h->sps.frame_mbs_only_flag)
1371
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
3590 s->height= 16*s->mb_height - 2*(h->sps.crop_top + h->sps.crop_bottom);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3591 else
1371
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
3592 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
3593
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3594 if (s->context_initialized
1548
dd544554ed42 AVRational
michael
parents: 1524
diff changeset
3595 && ( s->width != s->avctx->width || s->height != s->avctx->height)) {
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3596 free_tables(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3597 MPV_common_end(s);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3598 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3599 if (!s->context_initialized) {
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3600 if (MPV_common_init(s) < 0)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3601 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3602
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3603 alloc_tables(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3604
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3605 s->avctx->width = s->width;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3606 s->avctx->height = s->height;
1548
dd544554ed42 AVRational
michael
parents: 1524
diff changeset
3607 s->avctx->sample_aspect_ratio= h->sps.sar;
2440
cf97353f94c6 div by zero aspect fix
michael
parents: 2422
diff changeset
3608 if(!s->avctx->sample_aspect_ratio.den)
cf97353f94c6 div by zero aspect fix
michael
parents: 2422
diff changeset
3609 s->avctx->sample_aspect_ratio.den = 1;
2174
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents: 2163
diff changeset
3610
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents: 2163
diff changeset
3611 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
3612 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
3613 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
3614 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3615 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3616
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
3617 if(h->slice_num == 0){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3618 frame_start(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3619 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3620
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
3621 s->current_picture_ptr->frame_num= //FIXME frame_num cleanup
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3622 h->frame_num= get_bits(&s->gb, h->sps.log2_max_frame_num);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3623
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3624 if(h->sps.frame_mbs_only_flag){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3625 s->picture_structure= PICT_FRAME;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3626 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3627 if(get_bits1(&s->gb)) //field_pic_flag
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3628 s->picture_structure= PICT_TOP_FIELD + get_bits1(&s->gb); //bottom_field_flag
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3629 else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3630 s->picture_structure= PICT_FRAME;
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 if(s->picture_structure==PICT_FRAME){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3634 h->curr_pic_num= h->frame_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3635 h->max_pic_num= 1<< h->sps.log2_max_frame_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3636 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3637 h->curr_pic_num= 2*h->frame_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3638 h->max_pic_num= 1<<(h->sps.log2_max_frame_num + 1);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3639 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3640
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3641 if(h->nal_unit_type == NAL_IDR_SLICE){
1453
20a79b0e6d2a removed warnings
bellard
parents: 1371
diff changeset
3642 get_ue_golomb(&s->gb); /* idr_pic_id */
1168
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 if(h->sps.poc_type==0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3646 h->poc_lsb= get_bits(&s->gb, h->sps.log2_max_poc_lsb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3647
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3648 if(h->pps.pic_order_present==1 && s->picture_structure==PICT_FRAME){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3649 h->delta_poc_bottom= get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3650 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3651 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3652
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3653 if(h->sps.poc_type==1 && !h->sps.delta_pic_order_always_zero_flag){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3654 h->delta_poc[0]= get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3655
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3656 if(h->pps.pic_order_present==1 && s->picture_structure==PICT_FRAME)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3657 h->delta_poc[1]= get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3658 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3659
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3660 init_poc(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3661
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3662 if(h->pps.redundant_pic_cnt_present){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3663 h->redundant_pic_count= get_ue_golomb(&s->gb);
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 //set defaults, might be overriden a few line later
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3667 h->ref_count[0]= h->pps.ref_count[0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3668 h->ref_count[1]= h->pps.ref_count[1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3669
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3670 if(h->slice_type == P_TYPE || h->slice_type == SP_TYPE || h->slice_type == B_TYPE){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3671 if(h->slice_type == B_TYPE){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3672 h->direct_spatial_mv_pred= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3673 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3674 num_ref_idx_active_override_flag= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3675
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3676 if(num_ref_idx_active_override_flag){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3677 h->ref_count[0]= get_ue_golomb(&s->gb) + 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3678 if(h->slice_type==B_TYPE)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3679 h->ref_count[1]= get_ue_golomb(&s->gb) + 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3680
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3681 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
3682 av_log(h->s.avctx, AV_LOG_ERROR, "reference overflow\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3683 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3684 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3685 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3686 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3687
2498
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
3688 if(!default_ref_list_done){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3689 fill_default_ref_list(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3690 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3691
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3692 decode_ref_pic_list_reordering(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3693
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3694 if( (h->pps.weighted_pred && (h->slice_type == P_TYPE || h->slice_type == SP_TYPE ))
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3695 || (h->pps.weighted_bipred_idc==1 && h->slice_type==B_TYPE ) )
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3696 pred_weight_table(h);
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3697 else if(h->pps.weighted_bipred_idc==2 && h->slice_type==B_TYPE)
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3698 implicit_weight_table(h);
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3699 else
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3700 h->use_weight = 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3701
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3702 if(s->current_picture.reference)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3703 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
3704
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3705 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
3706 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
3707
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3708 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
3709 s->qscale = h->pps.init_qp + get_se_golomb(&s->gb);
1898
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
3710 if(s->qscale<0 || s->qscale>51){
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
3711 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
3712 return -1;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
3713 }
2402
f9d4e1eddbc5 - correct several errors on the deblocking accross slice boundaries.
michael
parents: 2401
diff changeset
3714 h->chroma_qp = get_chroma_qp(h, s->qscale);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3715 //FIXME qscale / qp ... stuff
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3716 if(h->slice_type == SP_TYPE){
1453
20a79b0e6d2a removed warnings
bellard
parents: 1371
diff changeset
3717 get_bits1(&s->gb); /* sp_for_switch_flag */
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3718 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3719 if(h->slice_type==SP_TYPE || h->slice_type == SI_TYPE){
1453
20a79b0e6d2a removed warnings
bellard
parents: 1371
diff changeset
3720 get_se_golomb(&s->gb); /* slice_qs_delta */
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3721 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3722
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
3723 h->deblocking_filter = 1;
1898
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
3724 h->slice_alpha_c0_offset = 0;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
3725 h->slice_beta_offset = 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3726 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
3727 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
3728 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
3729 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
3730
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
3731 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
3732 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
3733 h->slice_beta_offset = get_se_golomb(&s->gb) << 1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3734 }
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
3735 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3736
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3737 #if 0 //FMO
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3738 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
3739 slice_group_change_cycle= get_bits(&s->gb, ?);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3740 #endif
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3741
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
3742 h->slice_num++;
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
3743
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3744 if(s->avctx->debug&FF_DEBUG_PICT_INFO){
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3745 av_log(h->s.avctx, AV_LOG_DEBUG, "slice:%d mb:%d %c pps:%d frame:%d poc:%d/%d ref:%d/%d qp:%d loop:%d weight:%d%s\n",
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
3746 h->slice_num, first_mb_in_slice,
1264
2fa34e615c76 cleanup
michaelni
parents: 1252
diff changeset
3747 av_get_pict_type_char(h->slice_type),
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3748 pps_id, h->frame_num,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3749 s->current_picture_ptr->field_poc[0], s->current_picture_ptr->field_poc[1],
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3750 h->ref_count[0], h->ref_count[1],
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3751 s->qscale,
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3752 h->deblocking_filter,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3753 h->use_weight,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3754 h->use_weight==1 && h->use_weight_chroma ? "c" : ""
1168
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
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3758 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3759 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3760
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3761 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3762 *
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3763 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3764 static inline int get_level_prefix(GetBitContext *gb){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3765 unsigned int buf;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3766 int log;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3767
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3768 OPEN_READER(re, gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3769 UPDATE_CACHE(re, gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3770 buf=GET_CACHE(re, gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3771
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3772 log= 32 - av_log2(buf);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3773 #ifdef TRACE
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3774 print_bin(buf>>(32-log), log);
2272
cd43603c46f9 move h264 idct to its own file and call via function pointer in DspContext
michael
parents: 2255
diff changeset
3775 av_log(NULL, AV_LOG_DEBUG, "%5d %2d %3d lpr @%5d in %s get_level_prefix\n", buf>>(32-log), log, log-1, get_bits_count(gb), __FILE__);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3776 #endif
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3777
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3778 LAST_SKIP_BITS(re, gb, log);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3779 CLOSE_READER(re, gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3780
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3781 return log-1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3782 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3783
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3784 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3785 * decodes a residual block.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3786 * @param n block index
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3787 * @param scantable scantable
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3788 * @param max_coeff number of coefficients in the block
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3789 * @return <0 if an error occured
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3790 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3791 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
3792 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3793 const uint16_t *qmul= dequant_coeff[qp];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3794 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
3795 int level[16], run[16];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3796 int suffix_length, zeros_left, coeff_num, coeff_token, total_coeff, i, trailing_ones;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3797
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3798 //FIXME put trailing_onex into the context
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3799
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3800 if(n == CHROMA_DC_BLOCK_INDEX){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3801 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
3802 total_coeff= coeff_token>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3803 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3804 if(n == LUMA_DC_BLOCK_INDEX){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3805 total_coeff= pred_non_zero_count(h, 0);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3806 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
3807 total_coeff= coeff_token>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3808 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3809 total_coeff= pred_non_zero_count(h, n);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3810 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
3811 total_coeff= coeff_token>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3812 h->non_zero_count_cache[ scan8[n] ]= total_coeff;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3813 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3814 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3815
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3816 //FIXME set last_non_zero?
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3817
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3818 if(total_coeff==0)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3819 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3820
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3821 trailing_ones= coeff_token&3;
1170
4710976004a5 #ifdef TRACE printf() -> tprintf()
michaelni
parents: 1169
diff changeset
3822 tprintf("trailing:%d, total:%d\n", trailing_ones, total_coeff);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3823 assert(total_coeff<=16);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3824
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3825 for(i=0; i<trailing_ones; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3826 level[i]= 1 - 2*get_bits1(gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3827 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3828
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3829 suffix_length= total_coeff > 10 && trailing_ones < 3;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3830
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3831 for(; i<total_coeff; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3832 const int prefix= get_level_prefix(gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3833 int level_code, mask;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3834
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3835 if(prefix<14){ //FIXME try to build a large unified VLC table for all this
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3836 if(suffix_length)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3837 level_code= (prefix<<suffix_length) + get_bits(gb, suffix_length); //part
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3838 else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3839 level_code= (prefix<<suffix_length); //part
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3840 }else if(prefix==14){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3841 if(suffix_length)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3842 level_code= (prefix<<suffix_length) + get_bits(gb, suffix_length); //part
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3843 else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3844 level_code= prefix + get_bits(gb, 4); //part
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3845 }else if(prefix==15){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3846 level_code= (prefix<<suffix_length) + get_bits(gb, 12); //part
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3847 if(suffix_length==0) level_code+=15; //FIXME doesnt make (much)sense
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3848 }else{
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
3849 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
3850 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3851 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3852
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3853 if(i==trailing_ones && i<3) level_code+= 2; //FIXME split first iteration
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3854
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3855 mask= -(level_code&1);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3856 level[i]= (((2+level_code)>>1) ^ mask) - mask;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3857
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3858 if(suffix_length==0) suffix_length=1; //FIXME split first iteration
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3859
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3860 #if 1
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3861 if(ABS(level[i]) > (3<<(suffix_length-1)) && suffix_length<6) suffix_length++;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3862 #else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3863 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
3864 /* ? == prefix > 2 or sth */
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3865 #endif
1170
4710976004a5 #ifdef TRACE printf() -> tprintf()
michaelni
parents: 1169
diff changeset
3866 tprintf("level: %d suffix_length:%d\n", level[i], suffix_length);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3867 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3868
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3869 if(total_coeff == max_coeff)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3870 zeros_left=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3871 else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3872 if(n == CHROMA_DC_BLOCK_INDEX)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3873 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
3874 else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3875 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
3876 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3877
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3878 for(i=0; i<total_coeff-1; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3879 if(zeros_left <=0)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3880 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3881 else if(zeros_left < 7){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3882 run[i]= get_vlc2(gb, run_vlc[zeros_left-1].table, RUN_VLC_BITS, 1);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3883 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3884 run[i]= get_vlc2(gb, run7_vlc.table, RUN7_VLC_BITS, 2);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3885 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3886 zeros_left -= run[i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3887 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3888
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3889 if(zeros_left<0){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
3890 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
3891 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3892 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3893
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3894 for(; i<total_coeff-1; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3895 run[i]= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3896 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3897
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3898 run[i]= zeros_left;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3899
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3900 coeff_num=-1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3901 if(n > 24){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3902 for(i=total_coeff-1; i>=0; i--){ //FIXME merge into rundecode?
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3903 int j;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3904
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3905 coeff_num += run[i] + 1; //FIXME add 1 earlier ?
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3906 j= scantable[ coeff_num ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3907
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3908 block[j]= level[i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3909 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3910 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3911 for(i=total_coeff-1; i>=0; i--){ //FIXME merge into rundecode?
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3912 int j;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3913
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3914 coeff_num += run[i] + 1; //FIXME add 1 earlier ?
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3915 j= scantable[ coeff_num ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3916
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3917 block[j]= level[i] * qmul[j];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3918 // printf("%d %d ", block[j], qmul[j]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3919 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3920 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3921 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3922 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3923
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3924 /**
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
3925 * decodes a P_SKIP or B_SKIP macroblock
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
3926 */
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
3927 static void decode_mb_skip(H264Context *h){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
3928 MpegEncContext * const s = &h->s;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
3929 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
3930 int mb_type;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
3931
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
3932 memset(h->non_zero_count[mb_xy], 0, 16);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
3933 memset(h->non_zero_count_cache + 8, 0, 8*5); //FIXME ugly, remove pfui
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
3934
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
3935 if( h->slice_type == B_TYPE )
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
3936 {
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
3937 // just for fill_caches. pred_direct_motion will set the real mb_type
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
3938 mb_type= MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2|MB_TYPE_SKIP;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
3939 //FIXME mbaff
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
3940
2449
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
3941 fill_caches(h, mb_type, 0); //FIXME check what is needed and what not ...
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
3942 pred_direct_motion(h, &mb_type);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
3943 if(h->pps.cabac){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
3944 fill_rectangle(h->mvd_cache[0][scan8[0]], 4, 4, 8, 0, 4);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
3945 fill_rectangle(h->mvd_cache[1][scan8[0]], 4, 4, 8, 0, 4);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
3946 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
3947 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
3948 else
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
3949 {
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
3950 int mx, my;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
3951 mb_type= MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P1L0|MB_TYPE_SKIP;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
3952
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
3953 if(h->sps.mb_aff && s->mb_skip_run==0 && (s->mb_y&1)==0){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
3954 h->mb_field_decoding_flag= get_bits1(&s->gb);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
3955 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
3956 if(h->mb_field_decoding_flag)
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
3957 mb_type|= MB_TYPE_INTERLACED;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
3958
2449
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
3959 fill_caches(h, mb_type, 0); //FIXME check what is needed and what not ...
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
3960 pred_pskip_motion(h, &mx, &my);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
3961 fill_rectangle(&h->ref_cache[0][scan8[0]], 4, 4, 8, 0, 1);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
3962 fill_rectangle( h->mv_cache[0][scan8[0]], 4, 4, 8, pack16to32(mx,my), 4);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
3963 if(h->pps.cabac)
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
3964 fill_rectangle(h->mvd_cache[0][scan8[0]], 4, 4, 8, 0, 4);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
3965 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
3966
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
3967 write_back_motion(h, mb_type);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
3968 s->current_picture.mb_type[mb_xy]= mb_type|MB_TYPE_SKIP;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
3969 s->current_picture.qscale_table[mb_xy]= s->qscale;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
3970 h->slice_table[ mb_xy ]= h->slice_num;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
3971 h->prev_mb_skiped= 1;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
3972 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
3973
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
3974 /**
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3975 * decodes a macroblock
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3976 * @returns 0 if ok, AC_ERROR / DC_ERROR / MV_ERROR if an error is noticed
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3977 */
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3978 static int decode_mb_cavlc(H264Context *h){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3979 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
3980 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride;
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
3981 int mb_type, partition_count, cbp;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3982
1252
67ee8bab0f28 optimizations
michaelni
parents: 1250
diff changeset
3983 s->dsp.clear_blocks(h->mb); //FIXME avoid if allready clear (move after skip handlong?
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3984
1170
4710976004a5 #ifdef TRACE printf() -> tprintf()
michaelni
parents: 1169
diff changeset
3985 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
3986 cbp = 0; /* avoid warning. FIXME: find a solution without slowing
20a79b0e6d2a removed warnings
bellard
parents: 1371
diff changeset
3987 down the code */
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3988 if(h->slice_type != I_TYPE && h->slice_type != SI_TYPE){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3989 if(s->mb_skip_run==-1)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3990 s->mb_skip_run= get_ue_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3991
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3992 if (s->mb_skip_run--) {
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
3993 decode_mb_skip(h);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3994 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3995 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3996 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3997 if(h->sps.mb_aff /* && !field pic FIXME needed? */){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3998 if((s->mb_y&1)==0)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3999 h->mb_field_decoding_flag = get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4000 }else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4001 h->mb_field_decoding_flag=0; //FIXME som ed note ?!
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4002
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4003 h->prev_mb_skiped= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4004
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4005 mb_type= get_ue_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4006 if(h->slice_type == B_TYPE){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4007 if(mb_type < 23){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4008 partition_count= b_mb_type_info[mb_type].partition_count;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4009 mb_type= b_mb_type_info[mb_type].type;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4010 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4011 mb_type -= 23;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4012 goto decode_intra_mb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4013 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4014 }else if(h->slice_type == P_TYPE /*|| h->slice_type == SP_TYPE */){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4015 if(mb_type < 5){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4016 partition_count= p_mb_type_info[mb_type].partition_count;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4017 mb_type= p_mb_type_info[mb_type].type;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4018 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4019 mb_type -= 5;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4020 goto decode_intra_mb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4021 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4022 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4023 assert(h->slice_type == I_TYPE);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4024 decode_intra_mb:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4025 if(mb_type > 25){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
4026 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
4027 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4028 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4029 partition_count=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4030 cbp= i_mb_type_info[mb_type].cbp;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4031 h->intra16x16_pred_mode= i_mb_type_info[mb_type].pred_mode;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4032 mb_type= i_mb_type_info[mb_type].type;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4033 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4034
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4035 if(h->mb_field_decoding_flag)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4036 mb_type |= MB_TYPE_INTERLACED;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4037
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4038 s->current_picture.mb_type[mb_xy]= mb_type;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4039 h->slice_table[ mb_xy ]= h->slice_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4040
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4041 if(IS_INTRA_PCM(mb_type)){
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
4042 unsigned int x, y;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4043
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4044 // we assume these blocks are very rare so we dont optimize it
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4045 align_get_bits(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4046
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
4047 // The pixels are stored in the same order as levels in h->mb array.
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4048 for(y=0; y<16; y++){
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
4049 const int index= 4*(y&3) + 32*((y>>2)&1) + 128*(y>>3);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4050 for(x=0; x<16; x++){
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
4051 tprintf("LUMA ICPM LEVEL (%3d)\n", show_bits(&s->gb, 8));
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
4052 h->mb[index + (x&3) + 16*((x>>2)&1) + 64*(x>>3)]= get_bits(&s->gb, 8);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4053 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4054 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4055 for(y=0; y<8; y++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4056 const int index= 256 + 4*(y&3) + 32*(y>>2);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4057 for(x=0; x<8; x++){
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
4058 tprintf("CHROMA U ICPM LEVEL (%3d)\n", show_bits(&s->gb, 8));
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
4059 h->mb[index + (x&3) + 16*(x>>2)]= get_bits(&s->gb, 8);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4060 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4061 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4062 for(y=0; y<8; y++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4063 const int index= 256 + 64 + 4*(y&3) + 32*(y>>2);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4064 for(x=0; x<8; x++){
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
4065 tprintf("CHROMA V ICPM LEVEL (%3d)\n", show_bits(&s->gb, 8));
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
4066 h->mb[index + (x&3) + 16*(x>>2)]= get_bits(&s->gb, 8);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4067 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4068 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4069
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
4070 // In deblocking, the quantiser is 0
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
4071 s->current_picture.qscale_table[mb_xy]= 0;
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
4072 h->chroma_qp = get_chroma_qp(h, 0);
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
4073 // All coeffs are presents
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
4074 memset(h->non_zero_count[mb_xy], 16, 16);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4075
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4076 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4077 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4078
2449
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
4079 fill_caches(h, mb_type, 0);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4080
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4081 //mb_pred
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4082 if(IS_INTRA(mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4083 // init_top_left_availability(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4084 if(IS_INTRA4x4(mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4085 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4086
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4087 // fill_intra4x4_pred_table(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4088 for(i=0; i<16; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4089 const int mode_coded= !get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4090 const int predicted_mode= pred_intra_mode(h, i);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4091 int mode;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4092
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4093 if(mode_coded){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4094 const int rem_mode= get_bits(&s->gb, 3);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4095 if(rem_mode<predicted_mode)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4096 mode= rem_mode;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4097 else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4098 mode= rem_mode + 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4099 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4100 mode= predicted_mode;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4101 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4102
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4103 h->intra4x4_pred_mode_cache[ scan8[i] ] = mode;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4104 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4105 write_back_intra_pred_mode(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4106 if( check_intra4x4_pred_mode(h) < 0)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4107 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4108 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4109 h->intra16x16_pred_mode= check_intra_pred_mode(h, h->intra16x16_pred_mode);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4110 if(h->intra16x16_pred_mode < 0)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4111 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4112 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4113 h->chroma_pred_mode= get_ue_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4114
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4115 h->chroma_pred_mode= check_intra_pred_mode(h, h->chroma_pred_mode);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4116 if(h->chroma_pred_mode < 0)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4117 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4118 }else if(partition_count==4){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4119 int i, j, sub_partition_count[4], list, ref[2][4];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4120
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4121 if(h->slice_type == B_TYPE){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4122 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4123 h->sub_mb_type[i]= get_ue_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4124 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
4125 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
4126 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4127 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4128 sub_partition_count[i]= b_sub_mb_type_info[ h->sub_mb_type[i] ].partition_count;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4129 h->sub_mb_type[i]= b_sub_mb_type_info[ h->sub_mb_type[i] ].type;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4130 }
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4131 if( IS_DIRECT(h->sub_mb_type[0]) || IS_DIRECT(h->sub_mb_type[1])
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4132 || IS_DIRECT(h->sub_mb_type[2]) || IS_DIRECT(h->sub_mb_type[3]))
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4133 pred_direct_motion(h, &mb_type);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4134 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4135 assert(h->slice_type == P_TYPE || h->slice_type == SP_TYPE); //FIXME SP correct ?
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4136 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4137 h->sub_mb_type[i]= get_ue_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4138 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
4139 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
4140 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4141 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4142 sub_partition_count[i]= p_sub_mb_type_info[ h->sub_mb_type[i] ].partition_count;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4143 h->sub_mb_type[i]= p_sub_mb_type_info[ h->sub_mb_type[i] ].type;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4144 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4145 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4146
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4147 for(list=0; list<2; list++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4148 const int ref_count= IS_REF0(mb_type) ? 1 : h->ref_count[list];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4149 if(ref_count == 0) continue;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4150 for(i=0; i<4; i++){
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4151 if(IS_DIRECT(h->sub_mb_type[i])) continue;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4152 if(IS_DIR(h->sub_mb_type[i], 0, list)){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4153 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
4154 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4155 //FIXME
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4156 ref[list][i] = -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4157 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4158 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4159 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4160
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4161 for(list=0; list<2; list++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4162 const int ref_count= IS_REF0(mb_type) ? 1 : h->ref_count[list];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4163 if(ref_count == 0) continue;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4164
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4165 for(i=0; i<4; i++){
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4166 if(IS_DIRECT(h->sub_mb_type[i])) continue;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4167 h->ref_cache[list][ scan8[4*i] ]=h->ref_cache[list][ scan8[4*i]+1 ]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4168 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
4169
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4170 if(IS_DIR(h->sub_mb_type[i], 0, list)){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4171 const int sub_mb_type= h->sub_mb_type[i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4172 const int block_width= (sub_mb_type & (MB_TYPE_16x16|MB_TYPE_16x8)) ? 2 : 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4173 for(j=0; j<sub_partition_count[i]; j++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4174 int mx, my;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4175 const int index= 4*i + block_width*j;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4176 int16_t (* mv_cache)[2]= &h->mv_cache[list][ scan8[index] ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4177 pred_motion(h, index, block_width, list, h->ref_cache[list][ scan8[index] ], &mx, &my);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4178 mx += get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4179 my += get_se_golomb(&s->gb);
1170
4710976004a5 #ifdef TRACE printf() -> tprintf()
michaelni
parents: 1169
diff changeset
4180 tprintf("final mv:%d %d\n", mx, my);
4710976004a5 #ifdef TRACE printf() -> tprintf()
michaelni
parents: 1169
diff changeset
4181
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4182 if(IS_SUB_8X8(sub_mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4183 mv_cache[ 0 ][0]= mv_cache[ 1 ][0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4184 mv_cache[ 8 ][0]= mv_cache[ 9 ][0]= mx;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4185 mv_cache[ 0 ][1]= mv_cache[ 1 ][1]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4186 mv_cache[ 8 ][1]= mv_cache[ 9 ][1]= my;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4187 }else if(IS_SUB_8X4(sub_mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4188 mv_cache[ 0 ][0]= mv_cache[ 1 ][0]= mx;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4189 mv_cache[ 0 ][1]= mv_cache[ 1 ][1]= my;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4190 }else if(IS_SUB_4X8(sub_mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4191 mv_cache[ 0 ][0]= mv_cache[ 8 ][0]= mx;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4192 mv_cache[ 0 ][1]= mv_cache[ 8 ][1]= my;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4193 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4194 assert(IS_SUB_4X4(sub_mb_type));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4195 mv_cache[ 0 ][0]= mx;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4196 mv_cache[ 0 ][1]= my;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4197 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4198 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4199 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4200 uint32_t *p= (uint32_t *)&h->mv_cache[list][ scan8[4*i] ][0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4201 p[0] = p[1]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4202 p[8] = p[9]= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4203 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4204 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4205 }
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4206 }else if(IS_DIRECT(mb_type)){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4207 pred_direct_motion(h, &mb_type);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4208 s->current_picture.mb_type[mb_xy]= mb_type;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4209 }else{
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4210 int list, mx, my, i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4211 //FIXME we should set ref_idx_l? to 0 if we use that later ...
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4212 if(IS_16X16(mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4213 for(list=0; list<2; list++){
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
4214 if(h->ref_count[list]>0){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4215 if(IS_DIR(mb_type, 0, list)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4216 const int val= get_te0_golomb(&s->gb, h->ref_count[list]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4217 fill_rectangle(&h->ref_cache[list][ scan8[0] ], 4, 4, 8, val, 1);
2523
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
4218 }else
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
4219 fill_rectangle(&h->ref_cache[list][ scan8[0] ], 4, 4, 8, (LIST_NOT_USED&0xFF), 1);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4220 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4221 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4222 for(list=0; list<2; list++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4223 if(IS_DIR(mb_type, 0, list)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4224 pred_motion(h, 0, 4, list, h->ref_cache[list][ scan8[0] ], &mx, &my);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4225 mx += get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4226 my += get_se_golomb(&s->gb);
1170
4710976004a5 #ifdef TRACE printf() -> tprintf()
michaelni
parents: 1169
diff changeset
4227 tprintf("final mv:%d %d\n", mx, my);
4710976004a5 #ifdef TRACE printf() -> tprintf()
michaelni
parents: 1169
diff changeset
4228
1269
2498a7045b37 bigendian fix
michaelni
parents: 1266
diff changeset
4229 fill_rectangle(h->mv_cache[list][ scan8[0] ], 4, 4, 8, pack16to32(mx,my), 4);
2523
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
4230 }else
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
4231 fill_rectangle(h->mv_cache[list][ scan8[0] ], 4, 4, 8, 0, 4);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4232 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4233 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4234 else if(IS_16X8(mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4235 for(list=0; list<2; list++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4236 if(h->ref_count[list]>0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4237 for(i=0; i<2; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4238 if(IS_DIR(mb_type, i, list)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4239 const int val= get_te0_golomb(&s->gb, h->ref_count[list]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4240 fill_rectangle(&h->ref_cache[list][ scan8[0] + 16*i ], 4, 2, 8, val, 1);
2523
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
4241 }else
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4242 fill_rectangle(&h->ref_cache[list][ scan8[0] + 16*i ], 4, 2, 8, (LIST_NOT_USED&0xFF), 1);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4243 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4244 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4245 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4246 for(list=0; list<2; list++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4247 for(i=0; i<2; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4248 if(IS_DIR(mb_type, i, list)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4249 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
4250 mx += get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4251 my += get_se_golomb(&s->gb);
1170
4710976004a5 #ifdef TRACE printf() -> tprintf()
michaelni
parents: 1169
diff changeset
4252 tprintf("final mv:%d %d\n", mx, my);
4710976004a5 #ifdef TRACE printf() -> tprintf()
michaelni
parents: 1169
diff changeset
4253
1269
2498a7045b37 bigendian fix
michaelni
parents: 1266
diff changeset
4254 fill_rectangle(h->mv_cache[list][ scan8[0] + 16*i ], 4, 2, 8, pack16to32(mx,my), 4);
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4255 }else
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4256 fill_rectangle(h->mv_cache[list][ scan8[0] + 16*i ], 4, 2, 8, 0, 4);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4257 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4258 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4259 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4260 assert(IS_8X16(mb_type));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4261 for(list=0; list<2; list++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4262 if(h->ref_count[list]>0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4263 for(i=0; i<2; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4264 if(IS_DIR(mb_type, i, list)){ //FIXME optimize
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4265 const int val= get_te0_golomb(&s->gb, h->ref_count[list]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4266 fill_rectangle(&h->ref_cache[list][ scan8[0] + 2*i ], 2, 4, 8, val, 1);
2523
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
4267 }else
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4268 fill_rectangle(&h->ref_cache[list][ scan8[0] + 2*i ], 2, 4, 8, (LIST_NOT_USED&0xFF), 1);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4269 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4270 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4271 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4272 for(list=0; list<2; list++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4273 for(i=0; i<2; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4274 if(IS_DIR(mb_type, i, list)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4275 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
4276 mx += get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4277 my += get_se_golomb(&s->gb);
1170
4710976004a5 #ifdef TRACE printf() -> tprintf()
michaelni
parents: 1169
diff changeset
4278 tprintf("final mv:%d %d\n", mx, my);
4710976004a5 #ifdef TRACE printf() -> tprintf()
michaelni
parents: 1169
diff changeset
4279
1269
2498a7045b37 bigendian fix
michaelni
parents: 1266
diff changeset
4280 fill_rectangle(h->mv_cache[list][ scan8[0] + 2*i ], 2, 4, 8, pack16to32(mx,my), 4);
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4281 }else
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4282 fill_rectangle(h->mv_cache[list][ scan8[0] + 2*i ], 2, 4, 8, 0, 4);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4283 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4284 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4285 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4286 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4287
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4288 if(IS_INTER(mb_type))
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4289 write_back_motion(h, mb_type);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4290
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4291 if(!IS_INTRA16x16(mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4292 cbp= get_ue_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4293 if(cbp > 47){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
4294 av_log(h->s.avctx, AV_LOG_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
4295 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4296 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4297
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4298 if(IS_INTRA4x4(mb_type))
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4299 cbp= golomb_to_intra4x4_cbp[cbp];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4300 else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4301 cbp= golomb_to_inter_cbp[cbp];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4302 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4303
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4304 if(cbp || IS_INTRA16x16(mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4305 int i8x8, i4x4, chroma_idx;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4306 int chroma_qp, dquant;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4307 GetBitContext *gb= IS_INTRA(mb_type) ? h->intra_gb_ptr : h->inter_gb_ptr;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4308 const uint8_t *scan, *dc_scan;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4309
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4310 // fill_non_zero_count_cache(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4311
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4312 if(IS_INTERLACED(mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4313 scan= field_scan;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4314 dc_scan= luma_dc_field_scan;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4315 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4316 scan= zigzag_scan;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4317 dc_scan= luma_dc_zigzag_scan;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4318 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4319
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4320 dquant= get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4321
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4322 if( dquant > 25 || dquant < -26 ){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
4323 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
4324 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4325 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4326
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4327 s->qscale += dquant;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4328 if(((unsigned)s->qscale) > 51){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4329 if(s->qscale<0) s->qscale+= 52;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4330 else s->qscale-= 52;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4331 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4332
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4333 h->chroma_qp= chroma_qp= get_chroma_qp(h, s->qscale);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4334 if(IS_INTRA16x16(mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4335 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
4336 return -1; //FIXME continue if partotioned and other retirn -1 too
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4337 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4338
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4339 assert((cbp&15) == 0 || (cbp&15) == 15);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4340
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4341 if(cbp&15){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4342 for(i8x8=0; i8x8<4; i8x8++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4343 for(i4x4=0; i4x4<4; i4x4++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4344 const int index= i4x4 + 4*i8x8;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4345 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
4346 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4347 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4348 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4349 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4350 }else{
1636
d9d98cdcfcde intra16x16 fix
michael
parents: 1598
diff changeset
4351 fill_rectangle(&h->non_zero_count_cache[scan8[0]], 4, 4, 8, 0, 1);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4352 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4353 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4354 for(i8x8=0; i8x8<4; i8x8++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4355 if(cbp & (1<<i8x8)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4356 for(i4x4=0; i4x4<4; i4x4++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4357 const int index= i4x4 + 4*i8x8;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4358
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4359 if( decode_residual(h, gb, h->mb + 16*index, index, scan, s->qscale, 16) <0 ){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4360 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4361 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4362 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4363 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4364 uint8_t * const nnz= &h->non_zero_count_cache[ scan8[4*i8x8] ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4365 nnz[0] = nnz[1] = nnz[8] = nnz[9] = 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4366 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4367 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4368 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4369
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4370 if(cbp&0x30){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4371 for(chroma_idx=0; chroma_idx<2; chroma_idx++)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4372 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
4373 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4374 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4375 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4376
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4377 if(cbp&0x20){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4378 for(chroma_idx=0; chroma_idx<2; chroma_idx++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4379 for(i4x4=0; i4x4<4; i4x4++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4380 const int index= 16 + 4*chroma_idx + i4x4;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4381 if( decode_residual(h, gb, h->mb + 16*index, index, scan + 1, chroma_qp, 15) < 0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4382 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4383 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4384 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4385 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4386 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4387 uint8_t * const nnz= &h->non_zero_count_cache[0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4388 nnz[ scan8[16]+0 ] = nnz[ scan8[16]+1 ] =nnz[ scan8[16]+8 ] =nnz[ scan8[16]+9 ] =
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4389 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
4390 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4391 }else{
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
4392 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
4393 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
4394 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
4395 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
4396 }
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
4397 s->current_picture.qscale_table[mb_xy]= s->qscale;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4398 write_back_non_zero_count(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4399
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4400 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4401 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4402
2312
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4403 static int decode_cabac_intra_mb_type(H264Context *h, int ctx_base, int intra_slice) {
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4404 uint8_t *state= &h->cabac_state[ctx_base];
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4405 int mb_type;
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4406
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4407 if(intra_slice){
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4408 MpegEncContext * const s = &h->s;
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4409 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride;
2498
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
4410 const int mba_xy = mb_xy - 1;
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
4411 const int mbb_xy = mb_xy - s->mb_stride;
2312
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4412 int ctx=0;
2498
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
4413 if( h->slice_table[mba_xy] == h->slice_num && !IS_INTRA4x4( s->current_picture.mb_type[mba_xy] ) )
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4414 ctx++;
2498
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
4415 if( h->slice_table[mbb_xy] == h->slice_num && !IS_INTRA4x4( s->current_picture.mb_type[mbb_xy] ) )
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4416 ctx++;
2312
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4417 if( get_cabac( &h->cabac, &state[ctx] ) == 0 )
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4418 return 0; /* I4x4 */
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4419 state += 2;
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4420 }else{
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4421 if( get_cabac( &h->cabac, &state[0] ) == 0 )
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4422 return 0; /* I4x4 */
2312
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4423 }
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4424
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4425 if( get_cabac_terminate( &h->cabac ) )
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4426 return 25; /* PCM */
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4427
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4428 mb_type = 1; /* I16x16 */
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4429 if( get_cabac( &h->cabac, &state[1] ) )
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4430 mb_type += 12; /* cbp_luma != 0 */
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4431
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4432 if( get_cabac( &h->cabac, &state[2] ) ) {
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4433 if( get_cabac( &h->cabac, &state[2+intra_slice] ) )
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4434 mb_type += 4 * 2; /* cbp_chroma == 2 */
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4435 else
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4436 mb_type += 4 * 1; /* cbp_chroma == 1 */
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4437 }
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4438 if( get_cabac( &h->cabac, &state[3+intra_slice] ) )
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4439 mb_type += 2;
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4440 if( get_cabac( &h->cabac, &state[3+2*intra_slice] ) )
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4441 mb_type += 1;
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4442 return mb_type;
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4443 }
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4444
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4445 static int decode_cabac_mb_type( H264Context *h ) {
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4446 MpegEncContext * const s = &h->s;
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4447
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4448 if( h->slice_type == I_TYPE ) {
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4449 return decode_cabac_intra_mb_type(h, 3, 1);
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4450 } 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
4451 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
4452 /* 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
4453 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
4454 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
4455 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
4456 else
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4457 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
4458 } else {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4459 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
4460 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
4461 else
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4462 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
4463 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4464 } else {
2312
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4465 return decode_cabac_intra_mb_type(h, 17, 0) + 5;
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4466 }
2310
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
4467 } else if( h->slice_type == B_TYPE ) {
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
4468 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride;
2498
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
4469 const int mba_xy = mb_xy - 1;
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
4470 const int mbb_xy = mb_xy - s->mb_stride;
2310
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
4471 int ctx = 0;
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
4472 int bits;
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
4473
2498
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
4474 if( h->slice_table[mba_xy] == h->slice_num && !IS_SKIP( s->current_picture.mb_type[mba_xy] )
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
4475 && !IS_DIRECT( s->current_picture.mb_type[mba_xy] ) )
2310
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
4476 ctx++;
2498
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
4477 if( h->slice_table[mbb_xy] == h->slice_num && !IS_SKIP( s->current_picture.mb_type[mbb_xy] )
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
4478 && !IS_DIRECT( s->current_picture.mb_type[mbb_xy] ) )
2310
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
4479 ctx++;
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
4480
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
4481 if( !get_cabac( &h->cabac, &h->cabac_state[27+ctx] ) )
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
4482 return 0; /* B_Direct_16x16 */
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
4483
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
4484 if( !get_cabac( &h->cabac, &h->cabac_state[27+3] ) ) {
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
4485 return 1 + get_cabac( &h->cabac, &h->cabac_state[27+5] ); /* B_L[01]_16x16 */
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
4486 }
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
4487
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
4488 bits = get_cabac( &h->cabac, &h->cabac_state[27+4] ) << 3;
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
4489 bits|= get_cabac( &h->cabac, &h->cabac_state[27+5] ) << 2;
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
4490 bits|= get_cabac( &h->cabac, &h->cabac_state[27+5] ) << 1;
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
4491 bits|= get_cabac( &h->cabac, &h->cabac_state[27+5] );
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
4492 if( bits < 8 )
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
4493 return bits + 3; /* B_Bi_16x16 through B_L1_L0_16x8 */
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
4494 else if( bits == 13 ) {
2312
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
4495 return decode_cabac_intra_mb_type(h, 32, 0) + 23;
2310
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
4496 } else if( bits == 14 )
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
4497 return 11; /* B_L1_L0_8x16 */
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
4498 else if( bits == 15 )
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
4499 return 22; /* B_8x8 */
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
4500
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
4501 bits= ( bits<<1 ) | get_cabac( &h->cabac, &h->cabac_state[27+5] );
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
4502 return bits - 4; /* B_L0_Bi_* through B_Bi_Bi_* */
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4503 } else {
2310
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
4504 /* TODO SI/SP frames? */
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4505 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
4506 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4507 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4508
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4509 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
4510 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
4511 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
4512 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
4513 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
4514 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
4515
2498
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
4516 if( h->slice_table[mba_xy] == h->slice_num && !IS_SKIP( s->current_picture.mb_type[mba_xy] ))
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4517 ctx++;
2498
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
4518 if( h->slice_table[mbb_xy] == h->slice_num && !IS_SKIP( s->current_picture.mb_type[mbb_xy] ))
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4519 ctx++;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4520
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4521 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
4522 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
4523 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
4524 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
4525 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4526
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4527 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
4528 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
4529
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4530 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
4531 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
4532
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4533 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
4534 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
4535 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
4536 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
4537 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
4538 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
4539 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
4540 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
4541 else
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4542 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
4543 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4544
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4545 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
4546 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
4547 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
4548 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
4549 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
4550
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4551 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
4552
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
4553 /* No need to test for IS_INTRA4x4 and IS_INTRA16x16, as we set chroma_pred_mode_table to 0 */
2498
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
4554 if( h->slice_table[mba_xy] == h->slice_num && h->chroma_pred_mode_table[mba_xy] != 0 )
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4555 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
4556
2498
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
4557 if( h->slice_table[mbb_xy] == h->slice_num && h->chroma_pred_mode_table[mbb_xy] != 0 )
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4558 ctx++;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4559
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4560 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
4561 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
4562
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4563 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
4564 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
4565 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
4566 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
4567 else
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4568 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
4569 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4570
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4571 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
4572 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
4573 };
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4574 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
4575 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
4576 };
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4577 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
4578 { 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
4579 { 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
4580 { 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
4581 { 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
4582 };
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4583
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4584 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
4585 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
4586 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
4587
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4588 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
4589 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
4590
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4591 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
4592
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4593 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
4594 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
4595 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
4596 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
4597 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
4598
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4599 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
4600 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
4601
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4602 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
4603 mba_xy = mb_xy;
2498
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
4604 else 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
4605 mba_xy = mb_xy - 1;
2498
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
4606 if (h->slice_table[mba_xy] != h->slice_num) {
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
4607 mba_xy = -1;
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
4608 }
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
4609 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4610
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4611 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
4612 mbb_xy = mb_xy;
2498
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
4613 else 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
4614 mbb_xy = mb_xy - s->mb_stride;
2498
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
4615 if (h->slice_table[mbb_xy] != h->slice_num) {
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
4616 mbb_xy = -1;
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
4617 }
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
4618 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4619
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
4620 /* 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
4621 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
4622 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
4623 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
4624 ctx++;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4625 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4626
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4627 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
4628 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
4629 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
4630 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
4631 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4632
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4633 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
4634 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
4635 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
4636 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4637 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4638 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
4639 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4640 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
4641 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
4642 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
4643
2314
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
4644 cbp_a = (h->left_cbp>>4)&0x03;
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
4645 cbp_b = (h-> top_cbp>>4)&0x03;
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4646
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4647 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
4648 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
4649 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
4650 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
4651 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
4652
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4653 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
4654 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
4655 if( cbp_b == 2 ) ctx += 2;
2314
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
4656 return 1 + get_cabac( &h->cabac, &h->cabac_state[77 + ctx] );
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4657 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4658 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
4659 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
4660 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
4661 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
4662 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
4663
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4664 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
4665 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
4666 else
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4667 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
4668
2498
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
4669 if( h->last_qscale_diff != 0 && ( IS_INTRA16x16(s->current_picture.mb_type[mbn_xy] ) || (h->cbp_table[mbn_xy]&0x3f) ) )
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4670 ctx++;
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 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
4673 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
4674 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
4675 else
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4676 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
4677 val++;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4678 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4679
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4680 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
4681 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
4682 else
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4683 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
4684 }
2310
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
4685 static int decode_cabac_p_mb_sub_type( H264Context *h ) {
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4686 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
4687 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
4688 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
4689 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
4690 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
4691 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
4692 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
4693 }
2310
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
4694 static int decode_cabac_b_mb_sub_type( H264Context *h ) {
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
4695 int type;
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
4696 if( !get_cabac( &h->cabac, &h->cabac_state[36] ) )
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
4697 return 0; /* B_Direct_8x8 */
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
4698 if( !get_cabac( &h->cabac, &h->cabac_state[37] ) )
2311
cdbb2f30e08b small typo patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 2310
diff changeset
4699 return 1 + get_cabac( &h->cabac, &h->cabac_state[39] ); /* B_L0_8x8, B_L1_8x8 */
2310
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
4700 type = 3;
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
4701 if( get_cabac( &h->cabac, &h->cabac_state[38] ) ) {
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
4702 if( get_cabac( &h->cabac, &h->cabac_state[39] ) )
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
4703 return 11 + get_cabac( &h->cabac, &h->cabac_state[39] ); /* B_L1_4x4, B_Bi_4x4 */
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
4704 type += 4;
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
4705 }
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
4706 type += 2*get_cabac( &h->cabac, &h->cabac_state[39] );
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
4707 type += get_cabac( &h->cabac, &h->cabac_state[39] );
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
4708 return type;
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
4709 }
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4710
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4711 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
4712 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
4713 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
4714 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
4715 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
4716
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4717 if( h->slice_type == B_TYPE) {
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4718 if( refa > 0 && !h->direct_cache[scan8[n] - 1] )
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4719 ctx++;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4720 if( refb > 0 && !h->direct_cache[scan8[n] - 8] )
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4721 ctx += 2;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4722 } else {
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4723 if( refa > 0 )
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4724 ctx++;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4725 if( refb > 0 )
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4726 ctx += 2;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4727 }
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4728
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4729 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
4730 ref++;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4731 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
4732 ctx = 4;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4733 else
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4734 ctx = 5;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4735 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4736 return ref;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4737 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4738
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4739 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
4740 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
4741 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
4742 int ctxbase = (l == 0) ? 40 : 47;
2317
2865f759882a optimzation
michael
parents: 2316
diff changeset
4743 int ctx, mvd;
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4744
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4745 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
4746 ctx = 0;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4747 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
4748 ctx = 2;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4749 else
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4750 ctx = 1;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4751
2317
2865f759882a optimzation
michael
parents: 2316
diff changeset
4752 if(!get_cabac(&h->cabac, &h->cabac_state[ctxbase+ctx]))
2865f759882a optimzation
michael
parents: 2316
diff changeset
4753 return 0;
2865f759882a optimzation
michael
parents: 2316
diff changeset
4754
2865f759882a optimzation
michael
parents: 2316
diff changeset
4755 mvd= 1;
2865f759882a optimzation
michael
parents: 2316
diff changeset
4756 ctx= 3;
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4757 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
4758 mvd++;
2317
2865f759882a optimzation
michael
parents: 2316
diff changeset
4759 if( ctx < 6 )
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4760 ctx++;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4761 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4762
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4763 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
4764 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
4765 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
4766 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
4767 k++;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4768 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4769 while( k-- ) {
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4770 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
4771 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
4772 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4773 }
2317
2865f759882a optimzation
michael
parents: 2316
diff changeset
4774 if( get_cabac_bypass( &h->cabac ) ) return -mvd;
2865f759882a optimzation
michael
parents: 2316
diff changeset
4775 else return mvd;
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4776 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4777
2316
fe25f849a169 optimization
michael
parents: 2315
diff changeset
4778 static int inline get_cabac_cbf_ctx( H264Context *h, int cat, int idx ) {
2314
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
4779 int nza, nzb;
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4780 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
4781
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4782 if( cat == 0 ) {
2314
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
4783 nza = h->left_cbp&0x100;
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
4784 nzb = h-> top_cbp&0x100;
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4785 } else if( cat == 1 || cat == 2 ) {
2314
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
4786 nza = h->non_zero_count_cache[scan8[idx] - 1];
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
4787 nzb = h->non_zero_count_cache[scan8[idx] - 8];
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4788 } else if( cat == 3 ) {
2314
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
4789 nza = (h->left_cbp>>(6+idx))&0x01;
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
4790 nzb = (h-> top_cbp>>(6+idx))&0x01;
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
4791 } else {
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
4792 assert(cat == 4);
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
4793 nza = h->non_zero_count_cache[scan8[16+idx] - 1];
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
4794 nzb = h->non_zero_count_cache[scan8[16+idx] - 8];
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
4795 }
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
4796
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
4797 if( nza > 0 )
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4798 ctx++;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4799
2314
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
4800 if( nzb > 0 )
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4801 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
4802
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4803 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
4804 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4805
2316
fe25f849a169 optimization
michael
parents: 2315
diff changeset
4806 static int inline decode_cabac_residual( H264Context *h, DCTELEM *block, int cat, int n, const uint8_t *scantable, int qp, int max_coeff) {
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4807 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
4808 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
4809 static const int significant_coeff_flag_offset[5] = { 0, 15, 29, 44, 47 };
2313
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
4810 static const int coeff_abs_level_m1_offset[5] = {227+ 0, 227+10, 227+20, 227+30, 227+39 };
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4811
2313
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
4812 int index[16];
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
4813
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
4814 int i, last;
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4815 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
4816
2316
fe25f849a169 optimization
michael
parents: 2315
diff changeset
4817 int abslevel1 = 1;
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4818 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
4819
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4820 /* 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
4821 * 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
4822 * 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
4823 * 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
4824 * 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
4825 */
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4826
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4827 /* 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
4828 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
4829 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
4830 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
4831 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
4832 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
4833
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4834 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
4835 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4836
2313
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
4837 for(last= 0; last < max_coeff - 1; last++) {
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
4838 if( get_cabac( &h->cabac, &h->cabac_state[105+significant_coeff_flag_offset[cat]+last] )) {
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
4839 index[coeff_count++] = last;
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
4840 if( get_cabac( &h->cabac, &h->cabac_state[166+significant_coeff_flag_offset[cat]+last] ) ) {
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
4841 last= max_coeff;
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4842 break;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4843 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4844 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4845 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4846 if( last == max_coeff -1 ) {
2313
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
4847 index[coeff_count++] = last;
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4848 }
2316
fe25f849a169 optimization
michael
parents: 2315
diff changeset
4849 assert(coeff_count > 0);
fe25f849a169 optimization
michael
parents: 2315
diff changeset
4850
fe25f849a169 optimization
michael
parents: 2315
diff changeset
4851 if( cat == 0 )
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4852 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
4853 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
4854 h->non_zero_count_cache[scan8[n]] = coeff_count;
2316
fe25f849a169 optimization
michael
parents: 2315
diff changeset
4855 else if( cat == 3 )
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4856 h->cbp_table[mb_xy] |= 0x40 << n;
2316
fe25f849a169 optimization
michael
parents: 2315
diff changeset
4857 else {
fe25f849a169 optimization
michael
parents: 2315
diff changeset
4858 assert( cat == 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
4859 h->non_zero_count_cache[scan8[16+n]] = coeff_count;
2316
fe25f849a169 optimization
michael
parents: 2315
diff changeset
4860 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4861
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4862 for( i = coeff_count - 1; i >= 0; i-- ) {
2316
fe25f849a169 optimization
michael
parents: 2315
diff changeset
4863 int ctx = (abslevelgt1 != 0 ? 0 : FFMIN( 4, abslevel1 )) + coeff_abs_level_m1_offset[cat];
fe25f849a169 optimization
michael
parents: 2315
diff changeset
4864 int j= scantable[index[i]];
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4865
2313
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
4866 if( get_cabac( &h->cabac, &h->cabac_state[ctx] ) == 0 ) {
2316
fe25f849a169 optimization
michael
parents: 2315
diff changeset
4867 if( cat == 0 || cat == 3 ) {
fe25f849a169 optimization
michael
parents: 2315
diff changeset
4868 if( get_cabac_bypass( &h->cabac ) ) block[j] = -1;
fe25f849a169 optimization
michael
parents: 2315
diff changeset
4869 else block[j] = 1;
fe25f849a169 optimization
michael
parents: 2315
diff changeset
4870 }else{
fe25f849a169 optimization
michael
parents: 2315
diff changeset
4871 if( get_cabac_bypass( &h->cabac ) ) block[j] = -qmul[j];
fe25f849a169 optimization
michael
parents: 2315
diff changeset
4872 else block[j] = qmul[j];
fe25f849a169 optimization
michael
parents: 2315
diff changeset
4873 }
2313
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
4874
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
4875 abslevel1++;
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4876 } else {
2313
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
4877 int coeff_abs = 2;
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4878 ctx = 5 + FFMIN( 4, abslevelgt1 ) + coeff_abs_level_m1_offset[cat];
2313
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
4879 while( coeff_abs < 15 && get_cabac( &h->cabac, &h->cabac_state[ctx] ) ) {
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
4880 coeff_abs++;
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4881 }
2313
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
4882
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
4883 if( coeff_abs >= 15 ) {
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
4884 int j = 0;
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
4885 while( get_cabac_bypass( &h->cabac ) ) {
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
4886 coeff_abs += 1 << j;
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
4887 j++;
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
4888 }
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
4889
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
4890 while( j-- ) {
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
4891 if( get_cabac_bypass( &h->cabac ) )
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
4892 coeff_abs += 1 << j ;
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
4893 }
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
4894 }
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
4895
2316
fe25f849a169 optimization
michael
parents: 2315
diff changeset
4896 if( cat == 0 || cat == 3 ) {
fe25f849a169 optimization
michael
parents: 2315
diff changeset
4897 if( get_cabac_bypass( &h->cabac ) ) block[j] = -coeff_abs;
fe25f849a169 optimization
michael
parents: 2315
diff changeset
4898 else block[j] = coeff_abs;
fe25f849a169 optimization
michael
parents: 2315
diff changeset
4899 }else{
fe25f849a169 optimization
michael
parents: 2315
diff changeset
4900 if( get_cabac_bypass( &h->cabac ) ) block[j] = -coeff_abs * qmul[j];
fe25f849a169 optimization
michael
parents: 2315
diff changeset
4901 else block[j] = coeff_abs * qmul[j];
fe25f849a169 optimization
michael
parents: 2315
diff changeset
4902 }
2313
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
4903
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
4904 abslevelgt1++;
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4905 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4906 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4907 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
4908 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4909
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4910 /**
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4911 * 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
4912 * @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
4913 */
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4914 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
4915 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
4916 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
4917 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
4918
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4919 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
4920
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4921 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
4922 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
4923 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
4924 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4925
2441
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
4926 tprintf("pic:%d mb:%d/%d\n", h->frame_num, s->mb_x, s->mb_y);
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4927 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
4928 /* 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
4929 if( decode_cabac_mb_skip( h ) ) {
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4930 decode_mb_skip(h);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4931
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4932 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
4933 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
4934 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
4935
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4936 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
4937
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4938 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4939 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4940 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
4941
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4942 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
4943 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
4944 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
4945 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4946
2310
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
4947 if( h->slice_type == B_TYPE ) {
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
4948 if( mb_type < 23 ){
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
4949 partition_count= b_mb_type_info[mb_type].partition_count;
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
4950 mb_type= b_mb_type_info[mb_type].type;
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
4951 }else{
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
4952 mb_type -= 23;
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
4953 goto decode_intra_mb;
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
4954 }
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
4955 } else if( h->slice_type == P_TYPE ) {
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4956 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
4957 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
4958 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
4959 } else {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4960 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
4961 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
4962 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4963 } else {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4964 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
4965 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
4966 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
4967 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
4968 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
4969 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
4970 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4971 #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
4972 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
4973 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
4974 #endif
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4975
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4976 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
4977 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
4978
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4979 if(IS_INTRA_PCM(mb_type)) {
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
4980 const uint8_t *ptr;
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
4981 unsigned int x, y;
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
4982
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
4983 // We assume these blocks are very rare so we dont optimize it.
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
4984 // FIXME The two following lines get the bitstream position in the cabac
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
4985 // decode, I think it should be done by a function in cabac.h (or cabac.c).
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
4986 ptr= h->cabac.bytestream;
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
4987 if (h->cabac.low&0x1) ptr-=CABAC_BITS/8;
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
4988
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
4989 // The pixels are stored in the same order as levels in h->mb array.
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
4990 for(y=0; y<16; y++){
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
4991 const int index= 4*(y&3) + 32*((y>>2)&1) + 128*(y>>3);
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
4992 for(x=0; x<16; x++){
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
4993 tprintf("LUMA ICPM LEVEL (%3d)\n", *ptr);
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
4994 h->mb[index + (x&3) + 16*((x>>2)&1) + 64*(x>>3)]= *ptr++;
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
4995 }
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
4996 }
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
4997 for(y=0; y<8; y++){
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
4998 const int index= 256 + 4*(y&3) + 32*(y>>2);
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
4999 for(x=0; x<8; x++){
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5000 tprintf("CHROMA U ICPM LEVEL (%3d)\n", *ptr);
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5001 h->mb[index + (x&3) + 16*(x>>2)]= *ptr++;
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5002 }
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5003 }
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5004 for(y=0; y<8; y++){
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5005 const int index= 256 + 64 + 4*(y&3) + 32*(y>>2);
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5006 for(x=0; x<8; x++){
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5007 tprintf("CHROMA V ICPM LEVEL (%3d)\n", *ptr);
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5008 h->mb[index + (x&3) + 16*(x>>2)]= *ptr++;
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5009 }
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5010 }
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5011
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5012 ff_init_cabac_decoder(&h->cabac, ptr, h->cabac.bytestream_end - ptr);
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5013
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5014 // All blocks are presents
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5015 h->cbp_table[mb_xy] = 0x1ef;
1956
0eb2947f56f6 h264 hurry up fix and a tiny cabac clean patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1935
diff changeset
5016 h->chroma_pred_mode_table[mb_xy] = 0;
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5017 // In deblocking, the quantiser is 0
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5018 s->current_picture.qscale_table[mb_xy]= 0;
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5019 h->chroma_qp = get_chroma_qp(h, 0);
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5020 // All coeffs are presents
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5021 memset(h->non_zero_count[mb_xy], 16, 16);
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5022 return 0;
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5023 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5024
2449
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
5025 fill_caches(h, mb_type, 0);
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5026
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5027 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
5028 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
5029 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
5030 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
5031 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
5032 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
5033
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5034 //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
5035 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5036 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
5037 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
5038 } else {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5039 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
5040 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
5041 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5042 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
5043 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
5044
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5045 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
5046 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
5047 } 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
5048 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
5049
2310
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5050 if( h->slice_type == B_TYPE ) {
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5051 for( i = 0; i < 4; i++ ) {
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5052 h->sub_mb_type[i] = decode_cabac_b_mb_sub_type( h );
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5053 sub_partition_count[i]= b_sub_mb_type_info[ h->sub_mb_type[i] ].partition_count;
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5054 h->sub_mb_type[i]= b_sub_mb_type_info[ h->sub_mb_type[i] ].type;
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5055 }
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5056 if( IS_DIRECT(h->sub_mb_type[0]) || IS_DIRECT(h->sub_mb_type[1])
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5057 || IS_DIRECT(h->sub_mb_type[2]) || IS_DIRECT(h->sub_mb_type[3])) {
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5058 pred_direct_motion(h, &mb_type);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5059 if( h->ref_count[0] > 1 || h->ref_count[1] > 1 ) {
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5060 for( i = 0; i < 4; i++ )
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5061 if( IS_DIRECT(h->sub_mb_type[i]) )
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5062 fill_rectangle( &h->direct_cache[scan8[4*i]], 2, 2, 8, 1, 1 );
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5063 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5064 }
2310
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5065 } else {
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5066 for( i = 0; i < 4; i++ ) {
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5067 h->sub_mb_type[i] = decode_cabac_p_mb_sub_type( h );
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5068 sub_partition_count[i]= p_sub_mb_type_info[ h->sub_mb_type[i] ].partition_count;
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5069 h->sub_mb_type[i]= p_sub_mb_type_info[ h->sub_mb_type[i] ].type;
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5070 }
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5071 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5072
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5073 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
5074 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
5075 for( i = 0; i < 4; i++ ) {
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5076 if(IS_DIRECT(h->sub_mb_type[i])) continue;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5077 if(IS_DIR(h->sub_mb_type[i], 0, list)){
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5078 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
5079 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
5080 else
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5081 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
5082 } else {
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5083 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
5084 }
2110
michael
parents: 2099
diff changeset
5085 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
5086 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
5087 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5088 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5089 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5090
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5091 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
5092 for(i=0; i<4; i++){
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5093 if(IS_DIRECT(h->sub_mb_type[i])){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5094 fill_rectangle(h->mvd_cache[list][scan8[4*i]], 2, 2, 8, 0, 4);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5095 continue;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5096 }
2110
michael
parents: 2099
diff changeset
5097 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
5098
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5099 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
5100 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
5101 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
5102 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
5103 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
5104 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
5105 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
5106 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
5107 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
5108 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
5109
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5110 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
5111 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
5112 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
5113
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5114 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
5115 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
5116 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
5117 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
5118 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
5119
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5120 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
5121 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
5122 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
5123 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
5124 }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
5125 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
5126 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
5127
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5128 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
5129 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
5130 }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
5131 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
5132 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
5133
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5134 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
5135 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
5136 }else{
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5137 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
5138 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
5139 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
5140
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5141 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
5142 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
5143 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5144 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5145 }else{
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5146 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
5147 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
5148 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
5149 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
5150 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5151 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5152 }
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5153 } else if( IS_DIRECT(mb_type) ) {
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5154 pred_direct_motion(h, &mb_type);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5155 s->current_picture.mb_type[mb_xy]= mb_type;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5156 fill_rectangle(h->mvd_cache[0][scan8[0]], 4, 4, 8, 0, 4);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5157 fill_rectangle(h->mvd_cache[1][scan8[0]], 4, 4, 8, 0, 4);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5158 } else {
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5159 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
5160 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
5161 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
5162 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
5163 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
5164 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
5165 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
5166 }
2523
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
5167 }else
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
5168 fill_rectangle(&h->ref_cache[list][ scan8[0] ], 4, 4, 8, (uint8_t)LIST_NOT_USED, 1);
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5169 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5170 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
5171 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
5172 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
5173
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5174 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
5175 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
5176 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
5177
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5178 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
5179 fill_rectangle(h->mv_cache[list][ scan8[0] ], 4, 4, 8, pack16to32(mx,my), 4);
2523
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
5180 }else
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
5181 fill_rectangle(h->mv_cache[list][ scan8[0] ], 4, 4, 8, 0, 4);
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5182 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5183 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5184 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
5185 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
5186 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
5187 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
5188 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
5189 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
5190 fill_rectangle(&h->ref_cache[list][ scan8[0] + 16*i ], 4, 2, 8, ref, 1);
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5191 }else
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5192 fill_rectangle(&h->ref_cache[list][ scan8[0] + 16*i ], 4, 2, 8, (LIST_NOT_USED&0xFF), 1);
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5193 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5194 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5195 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5196 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
5197 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
5198 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
5199 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
5200 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
5201 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
5202 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
5203
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5204 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
5205 fill_rectangle(h->mv_cache[list][ scan8[0] + 16*i ], 4, 2, 8, pack16to32(mx,my), 4);
2523
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
5206 }else{
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5207 fill_rectangle(h->mvd_cache[list][ scan8[0] + 16*i ], 4, 2, 8, 0, 4);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5208 fill_rectangle(h-> mv_cache[list][ scan8[0] + 16*i ], 4, 2, 8, 0, 4);
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5209 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5210 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5211 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5212 }else{
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5213 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
5214 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
5215 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
5216 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
5217 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
5218 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
5219 fill_rectangle(&h->ref_cache[list][ scan8[0] + 2*i ], 2, 4, 8, ref, 1);
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5220 }else
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5221 fill_rectangle(&h->ref_cache[list][ scan8[0] + 2*i ], 2, 4, 8, (LIST_NOT_USED&0xFF), 1);
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5222 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5223 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5224 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5225 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
5226 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
5227 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
5228 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
5229 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
5230 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
5231
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5232 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
5233 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
5234 fill_rectangle(h->mv_cache[list][ scan8[0] + 2*i ], 2, 4, 8, pack16to32(mx,my), 4);
2523
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
5235 }else{
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5236 fill_rectangle(h->mvd_cache[list][ scan8[0] + 2*i ], 2, 4, 8, 0, 4);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5237 fill_rectangle(h-> mv_cache[list][ scan8[0] + 2*i ], 2, 4, 8, 0, 4);
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5238 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5239 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5240 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5241 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5242 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5243
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
5244 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
5245 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
5246 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
5247 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5248
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5249 if( !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
5250 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
5251 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
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
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5254 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
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 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
5257 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
5258 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
5259
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5260 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
5261 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
5262 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
5263 }else{
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5264 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
5265 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
5266 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5267
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5268 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
5269 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
5270 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
5271 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
5272 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
5273 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5274 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
5275
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5276 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
5277 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
5278 //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
5279 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
5280 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
5281 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
5282 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
5283 //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
5284 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
5285 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
5286 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5287 } else {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5288 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
5289 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5290 } else {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5291 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
5292 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
5293 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
5294 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
5295 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
5296 //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
5297 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
5298 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
5299 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5300 } else {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5301 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
5302 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
5303 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5304 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5305 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5306
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5307 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
5308 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
5309 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
5310 //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
5311 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
5312 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
5313 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5314 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5315
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5316 if( 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
5317 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
5318 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
5319 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
5320 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
5321 //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
5322 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
5323 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
5324 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5325 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5326 } else {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5327 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
5328 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
5329 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
5330 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5331 } else {
2315
29b67549d0cc fix CABAC+LOOP missmatch
michael
parents: 2314
diff changeset
5332 uint8_t * const nnz= &h->non_zero_count_cache[0];
29b67549d0cc fix CABAC+LOOP missmatch
michael
parents: 2314
diff changeset
5333 fill_rectangle(&nnz[scan8[0]], 4, 4, 8, 0, 1);
29b67549d0cc fix CABAC+LOOP missmatch
michael
parents: 2314
diff changeset
5334 nnz[ scan8[16]+0 ] = nnz[ scan8[16]+1 ] =nnz[ scan8[16]+8 ] =nnz[ scan8[16]+9 ] =
29b67549d0cc fix CABAC+LOOP missmatch
michael
parents: 2314
diff changeset
5335 nnz[ scan8[20]+0 ] = nnz[ scan8[20]+1 ] =nnz[ scan8[20]+8 ] =nnz[ scan8[20]+9 ] = 0;
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5336 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5337
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5338 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
5339 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
5340
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5341 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
5342 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5343
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5344
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
5345 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
5346 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
5347 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
5348 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
5349 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
5350
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5351 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
5352 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
5353 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
5354 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
5355 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5356
1898
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5357 if( bS[i] < 4 ) {
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5358 const int tc0 = tc0_table[index_a][bS[i] - 1];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5359 /* 4px edge length */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5360 for( d = 0; d < 4; d++ ) {
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5361 const int p0 = pix[-1];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5362 const int p1 = pix[-2];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5363 const int p2 = pix[-3];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5364 const int q0 = pix[0];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5365 const int q1 = pix[1];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5366 const int q2 = pix[2];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5367
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5368 if( ABS( p0 - q0 ) < alpha &&
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5369 ABS( p1 - p0 ) < beta &&
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5370 ABS( q1 - q0 ) < beta ) {
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5371 int tc = tc0;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5372 int i_delta;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5373
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5374 if( ABS( p2 - p0 ) < beta ) {
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5375 pix[-2] = p1 + clip( ( p2 + ( ( p0 + q0 + 1 ) >> 1 ) - ( p1 << 1 ) ) >> 1, -tc0, tc0 );
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5376 tc++;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5377 }
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5378 if( ABS( q2 - q0 ) < beta ) {
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5379 pix[1] = q1 + clip( ( q2 + ( ( p0 + q0 + 1 ) >> 1 ) - ( q1 << 1 ) ) >> 1, -tc0, tc0 );
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5380 tc++;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5381 }
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5382
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5383 i_delta = clip( (((q0 - p0 ) << 2) + (p1 - q1) + 4) >> 3, -tc, tc );
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5384 pix[-1] = clip_uint8( p0 + i_delta ); /* p0' */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5385 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
5386 }
1898
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5387 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
5388 }
1898
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5389 }else{
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5390 /* 4px edge length */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5391 for( d = 0; d < 4; d++ ) {
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5392 const int p0 = pix[-1];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5393 const int p1 = pix[-2];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5394 const int p2 = pix[-3];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5395
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5396 const int q0 = pix[0];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5397 const int q1 = pix[1];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5398 const int q2 = pix[2];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5399
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5400 if( ABS( p0 - q0 ) < alpha &&
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5401 ABS( p1 - p0 ) < beta &&
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5402 ABS( q1 - q0 ) < beta ) {
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5403
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5404 if(ABS( p0 - q0 ) < (( alpha >> 2 ) + 2 )){
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5405 if( ABS( p2 - p0 ) < beta)
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5406 {
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5407 const int p3 = pix[-4];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5408 /* p0', p1', p2' */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5409 pix[-1] = ( p2 + 2*p1 + 2*p0 + 2*q0 + q1 + 4 ) >> 3;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5410 pix[-2] = ( p2 + p1 + p0 + q0 + 2 ) >> 2;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5411 pix[-3] = ( 2*p3 + 3*p2 + p1 + p0 + q0 + 4 ) >> 3;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5412 } else {
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5413 /* p0' */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5414 pix[-1] = ( 2*p1 + p0 + q1 + 2 ) >> 2;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5415 }
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5416 if( ABS( q2 - q0 ) < beta)
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5417 {
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5418 const int q3 = pix[3];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5419 /* q0', q1', q2' */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5420 pix[0] = ( p1 + 2*p0 + 2*q0 + 2*q1 + q2 + 4 ) >> 3;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5421 pix[1] = ( p0 + q0 + q1 + q2 + 2 ) >> 2;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5422 pix[2] = ( 2*q3 + 3*q2 + q1 + q0 + p0 + 4 ) >> 3;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5423 } else {
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5424 /* q0' */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5425 pix[0] = ( 2*q1 + q0 + p1 + 2 ) >> 2;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5426 }
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5427 }else{
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5428 /* p0', q0' */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5429 pix[-1] = ( 2*p1 + p0 + q1 + 2 ) >> 2;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5430 pix[ 0] = ( 2*q1 + q0 + p1 + 2 ) >> 2;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5431 }
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
5432 }
1898
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5433 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
5434 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5435 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5436 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5437 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5438 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
5439 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
5440 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
5441 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
5442 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
5443
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5444 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
5445 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
5446 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
5447 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
5448 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5449
1898
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5450 if( bS[i] < 4 ) {
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5451 const int tc = tc0_table[index_a][bS[i] - 1] + 1;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5452 /* 2px edge length (because we use same bS than the one for luma) */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5453 for( d = 0; d < 2; d++ ){
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5454 const int p0 = pix[-1];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5455 const int p1 = pix[-2];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5456 const int q0 = pix[0];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5457 const int q1 = pix[1];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5458
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5459 if( ABS( p0 - q0 ) < alpha &&
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5460 ABS( p1 - p0 ) < beta &&
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5461 ABS( q1 - q0 ) < beta ) {
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5462 const int i_delta = clip( (((q0 - p0 ) << 2) + (p1 - q1) + 4) >> 3, -tc, tc );
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5463
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5464 pix[-1] = clip_uint8( p0 + i_delta ); /* p0' */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5465 pix[0] = clip_uint8( q0 - i_delta ); /* q0' */
2441
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
5466 //tprintf("filter_mb_edgecv i:%d d:%d, qp:%d, indexA:%d, alpha:%d, beta:%d, tc:%d\n# bS:%d -> [%02x, %02x, %02x, %02x, %02x, %02x] =>[%02x, %02x, %02x, %02x]\n", i, d, qp, index_a, alpha, beta, tc, bS[i], pix[-3], p1, p0, q0, q1, pix[2], p1, pix[-1], pix[0], q1);
1898
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5467 }
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
5468 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
5469 }
1898
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5470 }else{
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5471 /* 2px edge length (because we use same bS than the one for luma) */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5472 for( d = 0; d < 2; d++ ){
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5473 const int p0 = pix[-1];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5474 const int p1 = pix[-2];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5475 const int q0 = pix[0];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5476 const int q1 = pix[1];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5477
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5478 if( ABS( p0 - q0 ) < alpha &&
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5479 ABS( p1 - p0 ) < beta &&
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5480 ABS( q1 - q0 ) < beta ) {
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5481
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5482 pix[-1] = ( 2*p1 + p0 + q1 + 2 ) >> 2; /* p0' */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5483 pix[0] = ( 2*q1 + q0 + p1 + 2 ) >> 2; /* q0' */
2441
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
5484 //tprintf("filter_mb_edgecv i:%d d:%d\n# bS:4 -> [%02x, %02x, %02x, %02x, %02x, %02x] =>[%02x, %02x, %02x, %02x]\n", i, d, pix[-3], p1, p0, q0, q1, pix[2], p1, pix[-1], pix[0], q1);
1898
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5485 }
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5486 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
5487 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5488 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5489 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5490 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5491
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5492 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
5493 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
5494 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
5495 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
5496 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
5497 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
5498
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5499 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
5500 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
5501 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
5502 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
5503 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5504
1898
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5505 if( bS[i] < 4 ) {
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5506 const int tc0 = tc0_table[index_a][bS[i] - 1];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5507 /* 4px edge length */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5508 for( d = 0; d < 4; d++ ) {
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5509 const int p0 = pix[-1*pix_next];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5510 const int p1 = pix[-2*pix_next];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5511 const int p2 = pix[-3*pix_next];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5512 const int q0 = pix[0];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5513 const int q1 = pix[1*pix_next];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5514 const int q2 = pix[2*pix_next];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5515
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5516 if( ABS( p0 - q0 ) < alpha &&
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5517 ABS( p1 - p0 ) < beta &&
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5518 ABS( q1 - q0 ) < beta ) {
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5519
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5520 int tc = tc0;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5521 int i_delta;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5522
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5523 if( ABS( p2 - p0 ) < beta ) {
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5524 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
5525 tc++;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5526 }
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5527 if( ABS( q2 - q0 ) < beta ) {
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5528 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
5529 tc++;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5530 }
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5531
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5532 i_delta = clip( (((q0 - p0 ) << 2) + (p1 - q1) + 4) >> 3, -tc, tc );
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5533 pix[-pix_next] = clip_uint8( p0 + i_delta ); /* p0' */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5534 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
5535 }
1898
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5536 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
5537 }
1898
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5538 }else{
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5539 /* 4px edge length */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5540 for( d = 0; d < 4; d++ ) {
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5541 const int p0 = pix[-1*pix_next];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5542 const int p1 = pix[-2*pix_next];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5543 const int p2 = pix[-3*pix_next];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5544 const int q0 = pix[0];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5545 const int q1 = pix[1*pix_next];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5546 const int q2 = pix[2*pix_next];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5547
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5548 if( ABS( p0 - q0 ) < alpha &&
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5549 ABS( p1 - p0 ) < beta &&
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5550 ABS( q1 - q0 ) < beta ) {
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5551
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5552 const int p3 = pix[-4*pix_next];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5553 const int q3 = pix[ 3*pix_next];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5554
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5555 if(ABS( p0 - q0 ) < (( alpha >> 2 ) + 2 )){
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5556 if( ABS( p2 - p0 ) < beta) {
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5557 /* p0', p1', p2' */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5558 pix[-1*pix_next] = ( p2 + 2*p1 + 2*p0 + 2*q0 + q1 + 4 ) >> 3;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5559 pix[-2*pix_next] = ( p2 + p1 + p0 + q0 + 2 ) >> 2;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5560 pix[-3*pix_next] = ( 2*p3 + 3*p2 + p1 + p0 + q0 + 4 ) >> 3;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5561 } else {
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5562 /* p0' */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5563 pix[-1*pix_next] = ( 2*p1 + p0 + q1 + 2 ) >> 2;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5564 }
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5565 if( ABS( q2 - q0 ) < beta) {
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5566 /* q0', q1', q2' */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5567 pix[0*pix_next] = ( p1 + 2*p0 + 2*q0 + 2*q1 + q2 + 4 ) >> 3;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5568 pix[1*pix_next] = ( p0 + q0 + q1 + q2 + 2 ) >> 2;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5569 pix[2*pix_next] = ( 2*q3 + 3*q2 + q1 + q0 + p0 + 4 ) >> 3;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5570 } else {
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5571 /* q0' */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5572 pix[0*pix_next] = ( 2*q1 + q0 + p1 + 2 ) >> 2;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5573 }
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5574 }else{
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5575 /* p0', q0' */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5576 pix[-1*pix_next] = ( 2*p1 + p0 + q1 + 2 ) >> 2;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5577 pix[ 0*pix_next] = ( 2*q1 + q0 + p1 + 2 ) >> 2;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5578 }
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
5579 }
1898
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5580 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
5581 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5582 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5583 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5584 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5585
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5586 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
5587 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
5588 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
5589 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
5590 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
5591 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
5592
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5593 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
5594 {
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5595 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
5596 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
5597 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
5598 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5599
1898
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5600 if( bS[i] < 4 ) {
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5601 int tc = tc0_table[index_a][bS[i] - 1] + 1;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5602 /* 2px edge length (see deblocking_filter_edgecv) */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5603 for( d = 0; d < 2; d++ ) {
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5604 const int p0 = pix[-1*pix_next];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5605 const int p1 = pix[-2*pix_next];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5606 const int q0 = pix[0];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5607 const int q1 = pix[1*pix_next];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5608
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5609 if( ABS( p0 - q0 ) < alpha &&
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5610 ABS( p1 - p0 ) < beta &&
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5611 ABS( q1 - q0 ) < beta ) {
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5612
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5613 int i_delta = clip( (((q0 - p0 ) << 2) + (p1 - q1) + 4) >> 3, -tc, tc );
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5614
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5615 pix[-pix_next] = clip_uint8( p0 + i_delta ); /* p0' */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5616 pix[0] = clip_uint8( q0 - i_delta ); /* q0' */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5617 }
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
5618 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
5619 }
1898
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5620 }else{
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5621 /* 2px edge length (see deblocking_filter_edgecv) */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5622 for( d = 0; d < 2; d++ ) {
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5623 const int p0 = pix[-1*pix_next];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5624 const int p1 = pix[-2*pix_next];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5625 const int q0 = pix[0];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5626 const int q1 = pix[1*pix_next];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5627
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5628 if( ABS( p0 - q0 ) < alpha &&
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5629 ABS( p1 - p0 ) < beta &&
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5630 ABS( q1 - q0 ) < beta ) {
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5631
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5632 pix[-pix_next] = ( 2*p1 + p0 + q1 + 2 ) >> 2; /* p0' */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5633 pix[0] = ( 2*q1 + q0 + p1 + 2 ) >> 2; /* q0' */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5634 }
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5635 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
5636 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5637 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5638 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5639 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5640
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
5641 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
5642 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
5643 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
5644 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
5645 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
5646
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5647 /* 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
5648 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
5649 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
5650 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5651 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
5652 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
5653
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5654 /* 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
5655 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
5656 {
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5657 int edge;
2454
300f1207768d simplify
michael
parents: 2453
diff changeset
5658 const int mbm_xy = dir == 0 ? mb_xy -1 : mb_xy - s->mb_stride;
300f1207768d simplify
michael
parents: 2453
diff changeset
5659 int start = h->slice_table[mbm_xy] == 255 ? 1 : 0;
300f1207768d simplify
michael
parents: 2453
diff changeset
5660
300f1207768d simplify
michael
parents: 2453
diff changeset
5661 if (h->deblocking_filter==2 && h->slice_table[mbm_xy] != h->slice_table[mb_xy])
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5662 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
5663
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5664 /* 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
5665 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
5666 /* mbn_xy: neighbour macroblock (how that works for field ?) */
2454
300f1207768d simplify
michael
parents: 2453
diff changeset
5667 int mbn_xy = edge > 0 ? mb_xy : mbm_xy;
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5668 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
5669 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
5670
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5671 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
5672 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
5673 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
5674 } 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
5675 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
5676 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
5677 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
5678 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
5679 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
5680 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
5681
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
5682 if( h->non_zero_count_cache[b_idx] != 0 ||
2449
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
5683 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
5684 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
5685 }
2523
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
5686 else
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
5687 {
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
5688 /* FIXME: A given frame may occupy more than one position in
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
5689 * the reference list. So we should compare the frame numbers,
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
5690 * not the indices in the ref list. */
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
5691 int l;
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
5692 bS[i] = 0;
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
5693 for( l = 0; l < 1 + (h->slice_type == B_TYPE); l++ ) {
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
5694 if( h->ref_cache[l][b_idx] != h->ref_cache[l][bn_idx] ||
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
5695 ABS( h->mv_cache[l][b_idx][0] - h->mv_cache[l][bn_idx][0] ) >= 4 ||
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
5696 ABS( h->mv_cache[l][b_idx][1] - h->mv_cache[l][bn_idx][1] ) >= 4 ) {
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
5697 bS[i] = 1;
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
5698 break;
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
5699 }
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
5700 }
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
5701 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5702 }
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
5703
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
5704 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
5705 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
5706 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5707
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5708 /* Filter edge */
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5709 // Do not use s->qscale as luma quantiser because it has not the same
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5710 // value in IPCM macroblocks.
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5711 qp = ( s->current_picture.qscale_table[mb_xy] + s->current_picture.qscale_table[mbn_xy] + 1 ) >> 1;
2441
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
5712 //tprintf("filter mb:%d/%d dir:%d edge:%d, QPy:%d, QPc:%d, QPcn:%d\n", mb_x, mb_y, dir, edge, qp, h->chroma_qp, s->current_picture.qscale_table[mbn_xy]);
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
5713 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
5714 filter_mb_edgev( h, &img_y[4*edge], linesize, bS, qp );
1898
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5715 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
5716 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
5717 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
5718 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
5719 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
5720 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5721 } 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
5722 filter_mb_edgeh( h, &img_y[4*edge*linesize], linesize, bS, qp );
1898
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5723 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
5724 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
5725 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
5726 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
5727 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
5728 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5729 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5730 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5731 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5732 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5733
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5734 static int decode_slice(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5735 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5736 const int part_mask= s->partitioned_frame ? (AC_END|AC_ERROR) : 0x7F;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5737
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5738 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
5739
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5740 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
5741 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
5742
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5743 /* realign */
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5744 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
5745
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5746 /* 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
5747 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
5748 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
5749 s->gb.buffer + get_bits_count(&s->gb)/8,
2116
48d9f86fb047 overread fix
michael
parents: 2110
diff changeset
5750 ( 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
5751 /* 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
5752 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
5753 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
5754 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
5755 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
5756 else
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5757 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
5758
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5759 if( 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
5760 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
5761 else
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5762 h->cabac_state[i] = 2 * ( pre - 64 ) + 1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5763 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5764
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5765 for(;;){
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5766 int 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
5767 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
5768
2163
b25df257eab0 segfault fix
michael
parents: 2116
diff changeset
5769 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
5770
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5771 /* 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
5772 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
5773 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
5774
2163
b25df257eab0 segfault fix
michael
parents: 2116
diff changeset
5775 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
5776 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
5777
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5778 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
5779 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
5780 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5781
2116
48d9f86fb047 overread fix
michael
parents: 2110
diff changeset
5782 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
5783 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
5784 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
5785 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
5786 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5787
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5788 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
5789 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
5790 ff_draw_horiz_band(s, 16*s->mb_y, 16);
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
5791 ++s->mb_y;
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5792 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5793
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5794 if( eos || s->mb_y >= s->mb_height ) {
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
5795 tprintf("slice end %d %d\n", get_bits_count(&s->gb), s->gb.size_in_bits);
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5796 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
5797 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
5798 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5799 #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
5800 /* 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
5801 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
5802 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
5803 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
5804 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5805 #endif
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5806 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5807
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5808 } else {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5809 for(;;){
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5810 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
5811
2163
b25df257eab0 segfault fix
michael
parents: 2116
diff changeset
5812 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
5813
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5814 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
5815 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
5816 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
5817
2163
b25df257eab0 segfault fix
michael
parents: 2116
diff changeset
5818 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
5819 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
5820 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5821
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5822 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
5823 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
5824 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
5825
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5826 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
5827 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5828
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5829 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
5830 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
5831 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
5832 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
5833 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
5834
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5835 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
5836 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
5837
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5838 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
5839 }else{
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5840 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
5841
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5842 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
5843 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5844 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5845 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5846
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5847 if(get_bits_count(&s->gb) >= s->gb.size_in_bits && s->mb_skip_run<=0){
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
5848 tprintf("slice end %d %d\n", get_bits_count(&s->gb), s->gb.size_in_bits);
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5849 if(get_bits_count(&s->gb) == s->gb.size_in_bits ){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5850 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
5851
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5852 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5853 }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
5854 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
5855
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5856 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5857 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5858 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5859 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5860 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5861
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5862 #if 0
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5863 for(;s->mb_y < s->mb_height; s->mb_y++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5864 for(;s->mb_x < s->mb_width; s->mb_x++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5865 int ret= decode_mb(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5866
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5867 hl_decode_mb(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5868
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5869 if(ret<0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5870 fprintf(stderr, "error while decoding MB %d %d\n", s->mb_x, s->mb_y);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5871 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
5872
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5873 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5874 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5875
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5876 if(++s->mb_x >= s->mb_width){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5877 s->mb_x=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5878 if(++s->mb_y >= s->mb_height){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5879 if(get_bits_count(s->gb) == s->gb.size_in_bits){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5880 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
5881
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5882 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5883 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5884 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
5885
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5886 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5887 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5888 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5889 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5890
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5891 if(get_bits_count(s->?gb) >= s->gb?.size_in_bits){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5892 if(get_bits_count(s->gb) == s->gb.size_in_bits){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5893 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
5894
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5895 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5896 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5897 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
5898
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5899 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5900 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5901 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5902 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5903 s->mb_x=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5904 ff_draw_horiz_band(s, 16*s->mb_y, 16);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5905 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5906 #endif
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5907 return -1; //not reached
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5908 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5909
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5910 static inline int decode_vui_parameters(H264Context *h, SPS *sps){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5911 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5912 int aspect_ratio_info_present_flag, aspect_ratio_idc;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5913
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5914 aspect_ratio_info_present_flag= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5915
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5916 if( aspect_ratio_info_present_flag ) {
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5917 aspect_ratio_idc= get_bits(&s->gb, 8);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5918 if( aspect_ratio_idc == EXTENDED_SAR ) {
1548
dd544554ed42 AVRational
michael
parents: 1524
diff changeset
5919 sps->sar.num= get_bits(&s->gb, 16);
dd544554ed42 AVRational
michael
parents: 1524
diff changeset
5920 sps->sar.den= get_bits(&s->gb, 16);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5921 }else if(aspect_ratio_idc < 16){
1548
dd544554ed42 AVRational
michael
parents: 1524
diff changeset
5922 sps->sar= pixel_aspect[aspect_ratio_idc];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5923 }else{
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
5924 av_log(h->s.avctx, AV_LOG_ERROR, "illegal aspect ratio\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5925 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5926 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5927 }else{
1548
dd544554ed42 AVRational
michael
parents: 1524
diff changeset
5928 sps->sar.num=
dd544554ed42 AVRational
michael
parents: 1524
diff changeset
5929 sps->sar.den= 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5930 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5931 // 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
5932
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents: 2163
diff changeset
5933 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
5934 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
5935 }
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents: 2163
diff changeset
5936
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents: 2163
diff changeset
5937 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
5938 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
5939 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
5940 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
5941 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
5942 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
5943 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
5944 }
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents: 2163
diff changeset
5945 }
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents: 2163
diff changeset
5946
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents: 2163
diff changeset
5947 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
5948 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
5949 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
5950 }
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents: 2163
diff changeset
5951
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents: 2163
diff changeset
5952 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
5953 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
5954 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
5955 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
5956 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
5957 }
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents: 2163
diff changeset
5958
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5959 #if 0
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5960 | nal_hrd_parameters_present_flag |0 |u(1) |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5961 | if( nal_hrd_parameters_present_flag = = 1) | | |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5962 | hrd_parameters( ) | | |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5963 | vcl_hrd_parameters_present_flag |0 |u(1) |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5964 | if( vcl_hrd_parameters_present_flag = = 1) | | |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5965 | hrd_parameters( ) | | |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5966 | if( ( nal_hrd_parameters_present_flag = = 1 | || | |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5967 | | | |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5968 |( vcl_hrd_parameters_present_flag = = 1 ) ) | | |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5969 | low_delay_hrd_flag |0 |u(1) |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5970 | bitstream_restriction_flag |0 |u(1) |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5971 | if( bitstream_restriction_flag ) { |0 |u(1) |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5972 | motion_vectors_over_pic_boundaries_flag |0 |u(1) |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5973 | max_bytes_per_pic_denom |0 |ue(v) |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5974 | max_bits_per_mb_denom |0 |ue(v) |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5975 | log2_max_mv_length_horizontal |0 |ue(v) |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5976 | log2_max_mv_length_vertical |0 |ue(v) |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5977 | num_reorder_frames |0 |ue(v) |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5978 | max_dec_frame_buffering |0 |ue(v) |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5979 | } | | |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5980 |} | | |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5981 #endif
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5982 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5983 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5984
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5985 static inline int decode_seq_parameter_set(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5986 MpegEncContext * const s = &h->s;
1371
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
5987 int profile_idc, level_idc;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5988 int sps_id, i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5989 SPS *sps;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5990
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5991 profile_idc= get_bits(&s->gb, 8);
1371
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
5992 get_bits1(&s->gb); //constraint_set0_flag
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
5993 get_bits1(&s->gb); //constraint_set1_flag
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
5994 get_bits1(&s->gb); //constraint_set2_flag
2312
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
5995 get_bits1(&s->gb); //constraint_set3_flag
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
5996 get_bits(&s->gb, 4); // reserved
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5997 level_idc= get_bits(&s->gb, 8);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5998 sps_id= get_ue_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5999
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6000 sps= &h->sps_buffer[ sps_id ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6001 sps->profile_idc= profile_idc;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6002 sps->level_idc= level_idc;
2312
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
6003
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6004 sps->log2_max_frame_num= get_ue_golomb(&s->gb) + 4;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6005 sps->poc_type= get_ue_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6006
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6007 if(sps->poc_type == 0){ //FIXME #define
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6008 sps->log2_max_poc_lsb= get_ue_golomb(&s->gb) + 4;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6009 } else if(sps->poc_type == 1){//FIXME #define
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6010 sps->delta_pic_order_always_zero_flag= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6011 sps->offset_for_non_ref_pic= get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6012 sps->offset_for_top_to_bottom_field= get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6013 sps->poc_cycle_length= get_ue_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6014
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6015 for(i=0; i<sps->poc_cycle_length; i++)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6016 sps->offset_for_ref_frame[i]= get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6017 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6018 if(sps->poc_type > 2){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
6019 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
6020 return -1;
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 sps->ref_frame_count= get_ue_golomb(&s->gb);
2254
0dfe4e32b19c H.264 max reference pictures fix by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2227
diff changeset
6024 if(sps->ref_frame_count > MAX_PICTURE_COUNT-2){
0dfe4e32b19c H.264 max reference pictures fix by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2227
diff changeset
6025 av_log(h->s.avctx, AV_LOG_ERROR, "too many reference frames\n");
0dfe4e32b19c H.264 max reference pictures fix by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2227
diff changeset
6026 }
1371
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
6027 sps->gaps_in_frame_num_allowed_flag= get_bits1(&s->gb);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6028 sps->mb_width= get_ue_golomb(&s->gb) + 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6029 sps->mb_height= get_ue_golomb(&s->gb) + 1;
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2417
diff changeset
6030 if((unsigned)sps->mb_width >= INT_MAX/16 || (unsigned)sps->mb_height >= INT_MAX/16 ||
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2417
diff changeset
6031 avcodec_check_dimensions(NULL, 16*sps->mb_width, 16*sps->mb_height))
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2417
diff changeset
6032 return -1;
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2417
diff changeset
6033
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6034 sps->frame_mbs_only_flag= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6035 if(!sps->frame_mbs_only_flag)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6036 sps->mb_aff= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6037 else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6038 sps->mb_aff= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6039
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6040 sps->direct_8x8_inference_flag= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6041
1371
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
6042 sps->crop= get_bits1(&s->gb);
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
6043 if(sps->crop){
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
6044 sps->crop_left = get_ue_golomb(&s->gb);
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
6045 sps->crop_right = get_ue_golomb(&s->gb);
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
6046 sps->crop_top = get_ue_golomb(&s->gb);
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
6047 sps->crop_bottom= get_ue_golomb(&s->gb);
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
6048 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
6049 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
6050 }
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
6051 }else{
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
6052 sps->crop_left =
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
6053 sps->crop_right =
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
6054 sps->crop_top =
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
6055 sps->crop_bottom= 0;
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
6056 }
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
6057
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6058 sps->vui_parameters_present_flag= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6059 if( sps->vui_parameters_present_flag )
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6060 decode_vui_parameters(h, sps);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6061
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6062 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
6063 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
6064 sps_id, sps->profile_idc, sps->level_idc,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6065 sps->poc_type,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6066 sps->ref_frame_count,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6067 sps->mb_width, sps->mb_height,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6068 sps->frame_mbs_only_flag ? "FRM" : (sps->mb_aff ? "MB-AFF" : "PIC-AFF"),
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6069 sps->direct_8x8_inference_flag ? "8B8" : "",
1371
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
6070 sps->crop_left, sps->crop_right,
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
6071 sps->crop_top, sps->crop_bottom,
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6072 sps->vui_parameters_present_flag ? "VUI" : ""
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6073 );
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6074 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6075 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6076 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6077
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6078 static inline int decode_picture_parameter_set(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6079 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6080 int pps_id= get_ue_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6081 PPS *pps= &h->pps_buffer[pps_id];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6082
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6083 pps->sps_id= get_ue_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6084 pps->cabac= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6085 pps->pic_order_present= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6086 pps->slice_group_count= get_ue_golomb(&s->gb) + 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6087 if(pps->slice_group_count > 1 ){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6088 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
6089 av_log(h->s.avctx, AV_LOG_ERROR, "FMO not supported\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6090 switch(pps->mb_slice_group_map_type){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6091 case 0:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6092 #if 0
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6093 | for( i = 0; i <= num_slice_groups_minus1; i++ ) | | |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6094 | run_length[ i ] |1 |ue(v) |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6095 #endif
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6096 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6097 case 2:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6098 #if 0
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6099 | for( i = 0; i < num_slice_groups_minus1; i++ ) | | |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6100 |{ | | |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6101 | top_left_mb[ i ] |1 |ue(v) |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6102 | bottom_right_mb[ i ] |1 |ue(v) |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6103 | } | | |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6104 #endif
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6105 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6106 case 3:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6107 case 4:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6108 case 5:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6109 #if 0
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6110 | slice_group_change_direction_flag |1 |u(1) |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6111 | slice_group_change_rate_minus1 |1 |ue(v) |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6112 #endif
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6113 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6114 case 6:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6115 #if 0
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6116 | slice_group_id_cnt_minus1 |1 |ue(v) |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6117 | for( i = 0; i <= slice_group_id_cnt_minus1; i++ | | |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6118 |) | | |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6119 | slice_group_id[ i ] |1 |u(v) |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6120 #endif
1214
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1187
diff changeset
6121 break;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6122 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6123 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6124 pps->ref_count[0]= get_ue_golomb(&s->gb) + 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6125 pps->ref_count[1]= get_ue_golomb(&s->gb) + 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6126 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
6127 av_log(h->s.avctx, AV_LOG_ERROR, "reference overflow (pps)\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6128 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6129 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6130
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6131 pps->weighted_pred= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6132 pps->weighted_bipred_idc= get_bits(&s->gb, 2);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6133 pps->init_qp= get_se_golomb(&s->gb) + 26;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6134 pps->init_qs= get_se_golomb(&s->gb) + 26;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6135 pps->chroma_qp_index_offset= get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6136 pps->deblocking_filter_parameters_present= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6137 pps->constrained_intra_pred= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6138 pps->redundant_pic_cnt_present = get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6139
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6140 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
6141 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
6142 pps_id, pps->sps_id,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6143 pps->cabac ? "CABAC" : "CAVLC",
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6144 pps->slice_group_count,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6145 pps->ref_count[0], pps->ref_count[1],
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6146 pps->weighted_pred ? "weighted" : "",
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6147 pps->init_qp, pps->init_qs, pps->chroma_qp_index_offset,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6148 pps->deblocking_filter_parameters_present ? "LPAR" : "",
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6149 pps->constrained_intra_pred ? "CONSTR" : "",
1371
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
6150 pps->redundant_pic_cnt_present ? "REDU" : ""
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6151 );
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6152 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6153
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6154 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6155 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6156
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6157 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6158 * finds the end of the current frame in the bitstream.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6159 * @return the position of the first byte of the next frame, or -1
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6160 */
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
6161 static int find_frame_end(H264Context *h, const uint8_t *buf, int buf_size){
1187
f3c659bfdb8e minor cleanup / some warning fixes
michaelni
parents: 1184
diff changeset
6162 int i;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6163 uint32_t state;
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
6164 ParseContext *pc = &(h->s.parse_context);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6165 //printf("first %02X%02X%02X%02X\n", buf[0], buf[1],buf[2],buf[3]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6166 // mb_addr= pc->mb_addr - 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6167 state= pc->state;
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
6168 for(i=0; i<=buf_size; i++){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6169 if((state&0xFFFFFF1F) == 0x101 || (state&0xFFFFFF1F) == 0x102 || (state&0xFFFFFF1F) == 0x105){
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
6170 tprintf("find_frame_end new startcode = %08x, frame_start_found = %d, pos = %d\n", state, pc->frame_start_found, i);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6171 if(pc->frame_start_found){
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
6172 // If there isn't one more byte in the buffer
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
6173 // the test on first_mb_in_slice cannot be done yet
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
6174 // do it at next call.
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
6175 if (i >= buf_size) break;
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
6176 if (buf[i] & 0x80) {
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
6177 // first_mb_in_slice is 0, probably the first nal of a new
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
6178 // slice
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
6179 tprintf("find_frame_end frame_end_found, state = %08x, pos = %d\n", state, i);
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
6180 pc->state=-1;
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
6181 pc->frame_start_found= 0;
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
6182 return i-4;
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
6183 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6184 }
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
6185 pc->frame_start_found = 1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6186 }
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
6187 if (i<buf_size)
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
6188 state= (state<<8) | buf[i];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6189 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6190
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6191 pc->state= state;
1219
michaelni
parents: 1214
diff changeset
6192 return END_NOT_FOUND;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6193 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6194
1988
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
6195 static int h264_parse(AVCodecParserContext *s,
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
6196 AVCodecContext *avctx,
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
6197 uint8_t **poutbuf, int *poutbuf_size,
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
6198 const uint8_t *buf, int buf_size)
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
6199 {
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
6200 H264Context *h = s->priv_data;
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
6201 ParseContext *pc = &h->s.parse_context;
1988
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
6202 int next;
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
6203
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
6204 next= find_frame_end(h, buf, buf_size);
1988
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
6205
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
6206 if (ff_combine_frame(pc, next, (uint8_t **)&buf, &buf_size) < 0) {
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
6207 *poutbuf = NULL;
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
6208 *poutbuf_size = 0;
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
6209 return buf_size;
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
6210 }
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
6211
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
6212 *poutbuf = (uint8_t *)buf;
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
6213 *poutbuf_size = buf_size;
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
6214 return next;
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
6215 }
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
6216
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6217 static int decode_nal_units(H264Context *h, uint8_t *buf, int buf_size){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6218 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6219 AVCodecContext * const avctx= s->avctx;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6220 int buf_index=0;
1322
f78341ab5fba some warning fixes
al3x
parents: 1319
diff changeset
6221 #if 0
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6222 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6223 for(i=0; i<32; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6224 printf("%X ", buf[i]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6225 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6226 #endif
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
6227 h->slice_num = 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6228 for(;;){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6229 int consumed;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6230 int dst_length;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6231 int bit_length;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6232 uint8_t *ptr;
2227
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
6233 int i, nalsize = 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6234
2227
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
6235 if(h->is_avc) {
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
6236 if(buf_index >= buf_size) break;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
6237 nalsize = 0;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
6238 for(i = 0; i < h->nal_length_size; i++)
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
6239 nalsize = (nalsize << 8) | buf[buf_index++];
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
6240 } else {
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6241 // start code prefix search
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6242 for(; buf_index + 3 < buf_size; buf_index++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6243 // this should allways succeed in the first iteration
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6244 if(buf[buf_index] == 0 && buf[buf_index+1] == 0 && buf[buf_index+2] == 1)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6245 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6246 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6247
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6248 if(buf_index+3 >= buf_size) break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6249
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6250 buf_index+=3;
2227
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
6251 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6252
2401
46898a9fd6dc Fix avc1 if there is nore than one nal per mov frame
rtognimp
parents: 2396
diff changeset
6253 ptr= decode_nal(h, buf + buf_index, &dst_length, &consumed, h->is_avc ? nalsize : buf_size - buf_index);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6254 if(ptr[dst_length - 1] == 0) dst_length--;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6255 bit_length= 8*dst_length - decode_rbsp_trailing(ptr + dst_length - 1);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6256
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6257 if(s->avctx->debug&FF_DEBUG_STARTCODE){
2402
f9d4e1eddbc5 - correct several errors on the deblocking accross slice boundaries.
michael
parents: 2401
diff changeset
6258 av_log(h->s.avctx, AV_LOG_DEBUG, "NAL %d at %d/%d length %d\n", h->nal_unit_type, buf_index, buf_size, dst_length);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6259 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6260
2227
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
6261 if (h->is_avc && (nalsize != consumed))
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
6262 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
6263
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6264 buf_index += consumed;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6265
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
6266 if( s->hurry_up == 1 && h->nal_ref_idc == 0 )
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6267 continue;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6268
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6269 switch(h->nal_unit_type){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6270 case NAL_IDR_SLICE:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6271 idr(h); //FIXME ensure we dont loose some frames if there is reordering
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6272 case NAL_SLICE:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6273 init_get_bits(&s->gb, ptr, bit_length);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6274 h->intra_gb_ptr=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6275 h->inter_gb_ptr= &s->gb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6276 s->data_partitioning = 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6277
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6278 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
6279 if(h->redundant_pic_count==0 && s->hurry_up < 5 )
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6280 decode_slice(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6281 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6282 case NAL_DPA:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6283 init_get_bits(&s->gb, ptr, bit_length);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6284 h->intra_gb_ptr=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6285 h->inter_gb_ptr= NULL;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6286 s->data_partitioning = 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6287
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6288 if(decode_slice_header(h) < 0) return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6289 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6290 case NAL_DPB:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6291 init_get_bits(&h->intra_gb, ptr, bit_length);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6292 h->intra_gb_ptr= &h->intra_gb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6293 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6294 case NAL_DPC:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6295 init_get_bits(&h->inter_gb, ptr, bit_length);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6296 h->inter_gb_ptr= &h->inter_gb;
1174
2de2a847af67 some checks to avoid segfault
michaelni
parents: 1170
diff changeset
6297
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
6298 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
6299 decode_slice(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6300 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6301 case NAL_SEI:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6302 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6303 case NAL_SPS:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6304 init_get_bits(&s->gb, ptr, bit_length);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6305 decode_seq_parameter_set(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6306
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6307 if(s->flags& CODEC_FLAG_LOW_DELAY)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6308 s->low_delay=1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6309
2538
34b0996cc10d 10l (fix reordering when B-frames are not present)
lorenm
parents: 2537
diff changeset
6310 if(avctx->has_b_frames < 2)
34b0996cc10d 10l (fix reordering when B-frames are not present)
lorenm
parents: 2537
diff changeset
6311 avctx->has_b_frames= !s->low_delay;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6312 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6313 case NAL_PPS:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6314 init_get_bits(&s->gb, ptr, bit_length);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6315
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6316 decode_picture_parameter_set(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6317
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6318 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6319 case NAL_PICTURE_DELIMITER:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6320 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6321 case NAL_FILTER_DATA:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6322 break;
2099
acc845e25a68 some debug
alex
parents: 2028
diff changeset
6323 default:
acc845e25a68 some debug
alex
parents: 2028
diff changeset
6324 av_log(avctx, AV_LOG_ERROR, "Unknown NAL code: %d\n", h->nal_unit_type);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6325 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6326
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6327 //FIXME move after where irt is set
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6328 s->current_picture.pict_type= s->pict_type;
2537
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
6329 s->current_picture.key_frame= s->pict_type == I_TYPE && h->nal_unit_type == NAL_IDR_SLICE;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6330 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6331
1174
2de2a847af67 some checks to avoid segfault
michaelni
parents: 1170
diff changeset
6332 if(!s->current_picture_ptr) return buf_index; //no frame
2de2a847af67 some checks to avoid segfault
michaelni
parents: 1170
diff changeset
6333
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6334 h->prev_frame_num_offset= h->frame_num_offset;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6335 h->prev_frame_num= h->frame_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6336 if(s->current_picture_ptr->reference){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6337 h->prev_poc_msb= h->poc_msb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6338 h->prev_poc_lsb= h->poc_lsb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6339 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6340 if(s->current_picture_ptr->reference)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6341 execute_ref_pic_marking(h, h->mmco, h->mmco_index);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6342
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6343 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
6344
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6345 MPV_frame_end(s);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6346
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6347 return buf_index;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6348 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6349
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6350 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6351 * retunrs the number of bytes consumed for building the current frame
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6352 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6353 static int get_consumed_bytes(MpegEncContext *s, int pos, int buf_size){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6354 if(s->flags&CODEC_FLAG_TRUNCATED){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6355 pos -= s->parse_context.last_index;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6356 if(pos<0) pos=0; // FIXME remove (uneeded?)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6357
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6358 return pos;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6359 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6360 if(pos==0) pos=1; //avoid infinite loops (i doubt thats needed but ...)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6361 if(pos+10>buf_size) pos=buf_size; // oops ;)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6362
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6363 return pos;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6364 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6365 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6366
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6367 static int decode_frame(AVCodecContext *avctx,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6368 void *data, int *data_size,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6369 uint8_t *buf, int buf_size)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6370 {
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6371 H264Context *h = avctx->priv_data;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6372 MpegEncContext *s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6373 AVFrame *pict = data;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6374 int buf_index;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6375
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6376 s->flags= avctx->flags;
1754
bdf3927bf8c5 closed gop support & flags2 as all bits in flags are used
michael
parents: 1706
diff changeset
6377 s->flags2= avctx->flags2;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6378
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6379 /* no supplementary picture */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6380 if (buf_size == 0) {
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6381 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6382 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6383
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6384 if(s->flags&CODEC_FLAG_TRUNCATED){
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
6385 int next= find_frame_end(h, buf, buf_size);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6386
1988
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
6387 if( ff_combine_frame(&s->parse_context, next, &buf, &buf_size) < 0 )
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6388 return buf_size;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6389 //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
6390 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6391
2227
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
6392 if(h->is_avc && !h->got_avcC) {
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
6393 int i, cnt, nalsize;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
6394 unsigned char *p = avctx->extradata;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
6395 if(avctx->extradata_size < 7) {
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
6396 av_log(avctx, AV_LOG_ERROR, "avcC too short\n");
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
6397 return -1;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
6398 }
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
6399 if(*p != 1) {
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
6400 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
6401 return -1;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
6402 }
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
6403 /* 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
6404 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
6405 h->nal_length_size = 2;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
6406 // Decode sps from avcC
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
6407 cnt = *(p+5) & 0x1f; // Number of sps
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
6408 p += 6;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
6409 for (i = 0; i < cnt; i++) {
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
6410 nalsize = BE_16(p) + 2;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
6411 if(decode_nal_units(h, p, nalsize) != nalsize) {
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
6412 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
6413 return -1;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
6414 }
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
6415 p += nalsize;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
6416 }
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
6417 // Decode pps from avcC
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
6418 cnt = *(p++); // Number of pps
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
6419 for (i = 0; i < cnt; i++) {
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
6420 nalsize = BE_16(p) + 2;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
6421 if(decode_nal_units(h, p, nalsize) != nalsize) {
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
6422 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
6423 return -1;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
6424 }
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
6425 p += nalsize;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
6426 }
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
6427 // 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
6428 h->nal_length_size = ((*(((char*)(avctx->extradata))+4))&0x03)+1;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
6429 // Do not reparse avcC
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
6430 h->got_avcC = 1;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
6431 }
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
6432
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
6433 if(!h->is_avc && s->avctx->extradata_size && s->picture_number==0){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6434 if(0 < decode_nal_units(h, s->avctx->extradata, s->avctx->extradata_size) )
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6435 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6436 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6437
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6438 buf_index=decode_nal_units(h, buf, buf_size);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6439 if(buf_index < 0)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6440 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6441
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6442 //FIXME do something with unavailable reference frames
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6443
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6444 // if(ret==FRAME_SKIPED) return get_consumed_bytes(s, buf_index, buf_size);
1174
2de2a847af67 some checks to avoid segfault
michaelni
parents: 1170
diff changeset
6445 if(!s->current_picture_ptr){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
6446 av_log(h->s.avctx, AV_LOG_DEBUG, "error, NO frame\n");
1174
2de2a847af67 some checks to avoid segfault
michaelni
parents: 1170
diff changeset
6447 return -1;
2de2a847af67 some checks to avoid segfault
michaelni
parents: 1170
diff changeset
6448 }
2de2a847af67 some checks to avoid segfault
michaelni
parents: 1170
diff changeset
6449
2409
26778a857b5b Sort B-frames into display order.
lorenm
parents: 2404
diff changeset
6450 {
2441
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
6451 //#define DECODE_ORDER
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
6452 Picture *out = s->current_picture_ptr;
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
6453 #ifndef DECODE_ORDER
2537
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
6454 /* Sort B-frames into display order */
2409
26778a857b5b Sort B-frames into display order.
lorenm
parents: 2404
diff changeset
6455 Picture *cur = s->current_picture_ptr;
2537
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
6456 int out_idx = 0;
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
6457 int pics = 0;
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
6458 int i;
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
6459 out = NULL;
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
6460
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
6461 while(h->delayed_pic[pics]) pics++;
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
6462 h->delayed_pic[pics++] = cur;
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
6463 out = h->delayed_pic[0];
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
6464 for(i=0; h->delayed_pic[i] && !h->delayed_pic[i]->key_frame; i++)
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
6465 if(!out || h->delayed_pic[i]->poc < out->poc){
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
6466 out = h->delayed_pic[i];
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
6467 out_idx = i;
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
6468 }
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
6469 if(cur->reference == 0)
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
6470 cur->reference = 1;
2538
34b0996cc10d 10l (fix reordering when B-frames are not present)
lorenm
parents: 2537
diff changeset
6471 for(i=0; h->delayed_pic[i]; i++)
34b0996cc10d 10l (fix reordering when B-frames are not present)
lorenm
parents: 2537
diff changeset
6472 if(h->delayed_pic[i]->key_frame)
34b0996cc10d 10l (fix reordering when B-frames are not present)
lorenm
parents: 2537
diff changeset
6473 h->delayed_output_poc = -1;
2537
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
6474 if(pics > FFMAX(1, s->avctx->has_b_frames)){
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
6475 if(out->reference == 1)
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
6476 out->reference = 0;
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
6477 for(i=out_idx; h->delayed_pic[i]; i++)
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
6478 h->delayed_pic[i] = h->delayed_pic[i+1];
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
6479 }
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
6480
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
6481 if((h->delayed_output_poc >=0 && h->delayed_output_poc > cur->poc)
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
6482 || (s->low_delay && (cur->pict_type == B_TYPE
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
6483 || (!h->sps.gaps_in_frame_num_allowed_flag
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
6484 && cur->poc - out->poc > 2)))){
2409
26778a857b5b Sort B-frames into display order.
lorenm
parents: 2404
diff changeset
6485 s->low_delay = 0;
2537
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
6486 s->avctx->has_b_frames++;
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
6487 }
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
6488
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
6489 h->delayed_output_poc = out->poc;
2441
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
6490 #endif
2409
26778a857b5b Sort B-frames into display order.
lorenm
parents: 2404
diff changeset
6491
26778a857b5b Sort B-frames into display order.
lorenm
parents: 2404
diff changeset
6492 *pict= *(AVFrame*)out;
26778a857b5b Sort B-frames into display order.
lorenm
parents: 2404
diff changeset
6493 }
26778a857b5b Sort B-frames into display order.
lorenm
parents: 2404
diff changeset
6494
1706
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1698
diff changeset
6495 ff_print_debug_info(s, pict);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6496 assert(pict->data[0]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6497 //printf("out %d\n", (int)pict->data[0]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6498 #if 0 //?
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6499
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6500 /* Return the Picture timestamp as the frame number */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6501 /* we substract 1 because it is added on utils.c */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6502 avctx->frame_number = s->picture_number - 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6503 #endif
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6504 #if 0
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6505 /* dont output the last pic after seeking */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6506 if(s->last_picture_ptr || s->low_delay)
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
6507 //Note this isnt a issue as a IDR pic should flush the buffers
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6508 #endif
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6509 *data_size = sizeof(AVFrame);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6510 return get_consumed_bytes(s, buf_index, buf_size);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6511 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6512 #if 0
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6513 static inline void fill_mb_avail(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6514 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
6515 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6516
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6517 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
6518 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
6519 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
6520 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
6521 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6522 h->mb_avail[0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6523 h->mb_avail[1]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6524 h->mb_avail[2]= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6525 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6526 h->mb_avail[3]= s->mb_x && h->slice_table[mb_xy - 1] == h->slice_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6527 h->mb_avail[4]= 1; //FIXME move out
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6528 h->mb_avail[5]= 0; //FIXME move out
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6529 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6530 #endif
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6531
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6532 #if 0 //selftest
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6533 #define COUNT 8000
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6534 #define SIZE (COUNT*40)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6535 int main(){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6536 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6537 uint8_t temp[SIZE];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6538 PutBitContext pb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6539 GetBitContext gb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6540 // int int_temp[10000];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6541 DSPContext dsp;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6542 AVCodecContext avctx;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6543
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6544 dsputil_init(&dsp, &avctx);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6545
1522
79dddc5cd990 removed the obsolete and unused parameters of init_put_bits
alex
parents: 1453
diff changeset
6546 init_put_bits(&pb, temp, SIZE);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6547 printf("testing unsigned exp golomb\n");
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6548 for(i=0; i<COUNT; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6549 START_TIMER
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6550 set_ue_golomb(&pb, i);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6551 STOP_TIMER("set_ue_golomb");
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6552 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6553 flush_put_bits(&pb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6554
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6555 init_get_bits(&gb, temp, 8*SIZE);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6556 for(i=0; i<COUNT; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6557 int j, s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6558
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6559 s= show_bits(&gb, 24);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6560
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6561 START_TIMER
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6562 j= get_ue_golomb(&gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6563 if(j != i){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6564 printf("missmatch! at %d (%d should be %d) bits:%6X\n", i, j, i, s);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6565 // return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6566 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6567 STOP_TIMER("get_ue_golomb");
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6568 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6569
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6570
1524
alex
parents: 1522
diff changeset
6571 init_put_bits(&pb, temp, SIZE);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6572 printf("testing signed exp golomb\n");
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6573 for(i=0; i<COUNT; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6574 START_TIMER
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6575 set_se_golomb(&pb, i - COUNT/2);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6576 STOP_TIMER("set_se_golomb");
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6577 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6578 flush_put_bits(&pb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6579
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6580 init_get_bits(&gb, temp, 8*SIZE);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6581 for(i=0; i<COUNT; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6582 int j, s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6583
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6584 s= show_bits(&gb, 24);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6585
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6586 START_TIMER
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6587 j= get_se_golomb(&gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6588 if(j != i - COUNT/2){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6589 printf("missmatch! at %d (%d should be %d) bits:%6X\n", i, j, i, s);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6590 // return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6591 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6592 STOP_TIMER("get_se_golomb");
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6593 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6594
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6595 printf("testing 4x4 (I)DCT\n");
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6596
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6597 DCTELEM block[16];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6598 uint8_t src[16], ref[16];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6599 uint64_t error= 0, max_error=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6600
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6601 for(i=0; i<COUNT; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6602 int j;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6603 // printf("%d %d %d\n", r1, r2, (r2-r1)*16);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6604 for(j=0; j<16; j++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6605 ref[j]= random()%255;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6606 src[j]= random()%255;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6607 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6608
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6609 h264_diff_dct_c(block, src, ref, 4);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6610
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6611 //normalize
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6612 for(j=0; j<16; j++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6613 // printf("%d ", block[j]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6614 block[j]= block[j]*4;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6615 if(j&1) block[j]= (block[j]*4 + 2)/5;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6616 if(j&4) block[j]= (block[j]*4 + 2)/5;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6617 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6618 // printf("\n");
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6619
2272
cd43603c46f9 move h264 idct to its own file and call via function pointer in DspContext
michael
parents: 2255
diff changeset
6620 s->dsp.h264_idct_add(ref, block, 4);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6621 /* for(j=0; j<16; j++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6622 printf("%d ", ref[j]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6623 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6624 printf("\n");*/
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6625
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6626 for(j=0; j<16; j++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6627 int diff= ABS(src[j] - ref[j]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6628
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6629 error+= diff*diff;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6630 max_error= FFMAX(max_error, diff);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6631 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6632 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6633 printf("error=%f max_error=%d\n", ((float)error)/COUNT/16, (int)max_error );
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6634 #if 0
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6635 printf("testing quantizer\n");
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6636 for(qp=0; qp<52; qp++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6637 for(i=0; i<16; i++)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6638 src1_block[i]= src2_block[i]= random()%255;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6639
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6640 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6641 #endif
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6642 printf("Testing NAL layer\n");
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6643
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6644 uint8_t bitstream[COUNT];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6645 uint8_t nal[COUNT*2];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6646 H264Context h;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6647 memset(&h, 0, sizeof(H264Context));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6648
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6649 for(i=0; i<COUNT; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6650 int zeros= i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6651 int nal_length;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6652 int consumed;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6653 int out_length;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6654 uint8_t *out;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6655 int j;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6656
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6657 for(j=0; j<COUNT; j++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6658 bitstream[j]= (random() % 255) + 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6659 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6660
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6661 for(j=0; j<zeros; j++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6662 int pos= random() % COUNT;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6663 while(bitstream[pos] == 0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6664 pos++;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6665 pos %= COUNT;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6666 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6667 bitstream[pos]=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6668 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6669
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6670 START_TIMER
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6671
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6672 nal_length= encode_nal(&h, nal, bitstream, COUNT, COUNT*2);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6673 if(nal_length<0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6674 printf("encoding failed\n");
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6675 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6676 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6677
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6678 out= decode_nal(&h, nal, &out_length, &consumed, nal_length);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6679
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6680 STOP_TIMER("NAL")
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6681
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6682 if(out_length != COUNT){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6683 printf("incorrect length %d %d\n", out_length, COUNT);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6684 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6685 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6686
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6687 if(consumed != nal_length){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6688 printf("incorrect consumed length %d %d\n", nal_length, consumed);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6689 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6690 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6691
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6692 if(memcmp(bitstream, out, COUNT)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6693 printf("missmatch\n");
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6694 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6695 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6696 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6697
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6698 printf("Testing RBSP\n");
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6699
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6700
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6701 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6702 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6703 #endif
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6704
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6705
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6706 static int decode_end(AVCodecContext *avctx)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6707 {
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6708 H264Context *h = avctx->priv_data;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6709 MpegEncContext *s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6710
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6711 free_tables(h); //FIXME cleanup init stuff perhaps
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6712 MPV_common_end(s);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6713
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6714 // memset(h, 0, sizeof(H264Context));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6715
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6716 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6717 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6718
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6719
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6720 AVCodec h264_decoder = {
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6721 "h264",
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6722 CODEC_TYPE_VIDEO,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6723 CODEC_ID_H264,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6724 sizeof(H264Context),
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6725 decode_init,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6726 NULL,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6727 decode_end,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6728 decode_frame,
2453
f67b63ed036d avoid buf_size == 0 checks in every decoder
michael
parents: 2449
diff changeset
6729 /*CODEC_CAP_DRAW_HORIZ_BAND |*/ CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED | CODEC_CAP_DELAY,
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6730 };
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6731
1988
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
6732 AVCodecParser h264_parser = {
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
6733 { CODEC_ID_H264 },
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
6734 sizeof(H264Context),
1988
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
6735 NULL,
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
6736 h264_parse,
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
6737 ff_parse_close,
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
6738 };
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
6739
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
6740 #include "svq3.c"