annotate h264.c @ 2894:26f8974c3d66 libavcodec

fix some pointer to intger without cast warnings (patch by Michel Bardiaux)
author aurel
date Wed, 21 Sep 2005 23:18:52 +0000
parents 4c6eb826e9cb
children a5360f2a673e
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;
2763
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
64 int transform_bypass; ///< qpprime_y_zero_transform_bypass_flag
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
65 int log2_max_frame_num; ///< log2_max_frame_num_minus4 + 4
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
66 int poc_type; ///< pic_order_cnt_type
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
67 int log2_max_poc_lsb; ///< log2_max_pic_order_cnt_lsb_minus4
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
68 int delta_pic_order_always_zero_flag;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
69 int offset_for_non_ref_pic;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
70 int offset_for_top_to_bottom_field;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
71 int poc_cycle_length; ///< num_ref_frames_in_pic_order_cnt_cycle
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
72 int ref_frame_count; ///< num_ref_frames
1371
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
73 int gaps_in_frame_num_allowed_flag;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
74 int mb_width; ///< frame_width_in_mbs_minus1 + 1
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
75 int mb_height; ///< frame_height_in_mbs_minus1 + 1
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
76 int frame_mbs_only_flag;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
77 int mb_aff; ///<mb_adaptive_frame_field_flag
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
78 int direct_8x8_inference_flag;
1371
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
79 int crop; ///< frame_cropping_flag
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
80 int crop_left; ///< frame_cropping_rect_left_offset
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
81 int crop_right; ///< frame_cropping_rect_right_offset
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
82 int crop_top; ///< frame_cropping_rect_top_offset
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
83 int crop_bottom; ///< frame_cropping_rect_bottom_offset
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
84 int vui_parameters_present_flag;
1548
dd544554ed42 AVRational
michael
parents: 1524
diff changeset
85 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
86 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
87 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
88 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
89 int fixed_frame_rate_flag;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
90 short offset_for_ref_frame[256]; //FIXME dyn aloc?
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
91 int bitstream_restriction_flag;
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
92 int num_reorder_frames;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
93 }SPS;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
94
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
95 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
96 * Picture parameter set
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
97 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
98 typedef struct PPS{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
99 int sps_id;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
100 int cabac; ///< entropy_coding_mode_flag
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
101 int pic_order_present; ///< pic_order_present_flag
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
102 int slice_group_count; ///< num_slice_groups_minus1 + 1
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
103 int mb_slice_group_map_type;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
104 int ref_count[2]; ///< num_ref_idx_l0/1_active_minus1 + 1
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
105 int weighted_pred; ///< weighted_pred_flag
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
106 int weighted_bipred_idc;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
107 int init_qp; ///< pic_init_qp_minus26 + 26
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
108 int init_qs; ///< pic_init_qs_minus26 + 26
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
109 int chroma_qp_index_offset;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
110 int deblocking_filter_parameters_present; ///< deblocking_filter_parameters_present_flag
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
111 int constrained_intra_pred; ///< constrained_intra_pred_flag
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
112 int redundant_pic_cnt_present; ///< redundant_pic_cnt_present_flag
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
113 int transform_8x8_mode; ///< transform_8x8_mode_flag
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
114 }PPS;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
115
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
116 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
117 * Memory management control operation opcode.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
118 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
119 typedef enum MMCOOpcode{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
120 MMCO_END=0,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
121 MMCO_SHORT2UNUSED,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
122 MMCO_LONG2UNUSED,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
123 MMCO_SHORT2LONG,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
124 MMCO_SET_MAX_LONG,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
125 MMCO_RESET,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
126 MMCO_LONG,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
127 } MMCOOpcode;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
128
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
129 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
130 * Memory management control operation.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
131 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
132 typedef struct MMCO{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
133 MMCOOpcode opcode;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
134 int short_frame_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
135 int long_index;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
136 } MMCO;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
137
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
138 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
139 * H264Context
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
140 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
141 typedef struct H264Context{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
142 MpegEncContext s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
143 int nal_ref_idc;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
144 int nal_unit_type;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
145 #define NAL_SLICE 1
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
146 #define NAL_DPA 2
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
147 #define NAL_DPB 3
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
148 #define NAL_DPC 4
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
149 #define NAL_IDR_SLICE 5
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
150 #define NAL_SEI 6
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
151 #define NAL_SPS 7
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
152 #define NAL_PPS 8
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
153 #define NAL_PICTURE_DELIMITER 9
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
154 #define NAL_FILTER_DATA 10
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
155 uint8_t *rbsp_buffer;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
156 int rbsp_buffer_size;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
157
2227
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
158 /**
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
159 * Used to parse AVC variant of h264
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
160 */
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
161 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
162 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
163 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
164
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
165 int chroma_qp; //QPc
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
166
2628
511e3afc43e1 Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents: 2623
diff changeset
167 int prev_mb_skipped; //FIXME remove (IMHO not used)
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
169 //prediction stuff
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
170 int chroma_pred_mode;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
171 int intra16x16_pred_mode;
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
172
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
173 int top_mb_xy;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
174 int left_mb_xy[2];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
175
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
176 int8_t intra4x4_pred_mode_cache[5*8];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
177 int8_t (*intra4x4_pred_mode)[8];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
178 void (*pred4x4 [9+3])(uint8_t *src, uint8_t *topright, int stride);//FIXME move to dsp?
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
179 void (*pred8x8l [9+3])(uint8_t *src, int topleft, int topright, int stride);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
180 void (*pred8x8 [4+3])(uint8_t *src, int stride);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
181 void (*pred16x16[4+3])(uint8_t *src, int stride);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
182 unsigned int topleft_samples_available;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
183 unsigned int top_samples_available;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
184 unsigned int topright_samples_available;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
185 unsigned int left_samples_available;
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
186 uint8_t (*top_borders[2])[16+2*8];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
187 uint8_t left_border[2*(17+2*9)];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
188
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
189 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
190 * non zero coeff count cache.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
191 * is 64 if not available.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
192 */
2471
805431763e84 fixing missaligned memory accesses in fill_rectangle()
michael
parents: 2454
diff changeset
193 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
194 uint8_t (*non_zero_count)[16];
1168
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 * Motion vector cache.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
198 */
2471
805431763e84 fixing missaligned memory accesses in fill_rectangle()
michael
parents: 2454
diff changeset
199 int16_t mv_cache[2][5*8][2] __align8;
805431763e84 fixing missaligned memory accesses in fill_rectangle()
michael
parents: 2454
diff changeset
200 int8_t ref_cache[2][5*8] __align8;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
201 #define LIST_NOT_USED -1 //FIXME rename?
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
202 #define PART_NOT_AVAILABLE -2
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
203
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
204 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
205 * is 1 if the specific list MV&references are set to 0,0,-2.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
206 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
207 int mv_cache_clean[2];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
208
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
209 /**
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
210 * number of neighbors (top and/or left) that used 8x8 dct
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
211 */
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
212 int neighbor_transform_size;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
213
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
214 /**
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
215 * block_offset[ 0..23] for frame macroblocks
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
216 * block_offset[24..47] for field macroblocks
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
217 */
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
218 int block_offset[2*(16+8)];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
219
2641
c337f851d0f9 fix storage of motion vectors for frames with more than 4096 macroblocks.
lorenm
parents: 2640
diff changeset
220 uint32_t *mb2b_xy; //FIXME are these 4 a good idea?
c337f851d0f9 fix storage of motion vectors for frames with more than 4096 macroblocks.
lorenm
parents: 2640
diff changeset
221 uint32_t *mb2b8_xy;
2395
81516be6d0e4 vismv for h264 displayed incorrect motion vectors.
lorenm
parents: 2392
diff changeset
222 int b_stride; //FIXME use s->b4_stride
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
223 int b8_stride;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
224
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
225 int halfpel_flag;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
226 int thirdpel_flag;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
227
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
228 int unknown_svq3_flag;
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
229 int next_slice_index;
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
230
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
231 SPS sps_buffer[MAX_SPS_COUNT];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
232 SPS sps; ///< current sps
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
233
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
234 PPS pps_buffer[MAX_PPS_COUNT];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
235 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
236 * current pps
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
237 */
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
238 PPS pps; //FIXME move to Picture perhaps? (->no) do we need that?
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
239
2763
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
240 uint16_t (*dequant4_coeff)[16]; // FIXME quant matrices should be per SPS or PPS
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
241 uint16_t (*dequant8_coeff)[64];
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
242
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
243 int slice_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
244 uint8_t *slice_table_base;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
245 uint8_t *slice_table; ///< slice_table_base + mb_stride + 1
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
246 int slice_type;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
247 int slice_type_fixed;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
248
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
249 //interlacing specific flags
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
250 int mb_aff_frame;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
251 int mb_field_decoding_flag;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
252
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
253 int sub_mb_type[4];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
254
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
255 //POC stuff
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
256 int poc_lsb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
257 int poc_msb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
258 int delta_poc_bottom;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
259 int delta_poc[2];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
260 int frame_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
261 int prev_poc_msb; ///< poc_msb of the last reference pic for POC type 0
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
262 int prev_poc_lsb; ///< poc_lsb of the last reference pic for POC type 0
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
263 int frame_num_offset; ///< for POC type 2
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
264 int prev_frame_num_offset; ///< for POC type 2
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
265 int prev_frame_num; ///< frame_num of the last pic for POC type 1/2
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
266
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
267 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
268 * frame_num for frames or 2*frame_num for field pics.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
269 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
270 int curr_pic_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
271
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
272 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
273 * max_frame_num or 2*max_frame_num for field pics.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
274 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
275 int max_pic_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
276
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
277 //Weighted pred stuff
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
278 int use_weight;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
279 int use_weight_chroma;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
280 int luma_log2_weight_denom;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
281 int chroma_log2_weight_denom;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
282 int luma_weight[2][16];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
283 int luma_offset[2][16];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
284 int chroma_weight[2][16][2];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
285 int chroma_offset[2][16][2];
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
286 int implicit_weight[16][16];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
287
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
288 //deblock
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
289 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
290 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
291 int slice_beta_offset;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
292
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
293 int redundant_pic_count;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
294
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
295 int direct_spatial_mv_pred;
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
296 int dist_scale_factor[16];
2537
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
297 int map_col_to_list0[2][16];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
298
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
299 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
300 * num_ref_idx_l0/1_active_minus1 + 1
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
301 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
302 int ref_count[2];// FIXME split for AFF
2582
3c27a074de7a allow 16 refs with B-frames
lorenm
parents: 2581
diff changeset
303 Picture *short_ref[32];
3c27a074de7a allow 16 refs with B-frames
lorenm
parents: 2581
diff changeset
304 Picture *long_ref[32];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
305 Picture default_ref_list[2][32];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
306 Picture ref_list[2][32]; //FIXME size?
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
307 Picture field_ref_list[2][32]; //FIXME size?
2409
26778a857b5b Sort B-frames into display order.
lorenm
parents: 2404
diff changeset
308 Picture *delayed_pic[16]; //FIXME size?
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
309 Picture *delayed_output_pic;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
310
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
311 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
312 * memory management control operations buffer.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
313 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
314 MMCO mmco[MAX_MMCO_COUNT];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
315 int mmco_index;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
316
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
317 int long_ref_count; ///< number of actual long term references
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
318 int short_ref_count; ///< number of actual short term references
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
319
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
320 //data partitioning
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
321 GetBitContext intra_gb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
322 GetBitContext inter_gb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
323 GetBitContext *intra_gb_ptr;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
324 GetBitContext *inter_gb_ptr;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
325
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
326 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
327
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
328 /**
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
329 * Cabac
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
330 */
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
331 CABACContext cabac;
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
332 uint8_t cabac_state[460];
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
333 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
334
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
335 /* 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
336 uint16_t *cbp_table;
2314
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
337 int top_cbp;
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
338 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
339 /* 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
340 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
341 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
342 int16_t (*mvd_table[2])[2];
2471
805431763e84 fixing missaligned memory accesses in fill_rectangle()
michael
parents: 2454
diff changeset
343 int16_t mvd_cache[2][5*8][2] __align8;
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
344 uint8_t *direct_table;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
345 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
346
2748
135aa7d0bd17 avoid one transpose (730->680 dezicycles on duron)
michael
parents: 2717
diff changeset
347 uint8_t zigzag_scan[16];
135aa7d0bd17 avoid one transpose (730->680 dezicycles on duron)
michael
parents: 2717
diff changeset
348 uint8_t field_scan[16];
2763
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
349 const uint8_t *zigzag_scan_q0;
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
350 const uint8_t *field_scan_q0;
2815
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
351
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
352 int x264_build;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
353 }H264Context;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
354
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
355 static VLC coeff_token_vlc[4];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
356 static VLC chroma_dc_coeff_token_vlc;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
357
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
358 static VLC total_zeros_vlc[15];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
359 static VLC chroma_dc_total_zeros_vlc[3];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
360
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
361 static VLC run_vlc[6];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
362 static VLC run7_vlc;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
363
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
364 static void svq3_luma_dc_dequant_idct_c(DCTELEM *block, int qp);
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
365 static void svq3_add_idct_c(uint8_t *dst, DCTELEM *block, int stride, int qp, int dc);
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
366 static void filter_mb( H264Context *h, int mb_x, int mb_y, uint8_t *img_y, uint8_t *img_cb, uint8_t *img_cr, unsigned int linesize, unsigned int uvlinesize);
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
367
1269
2498a7045b37 bigendian fix
michaelni
parents: 1266
diff changeset
368 static inline uint32_t pack16to32(int a, int b){
2498a7045b37 bigendian fix
michaelni
parents: 1266
diff changeset
369 #ifdef WORDS_BIGENDIAN
2498a7045b37 bigendian fix
michaelni
parents: 1266
diff changeset
370 return (b&0xFFFF) + (a<<16);
2498a7045b37 bigendian fix
michaelni
parents: 1266
diff changeset
371 #else
2498a7045b37 bigendian fix
michaelni
parents: 1266
diff changeset
372 return (a&0xFFFF) + (b<<16);
2498a7045b37 bigendian fix
michaelni
parents: 1266
diff changeset
373 #endif
2498a7045b37 bigendian fix
michaelni
parents: 1266
diff changeset
374 }
2498a7045b37 bigendian fix
michaelni
parents: 1266
diff changeset
375
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
376 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
377 * fill a rectangle.
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
378 * @param h height of the rectangle, should be a constant
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
379 * @param w width of the rectangle, should be a constant
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
380 * @param size the size of val (1 or 4), should be a constant
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
381 */
1187
f3c659bfdb8e minor cleanup / some warning fixes
michaelni
parents: 1184
diff changeset
382 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
383 uint8_t *p= (uint8_t*)vp;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
384 assert(size==1 || size==4);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
385
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
386 w *= size;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
387 stride *= size;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
388
2471
805431763e84 fixing missaligned memory accesses in fill_rectangle()
michael
parents: 2454
diff changeset
389 assert((((int)vp)&(FFMIN(w, STRIDE_ALIGN)-1)) == 0);
2669
a4e3a37ed57b some asserts()
michael
parents: 2650
diff changeset
390 assert((stride&(w-1))==0);
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
391 //FIXME check what gcc generates for 64 bit on x86 and possibly write a 32 bit ver of it
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
392 if(w==2 && h==2){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
393 *(uint16_t*)(p + 0)=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
394 *(uint16_t*)(p + stride)= size==4 ? val : val*0x0101;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
395 }else if(w==2 && h==4){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
396 *(uint16_t*)(p + 0*stride)=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
397 *(uint16_t*)(p + 1*stride)=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
398 *(uint16_t*)(p + 2*stride)=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
399 *(uint16_t*)(p + 3*stride)= size==4 ? val : val*0x0101;
1252
67ee8bab0f28 optimizations
michaelni
parents: 1250
diff changeset
400 }else if(w==4 && h==1){
67ee8bab0f28 optimizations
michaelni
parents: 1250
diff changeset
401 *(uint32_t*)(p + 0*stride)= size==4 ? val : val*0x01010101;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
402 }else if(w==4 && h==2){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
403 *(uint32_t*)(p + 0*stride)=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
404 *(uint32_t*)(p + 1*stride)= size==4 ? val : val*0x01010101;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
405 }else if(w==4 && h==4){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
406 *(uint32_t*)(p + 0*stride)=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
407 *(uint32_t*)(p + 1*stride)=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
408 *(uint32_t*)(p + 2*stride)=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
409 *(uint32_t*)(p + 3*stride)= size==4 ? val : val*0x01010101;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
410 }else if(w==8 && h==1){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
411 *(uint32_t*)(p + 0)=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
412 *(uint32_t*)(p + 4)= size==4 ? val : val*0x01010101;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
413 }else if(w==8 && h==2){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
414 *(uint32_t*)(p + 0 + 0*stride)=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
415 *(uint32_t*)(p + 4 + 0*stride)=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
416 *(uint32_t*)(p + 0 + 1*stride)=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
417 *(uint32_t*)(p + 4 + 1*stride)= size==4 ? val : val*0x01010101;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
418 }else if(w==8 && h==4){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
419 *(uint64_t*)(p + 0*stride)=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
420 *(uint64_t*)(p + 1*stride)=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
421 *(uint64_t*)(p + 2*stride)=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
422 *(uint64_t*)(p + 3*stride)= size==4 ? val*0x0100000001ULL : val*0x0101010101010101ULL;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
423 }else if(w==16 && h==2){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
424 *(uint64_t*)(p + 0+0*stride)=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
425 *(uint64_t*)(p + 8+0*stride)=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
426 *(uint64_t*)(p + 0+1*stride)=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
427 *(uint64_t*)(p + 8+1*stride)= size==4 ? val*0x0100000001ULL : val*0x0101010101010101ULL;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
428 }else if(w==16 && h==4){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
429 *(uint64_t*)(p + 0+0*stride)=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
430 *(uint64_t*)(p + 8+0*stride)=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
431 *(uint64_t*)(p + 0+1*stride)=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
432 *(uint64_t*)(p + 8+1*stride)=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
433 *(uint64_t*)(p + 0+2*stride)=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
434 *(uint64_t*)(p + 8+2*stride)=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
435 *(uint64_t*)(p + 0+3*stride)=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
436 *(uint64_t*)(p + 8+3*stride)= size==4 ? val*0x0100000001ULL : val*0x0101010101010101ULL;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
437 }else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
438 assert(0);
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 static inline void fill_caches(H264Context *h, int mb_type, int for_deblock){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
442 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
443 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
444 int topleft_xy, top_xy, topright_xy, left_xy[2];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
445 int topleft_type, top_type, topright_type, left_type[2];
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
446 int left_block[8];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
447 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
448
2623
aaf8e94bce00 deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents: 2597
diff changeset
449 //FIXME deblocking can skip fill_caches much of the time with multiple slices too.
aaf8e94bce00 deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents: 2597
diff changeset
450 // the actual condition is whether we're on the edge of a slice,
aaf8e94bce00 deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents: 2597
diff changeset
451 // and even then the intra and nnz parts are unnecessary.
aaf8e94bce00 deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents: 2597
diff changeset
452 if(for_deblock && h->slice_num == 1)
aaf8e94bce00 deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents: 2597
diff changeset
453 return;
aaf8e94bce00 deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents: 2597
diff changeset
454
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
455 //wow what a mess, why didn't they simplify the interlacing&intra stuff, i can't imagine that these complex rules are worth it
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
456
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
457 top_xy = mb_xy - s->mb_stride;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
458 topleft_xy = top_xy - 1;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
459 topright_xy= top_xy + 1;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
460 left_xy[1] = left_xy[0] = mb_xy-1;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
461 left_block[0]= 0;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
462 left_block[1]= 1;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
463 left_block[2]= 2;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
464 left_block[3]= 3;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
465 left_block[4]= 7;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
466 left_block[5]= 10;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
467 left_block[6]= 8;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
468 left_block[7]= 11;
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
469 if(h->mb_aff_frame){
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
470 const int pair_xy = s->mb_x + (s->mb_y & ~1)*s->mb_stride;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
471 const int top_pair_xy = pair_xy - s->mb_stride;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
472 const int topleft_pair_xy = top_pair_xy - 1;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
473 const int topright_pair_xy = top_pair_xy + 1;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
474 const int topleft_mb_frame_flag = !IS_INTERLACED(s->current_picture.mb_type[topleft_pair_xy]);
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
475 const int top_mb_frame_flag = !IS_INTERLACED(s->current_picture.mb_type[top_pair_xy]);
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
476 const int topright_mb_frame_flag = !IS_INTERLACED(s->current_picture.mb_type[topright_pair_xy]);
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
477 const int left_mb_frame_flag = !IS_INTERLACED(s->current_picture.mb_type[pair_xy-1]);
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
478 const int curr_mb_frame_flag = !IS_INTERLACED(mb_type);
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
479 const int bottom = (s->mb_y & 1);
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
480 tprintf("fill_caches: curr_mb_frame_flag:%d, left_mb_frame_flag:%d, topleft_mb_frame_flag:%d, top_mb_frame_flag:%d, topright_mb_frame_flag:%d\n", curr_mb_frame_flag, left_mb_frame_flag, topleft_mb_frame_flag, top_mb_frame_flag, topright_mb_frame_flag);
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
481 if (bottom
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
482 ? !curr_mb_frame_flag // bottom macroblock
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
483 : (!curr_mb_frame_flag && !top_mb_frame_flag) // top macroblock
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
484 ) {
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
485 top_xy -= s->mb_stride;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
486 }
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
487 if (bottom
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
488 ? !curr_mb_frame_flag // bottom macroblock
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
489 : (!curr_mb_frame_flag && !topleft_mb_frame_flag) // top macroblock
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
490 ) {
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
491 topleft_xy -= s->mb_stride;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
492 }
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
493 if (bottom
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
494 ? !curr_mb_frame_flag // bottom macroblock
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
495 : (!curr_mb_frame_flag && !topright_mb_frame_flag) // top macroblock
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
496 ) {
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
497 topright_xy -= s->mb_stride;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
498 }
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
499 if (left_mb_frame_flag != curr_mb_frame_flag) {
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
500 left_xy[1] = left_xy[0] = pair_xy - 1;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
501 if (curr_mb_frame_flag) {
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
502 if (bottom) {
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
503 left_block[0]= 2;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
504 left_block[1]= 2;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
505 left_block[2]= 3;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
506 left_block[3]= 3;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
507 left_block[4]= 8;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
508 left_block[5]= 11;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
509 left_block[6]= 8;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
510 left_block[7]= 11;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
511 } else {
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
512 left_block[0]= 0;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
513 left_block[1]= 0;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
514 left_block[2]= 1;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
515 left_block[3]= 1;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
516 left_block[4]= 7;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
517 left_block[5]= 10;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
518 left_block[6]= 7;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
519 left_block[7]= 10;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
520 }
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
521 } else {
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
522 left_xy[1] += s->mb_stride;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
523 //left_block[0]= 0;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
524 left_block[1]= 2;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
525 left_block[2]= 0;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
526 left_block[3]= 2;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
527 //left_block[4]= 7;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
528 left_block[5]= 10;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
529 left_block[6]= 7;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
530 left_block[7]= 10;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
531 }
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
532 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
533 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
534
2594
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
535 h->top_mb_xy = top_xy;
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
536 h->left_mb_xy[0] = left_xy[0];
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
537 h->left_mb_xy[1] = left_xy[1];
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
538 if(for_deblock){
2449
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
539 topleft_type = h->slice_table[topleft_xy ] < 255 ? s->current_picture.mb_type[topleft_xy] : 0;
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
540 top_type = h->slice_table[top_xy ] < 255 ? s->current_picture.mb_type[top_xy] : 0;
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
541 topright_type= h->slice_table[topright_xy] < 255 ? s->current_picture.mb_type[topright_xy]: 0;
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
542 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
543 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
544 }else{
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
545 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
546 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
547 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
548 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
549 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
550 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
551
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
552 if(IS_INTRA(mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
553 h->topleft_samples_available=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
554 h->top_samples_available=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
555 h->left_samples_available= 0xFFFF;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
556 h->topright_samples_available= 0xEEEA;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
557
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
558 if(!IS_INTRA(top_type) && (top_type==0 || h->pps.constrained_intra_pred)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
559 h->topleft_samples_available= 0xB3FF;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
560 h->top_samples_available= 0x33FF;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
561 h->topright_samples_available= 0x26EA;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
562 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
563 for(i=0; i<2; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
564 if(!IS_INTRA(left_type[i]) && (left_type[i]==0 || h->pps.constrained_intra_pred)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
565 h->topleft_samples_available&= 0xDF5F;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
566 h->left_samples_available&= 0x5F5F;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
567 }
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(!IS_INTRA(topleft_type) && (topleft_type==0 || h->pps.constrained_intra_pred))
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
571 h->topleft_samples_available&= 0x7FFF;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
572
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
573 if(!IS_INTRA(topright_type) && (topright_type==0 || h->pps.constrained_intra_pred))
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
574 h->topright_samples_available&= 0xFBFF;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
575
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
576 if(IS_INTRA4x4(mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
577 if(IS_INTRA4x4(top_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
578 h->intra4x4_pred_mode_cache[4+8*0]= h->intra4x4_pred_mode[top_xy][4];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
579 h->intra4x4_pred_mode_cache[5+8*0]= h->intra4x4_pred_mode[top_xy][5];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
580 h->intra4x4_pred_mode_cache[6+8*0]= h->intra4x4_pred_mode[top_xy][6];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
581 h->intra4x4_pred_mode_cache[7+8*0]= h->intra4x4_pred_mode[top_xy][3];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
582 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
583 int pred;
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
584 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
585 pred= -1;
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
586 else{
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
587 pred= 2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
588 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
589 h->intra4x4_pred_mode_cache[4+8*0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
590 h->intra4x4_pred_mode_cache[5+8*0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
591 h->intra4x4_pred_mode_cache[6+8*0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
592 h->intra4x4_pred_mode_cache[7+8*0]= pred;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
593 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
594 for(i=0; i<2; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
595 if(IS_INTRA4x4(left_type[i])){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
596 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
597 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
598 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
599 int pred;
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
600 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
601 pred= -1;
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
602 else{
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
603 pred= 2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
604 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
605 h->intra4x4_pred_mode_cache[3+8*1 + 2*8*i]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
606 h->intra4x4_pred_mode_cache[3+8*2 + 2*8*i]= pred;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
607 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
608 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
609 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
610 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
611
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
612
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
613 /*
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
614 0 . T T. T T T T
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
615 1 L . .L . . . .
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
616 2 L . .L . . . .
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
617 3 . T TL . . . .
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
618 4 L . .L . . . .
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
619 5 L . .. . . . .
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
620 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
621 //FIXME constraint_intra_pred & partitioning & nnz (lets hope this is just a typo in the spec)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
622 if(top_type){
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
623 h->non_zero_count_cache[4+8*0]= h->non_zero_count[top_xy][4];
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
624 h->non_zero_count_cache[5+8*0]= h->non_zero_count[top_xy][5];
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
625 h->non_zero_count_cache[6+8*0]= h->non_zero_count[top_xy][6];
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
626 h->non_zero_count_cache[7+8*0]= h->non_zero_count[top_xy][3];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
627
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
628 h->non_zero_count_cache[1+8*0]= h->non_zero_count[top_xy][9];
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
629 h->non_zero_count_cache[2+8*0]= h->non_zero_count[top_xy][8];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
630
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
631 h->non_zero_count_cache[1+8*3]= h->non_zero_count[top_xy][12];
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
632 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
633
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
634 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
635 h->non_zero_count_cache[4+8*0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
636 h->non_zero_count_cache[5+8*0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
637 h->non_zero_count_cache[6+8*0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
638 h->non_zero_count_cache[7+8*0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
639
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
640 h->non_zero_count_cache[1+8*0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
641 h->non_zero_count_cache[2+8*0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
642
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
643 h->non_zero_count_cache[1+8*3]=
2314
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
644 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
645
2594
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
646 }
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
647
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
648 for (i=0; i<2; i++) {
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
649 if(left_type[i]){
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
650 h->non_zero_count_cache[3+8*1 + 2*8*i]= h->non_zero_count[left_xy[i]][left_block[0+2*i]];
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
651 h->non_zero_count_cache[3+8*2 + 2*8*i]= h->non_zero_count[left_xy[i]][left_block[1+2*i]];
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
652 h->non_zero_count_cache[0+8*1 + 8*i]= h->non_zero_count[left_xy[i]][left_block[4+2*i]];
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
653 h->non_zero_count_cache[0+8*4 + 8*i]= h->non_zero_count[left_xy[i]][left_block[5+2*i]];
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
654 }else{
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
655 h->non_zero_count_cache[3+8*1 + 2*8*i]=
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
656 h->non_zero_count_cache[3+8*2 + 2*8*i]=
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
657 h->non_zero_count_cache[0+8*1 + 8*i]=
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
658 h->non_zero_count_cache[0+8*4 + 8*i]= h->pps.cabac && !IS_INTRA(mb_type) ? 0 : 64;
2594
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
659 }
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
660 }
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
661
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
662 if( h->pps.cabac ) {
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
663 // top_cbp
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
664 if(top_type) {
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
665 h->top_cbp = h->cbp_table[top_xy];
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
666 } else if(IS_INTRA(mb_type)) {
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
667 h->top_cbp = 0x1C0;
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
668 } else {
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
669 h->top_cbp = 0;
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
670 }
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
671 // left_cbp
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
672 if (left_type[0]) {
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
673 h->left_cbp = h->cbp_table[left_xy[0]] & 0x1f0;
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
674 } else if(IS_INTRA(mb_type)) {
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
675 h->left_cbp = 0x1C0;
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
676 } else {
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
677 h->left_cbp = 0;
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
678 }
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
679 if (left_type[0]) {
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
680 h->left_cbp |= ((h->cbp_table[left_xy[0]]>>((left_block[0]&(~1))+1))&0x1) << 1;
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
681 }
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
682 if (left_type[1]) {
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
683 h->left_cbp |= ((h->cbp_table[left_xy[1]]>>((left_block[2]&(~1))+1))&0x1) << 3;
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
684 }
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
685 }
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
686
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
687 #if 1
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
688 //FIXME direct mb can skip much of this
2623
aaf8e94bce00 deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents: 2597
diff changeset
689 if(IS_INTER(mb_type) || IS_DIRECT(mb_type)){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
690 int list;
2623
aaf8e94bce00 deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents: 2597
diff changeset
691 for(list=0; list<1+(h->slice_type==B_TYPE); list++){
aaf8e94bce00 deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents: 2597
diff changeset
692 if(!USES_LIST(mb_type, list) && !IS_DIRECT(mb_type) && !h->deblocking_filter){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
693 /*if(!h->mv_cache_clean[list]){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
694 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
695 memset(h->ref_cache[list], PART_NOT_AVAILABLE, 8*5*sizeof(int8_t));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
696 h->mv_cache_clean[list]= 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
697 }*/
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
698 continue;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
699 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
700 h->mv_cache_clean[list]= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
701
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
702 if(IS_INTER(top_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
703 const int b_xy= h->mb2b_xy[top_xy] + 3*h->b_stride;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
704 const int b8_xy= h->mb2b8_xy[top_xy] + h->b8_stride;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
705 *(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
706 *(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
707 *(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
708 *(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
709 h->ref_cache[list][scan8[0] + 0 - 1*8]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
710 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
711 h->ref_cache[list][scan8[0] + 2 - 1*8]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
712 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
713 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
714 *(uint32_t*)h->mv_cache [list][scan8[0] + 0 - 1*8]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
715 *(uint32_t*)h->mv_cache [list][scan8[0] + 1 - 1*8]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
716 *(uint32_t*)h->mv_cache [list][scan8[0] + 2 - 1*8]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
717 *(uint32_t*)h->mv_cache [list][scan8[0] + 3 - 1*8]= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
718 *(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
719 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
720
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
721 //FIXME unify cleanup or sth
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
722 if(IS_INTER(left_type[0])){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
723 const int b_xy= h->mb2b_xy[left_xy[0]] + 3;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
724 const int b8_xy= h->mb2b8_xy[left_xy[0]] + 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
725 *(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
726 *(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
727 h->ref_cache[list][scan8[0] - 1 + 0*8]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
728 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
729 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
730 *(uint32_t*)h->mv_cache [list][scan8[0] - 1 + 0*8]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
731 *(uint32_t*)h->mv_cache [list][scan8[0] - 1 + 1*8]= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
732 h->ref_cache[list][scan8[0] - 1 + 0*8]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
733 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
734 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
735
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
736 if(IS_INTER(left_type[1])){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
737 const int b_xy= h->mb2b_xy[left_xy[1]] + 3;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
738 const int b8_xy= h->mb2b8_xy[left_xy[1]] + 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
739 *(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
740 *(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
741 h->ref_cache[list][scan8[0] - 1 + 2*8]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
742 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
743 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
744 *(uint32_t*)h->mv_cache [list][scan8[0] - 1 + 2*8]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
745 *(uint32_t*)h->mv_cache [list][scan8[0] - 1 + 3*8]= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
746 h->ref_cache[list][scan8[0] - 1 + 2*8]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
747 h->ref_cache[list][scan8[0] - 1 + 3*8]= left_type[0] ? LIST_NOT_USED : PART_NOT_AVAILABLE;
2669
a4e3a37ed57b some asserts()
michael
parents: 2650
diff changeset
748 assert((!left_type[0]) == (!left_type[1]));
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
749 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
750
2623
aaf8e94bce00 deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents: 2597
diff changeset
751 if(for_deblock || (IS_DIRECT(mb_type) && !h->direct_spatial_mv_pred))
2449
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
752 continue;
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
753
2623
aaf8e94bce00 deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents: 2597
diff changeset
754 if(IS_INTER(topleft_type)){
aaf8e94bce00 deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents: 2597
diff changeset
755 const int b_xy = h->mb2b_xy[topleft_xy] + 3 + 3*h->b_stride;
aaf8e94bce00 deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents: 2597
diff changeset
756 const int b8_xy= h->mb2b8_xy[topleft_xy] + 1 + h->b8_stride;
aaf8e94bce00 deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents: 2597
diff changeset
757 *(uint32_t*)h->mv_cache[list][scan8[0] - 1 - 1*8]= *(uint32_t*)s->current_picture.motion_val[list][b_xy];
aaf8e94bce00 deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents: 2597
diff changeset
758 h->ref_cache[list][scan8[0] - 1 - 1*8]= s->current_picture.ref_index[list][b8_xy];
aaf8e94bce00 deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents: 2597
diff changeset
759 }else{
aaf8e94bce00 deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents: 2597
diff changeset
760 *(uint32_t*)h->mv_cache[list][scan8[0] - 1 - 1*8]= 0;
aaf8e94bce00 deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents: 2597
diff changeset
761 h->ref_cache[list][scan8[0] - 1 - 1*8]= topleft_type ? LIST_NOT_USED : PART_NOT_AVAILABLE;
aaf8e94bce00 deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents: 2597
diff changeset
762 }
aaf8e94bce00 deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents: 2597
diff changeset
763
aaf8e94bce00 deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents: 2597
diff changeset
764 if(IS_INTER(topright_type)){
aaf8e94bce00 deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents: 2597
diff changeset
765 const int b_xy= h->mb2b_xy[topright_xy] + 3*h->b_stride;
aaf8e94bce00 deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents: 2597
diff changeset
766 const int b8_xy= h->mb2b8_xy[topright_xy] + h->b8_stride;
aaf8e94bce00 deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents: 2597
diff changeset
767 *(uint32_t*)h->mv_cache[list][scan8[0] + 4 - 1*8]= *(uint32_t*)s->current_picture.motion_val[list][b_xy];
aaf8e94bce00 deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents: 2597
diff changeset
768 h->ref_cache[list][scan8[0] + 4 - 1*8]= s->current_picture.ref_index[list][b8_xy];
aaf8e94bce00 deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents: 2597
diff changeset
769 }else{
aaf8e94bce00 deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents: 2597
diff changeset
770 *(uint32_t*)h->mv_cache [list][scan8[0] + 4 - 1*8]= 0;
aaf8e94bce00 deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents: 2597
diff changeset
771 h->ref_cache[list][scan8[0] + 4 - 1*8]= topright_type ? LIST_NOT_USED : PART_NOT_AVAILABLE;
aaf8e94bce00 deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents: 2597
diff changeset
772 }
aaf8e94bce00 deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents: 2597
diff changeset
773
aaf8e94bce00 deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents: 2597
diff changeset
774
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
775 h->ref_cache[list][scan8[5 ]+1] =
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
776 h->ref_cache[list][scan8[7 ]+1] =
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
777 h->ref_cache[list][scan8[13]+1] = //FIXME remove past 3 (init somewhere else)
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
778 h->ref_cache[list][scan8[4 ]] =
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
779 h->ref_cache[list][scan8[12]] = PART_NOT_AVAILABLE;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
780 *(uint32_t*)h->mv_cache [list][scan8[5 ]+1]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
781 *(uint32_t*)h->mv_cache [list][scan8[7 ]+1]=
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
782 *(uint32_t*)h->mv_cache [list][scan8[13]+1]= //FIXME remove past 3 (init somewhere else)
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
783 *(uint32_t*)h->mv_cache [list][scan8[4 ]]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
784 *(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
785
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
786 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
787 /* 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
788 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
789 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
790 *(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
791 }else{
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
792 *(uint32_t*)h->mvd_cache[list][scan8[0] - 1 - 1*8]= 0;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
793 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
794
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
795 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
796 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
797 *(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
798 *(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
799 *(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
800 *(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
801 }else{
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
802 *(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
803 *(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
804 *(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
805 *(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
806 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
807 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
808 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
809 *(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
810 *(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
811 }else{
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
812 *(uint32_t*)h->mvd_cache [list][scan8[0] - 1 + 0*8]=
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
813 *(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
814 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
815 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
816 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
817 *(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
818 *(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
819 }else{
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
820 *(uint32_t*)h->mvd_cache [list][scan8[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
821 *(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
822 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
823 *(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
824 *(uint32_t*)h->mvd_cache [list][scan8[7 ]+1]=
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
825 *(uint32_t*)h->mvd_cache [list][scan8[13]+1]= //FIXME remove past 3 (init somewhere else)
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
826 *(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
827 *(uint32_t*)h->mvd_cache [list][scan8[12]]= 0;
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
828
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
829 if(h->slice_type == B_TYPE){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
830 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
831
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
832 if(IS_DIRECT(top_type)){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
833 *(uint32_t*)&h->direct_cache[scan8[0] - 1*8]= 0x01010101;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
834 }else if(IS_8X8(top_type)){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
835 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
836 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
837 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
838 }else{
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
839 *(uint32_t*)&h->direct_cache[scan8[0] - 1*8]= 0;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
840 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
841
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
842 //FIXME interlacing
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
843 if(IS_DIRECT(left_type[0])){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
844 h->direct_cache[scan8[0] - 1 + 0*8]=
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
845 h->direct_cache[scan8[0] - 1 + 2*8]= 1;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
846 }else if(IS_8X8(left_type[0])){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
847 int b8_xy = h->mb2b8_xy[left_xy[0]] + 1;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
848 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
849 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
850 }else{
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
851 h->direct_cache[scan8[0] - 1 + 0*8]=
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
852 h->direct_cache[scan8[0] - 1 + 2*8]= 0;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
853 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
854 }
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
855 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
856 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
857 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
858 #endif
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
859
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
860 h->neighbor_transform_size= !!IS_8x8DCT(top_type) + !!IS_8x8DCT(left_type[0]);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
861 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
862
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
863 static inline void write_back_intra_pred_mode(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
864 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
865 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
866
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
867 h->intra4x4_pred_mode[mb_xy][0]= h->intra4x4_pred_mode_cache[7+8*1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
868 h->intra4x4_pred_mode[mb_xy][1]= h->intra4x4_pred_mode_cache[7+8*2];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
869 h->intra4x4_pred_mode[mb_xy][2]= h->intra4x4_pred_mode_cache[7+8*3];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
870 h->intra4x4_pred_mode[mb_xy][3]= h->intra4x4_pred_mode_cache[7+8*4];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
871 h->intra4x4_pred_mode[mb_xy][4]= h->intra4x4_pred_mode_cache[4+8*4];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
872 h->intra4x4_pred_mode[mb_xy][5]= h->intra4x4_pred_mode_cache[5+8*4];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
873 h->intra4x4_pred_mode[mb_xy][6]= h->intra4x4_pred_mode_cache[6+8*4];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
874 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
875
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
876 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
877 * 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
878 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
879 static inline int check_intra4x4_pred_mode(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
880 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
881 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
882 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
883 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
884
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
885 if(!(h->top_samples_available&0x8000)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
886 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
887 int status= top[ h->intra4x4_pred_mode_cache[scan8[0] + i] ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
888 if(status<0){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
889 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
890 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
891 } else if(status){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
892 h->intra4x4_pred_mode_cache[scan8[0] + i]= status;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
893 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
894 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
895 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
896
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
897 if(!(h->left_samples_available&0x8000)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
898 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
899 int status= left[ h->intra4x4_pred_mode_cache[scan8[0] + 8*i] ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
900 if(status<0){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
901 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
902 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
903 } else if(status){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
904 h->intra4x4_pred_mode_cache[scan8[0] + 8*i]= status;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
905 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
906 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
907 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
908
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
909 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
910 } //FIXME cleanup like next
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
911
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
912 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
913 * 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
914 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
915 static inline int check_intra_pred_mode(H264Context *h, int mode){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
916 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
917 static const int8_t top [7]= {LEFT_DC_PRED8x8, 1,-1,-1};
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
918 static const int8_t left[7]= { TOP_DC_PRED8x8,-1, 2,-1,DC_128_PRED8x8};
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
919
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
920 if(mode < 0 || mode > 6) {
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
921 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
922 return -1;
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
923 }
2163
b25df257eab0 segfault fix
michael
parents: 2116
diff changeset
924
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
925 if(!(h->top_samples_available&0x8000)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
926 mode= top[ mode ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
927 if(mode<0){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
928 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
929 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
930 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
931 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
932
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
933 if(!(h->left_samples_available&0x8000)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
934 mode= left[ mode ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
935 if(mode<0){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
936 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
937 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
938 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
939 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
940
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
941 return mode;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
942 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
943
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
944 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
945 * gets the predicted intra4x4 prediction mode.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
946 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
947 static inline int pred_intra_mode(H264Context *h, int n){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
948 const int index8= scan8[n];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
949 const int left= h->intra4x4_pred_mode_cache[index8 - 1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
950 const int top = h->intra4x4_pred_mode_cache[index8 - 8];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
951 const int min= FFMIN(left, top);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
952
1170
4710976004a5 #ifdef TRACE printf() -> tprintf()
michaelni
parents: 1169
diff changeset
953 tprintf("mode:%d %d min:%d\n", left ,top, min);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
954
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
955 if(min<0) return DC_PRED;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
956 else return min;
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 static inline void write_back_non_zero_count(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
960 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
961 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
962
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
963 h->non_zero_count[mb_xy][0]= h->non_zero_count_cache[7+8*1];
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
964 h->non_zero_count[mb_xy][1]= h->non_zero_count_cache[7+8*2];
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
965 h->non_zero_count[mb_xy][2]= h->non_zero_count_cache[7+8*3];
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
966 h->non_zero_count[mb_xy][3]= h->non_zero_count_cache[7+8*4];
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
967 h->non_zero_count[mb_xy][4]= h->non_zero_count_cache[4+8*4];
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
968 h->non_zero_count[mb_xy][5]= h->non_zero_count_cache[5+8*4];
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
969 h->non_zero_count[mb_xy][6]= h->non_zero_count_cache[6+8*4];
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
970
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
971 h->non_zero_count[mb_xy][9]= h->non_zero_count_cache[1+8*2];
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
972 h->non_zero_count[mb_xy][8]= h->non_zero_count_cache[2+8*2];
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
973 h->non_zero_count[mb_xy][7]= h->non_zero_count_cache[2+8*1];
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
974
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
975 h->non_zero_count[mb_xy][12]=h->non_zero_count_cache[1+8*5];
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
976 h->non_zero_count[mb_xy][11]=h->non_zero_count_cache[2+8*5];
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
977 h->non_zero_count[mb_xy][10]=h->non_zero_count_cache[2+8*4];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
978 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
979
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
980 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
981 * gets the predicted number of non zero coefficients.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
982 * @param n block index
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
983 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
984 static inline int pred_non_zero_count(H264Context *h, int n){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
985 const int index8= scan8[n];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
986 const int left= h->non_zero_count_cache[index8 - 1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
987 const int top = h->non_zero_count_cache[index8 - 8];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
988 int i= left + top;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
989
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
990 if(i<64) i= (i+1)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
991
1170
4710976004a5 #ifdef TRACE printf() -> tprintf()
michaelni
parents: 1169
diff changeset
992 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
993
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
994 return i&31;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
995 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
996
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
997 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
998 const int topright_ref= h->ref_cache[list][ i - 8 + part_width ];
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
999
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
1000 if(topright_ref != PART_NOT_AVAILABLE){
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
1001 *C= h->mv_cache[list][ i - 8 + part_width ];
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
1002 return topright_ref;
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
1003 }else{
1170
4710976004a5 #ifdef TRACE printf() -> tprintf()
michaelni
parents: 1169
diff changeset
1004 tprintf("topright MV not available\n");
4710976004a5 #ifdef TRACE printf() -> tprintf()
michaelni
parents: 1169
diff changeset
1005
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
1006 *C= h->mv_cache[list][ i - 8 - 1 ];
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
1007 return h->ref_cache[list][ i - 8 - 1 ];
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
1008 }
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
1009 }
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
1010
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1011 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1012 * gets the predicted MV.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1013 * @param n the block index
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1014 * @param part_width the width of the partition (4, 8,16) -> (1, 2, 4)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1015 * @param mx the x component of the predicted motion vector
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1016 * @param my the y component of the predicted motion vector
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1017 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1018 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
1019 const int index8= scan8[n];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1020 const int top_ref= h->ref_cache[list][ index8 - 8 ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1021 const int left_ref= h->ref_cache[list][ index8 - 1 ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1022 const int16_t * const A= h->mv_cache[list][ index8 - 1 ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1023 const int16_t * const B= h->mv_cache[list][ index8 - 8 ];
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
1024 const int16_t * C;
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
1025 int diagonal_ref, match_count;
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
1026
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1027 assert(part_width==1 || part_width==2 || part_width==4);
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
1028
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1029 /* mv_cache
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1030 B . . A T T T T
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1031 U . . L . . , .
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1032 U . . L . . . .
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1033 U . . L . . , .
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1034 . . . L . . . .
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1035 */
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
1036
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
1037 diagonal_ref= fetch_diagonal_mv(h, &C, index8, list, part_width);
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
1038 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
1039 tprintf("pred_motion match_count=%d\n", match_count);
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
1040 if(match_count > 1){ //most common
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
1041 *mx= mid_pred(A[0], B[0], C[0]);
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
1042 *my= mid_pred(A[1], B[1], C[1]);
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
1043 }else if(match_count==1){
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
1044 if(left_ref==ref){
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
1045 *mx= A[0];
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
1046 *my= A[1];
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
1047 }else if(top_ref==ref){
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
1048 *mx= B[0];
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
1049 *my= B[1];
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
1050 }else{
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
1051 *mx= C[0];
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
1052 *my= C[1];
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
1053 }
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
1054 }else{
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
1055 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
1056 *mx= A[0];
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
1057 *my= A[1];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1058 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1059 *mx= mid_pred(A[0], B[0], C[0]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1060 *my= mid_pred(A[1], B[1], C[1]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1061 }
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
1062 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1063
1187
f3c659bfdb8e minor cleanup / some warning fixes
michaelni
parents: 1184
diff changeset
1064 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
1065 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1066
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1067 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1068 * gets the directionally predicted 16x8 MV.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1069 * @param n the block index
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1070 * @param mx the x component of the predicted motion vector
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1071 * @param my the y component of the predicted motion vector
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1072 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1073 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
1074 if(n==0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1075 const int top_ref= h->ref_cache[list][ scan8[0] - 8 ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1076 const int16_t * const B= h->mv_cache[list][ scan8[0] - 8 ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1077
2402
f9d4e1eddbc5 - correct several errors on the deblocking accross slice boundaries.
michael
parents: 2401
diff changeset
1078 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
1079
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1080 if(top_ref == ref){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1081 *mx= B[0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1082 *my= B[1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1083 return;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1084 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1085 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1086 const int left_ref= h->ref_cache[list][ scan8[8] - 1 ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1087 const int16_t * const A= h->mv_cache[list][ scan8[8] - 1 ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1088
2402
f9d4e1eddbc5 - correct several errors on the deblocking accross slice boundaries.
michael
parents: 2401
diff changeset
1089 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
1090
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1091 if(left_ref == ref){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1092 *mx= A[0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1093 *my= A[1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1094 return;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1095 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1096 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1097
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1098 //RARE
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1099 pred_motion(h, n, 4, list, ref, mx, my);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1100 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1101
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1102 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1103 * gets the directionally predicted 8x16 MV.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1104 * @param n the block index
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1105 * @param mx the x component of the predicted motion vector
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1106 * @param my the y component of the predicted motion vector
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1107 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1108 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
1109 if(n==0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1110 const int left_ref= h->ref_cache[list][ scan8[0] - 1 ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1111 const int16_t * const A= h->mv_cache[list][ scan8[0] - 1 ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1112
2402
f9d4e1eddbc5 - correct several errors on the deblocking accross slice boundaries.
michael
parents: 2401
diff changeset
1113 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
1114
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1115 if(left_ref == ref){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1116 *mx= A[0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1117 *my= A[1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1118 return;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1119 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1120 }else{
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
1121 const int16_t * C;
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
1122 int diagonal_ref;
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
1123
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
1124 diagonal_ref= fetch_diagonal_mv(h, &C, scan8[4], list, 2);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1125
2402
f9d4e1eddbc5 - correct several errors on the deblocking accross slice boundaries.
michael
parents: 2401
diff changeset
1126 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
1127
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
1128 if(diagonal_ref == ref){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1129 *mx= C[0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1130 *my= C[1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1131 return;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1132 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1133 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1134
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1135 //RARE
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1136 pred_motion(h, n, 2, list, ref, mx, my);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1137 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1138
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1139 static inline void pred_pskip_motion(H264Context * const h, int * const mx, int * const my){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1140 const int top_ref = h->ref_cache[0][ scan8[0] - 8 ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1141 const int left_ref= h->ref_cache[0][ scan8[0] - 1 ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1142
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
1143 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
1144
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1145 if(top_ref == PART_NOT_AVAILABLE || left_ref == PART_NOT_AVAILABLE
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1146 || (top_ref == 0 && *(uint32_t*)h->mv_cache[0][ scan8[0] - 8 ] == 0)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1147 || (left_ref == 0 && *(uint32_t*)h->mv_cache[0][ scan8[0] - 1 ] == 0)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1148
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1149 *mx = *my = 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1150 return;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1151 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1152
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1153 pred_motion(h, 0, 4, 0, 0, mx, my);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1154
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1155 return;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1156 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1157
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1158 static inline void direct_dist_scale_factor(H264Context * const h){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1159 const int poc = h->s.current_picture_ptr->poc;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1160 const int poc1 = h->ref_list[1][0].poc;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1161 int i;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1162 for(i=0; i<h->ref_count[0]; i++){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1163 int poc0 = h->ref_list[0][i].poc;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1164 int td = clip(poc1 - poc0, -128, 127);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1165 if(td == 0 /* FIXME || pic0 is a long-term ref */){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1166 h->dist_scale_factor[i] = 256;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1167 }else{
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1168 int tb = clip(poc - poc0, -128, 127);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1169 int tx = (16384 + (ABS(td) >> 1)) / td;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1170 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
1171 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1172 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1173 }
2537
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1174 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
1175 MpegEncContext * const s = &h->s;
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1176 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
1177 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
1178 int list, i, j;
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1179 if(cur->pict_type == I_TYPE)
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1180 cur->ref_count[0] = 0;
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1181 if(cur->pict_type != B_TYPE)
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1182 cur->ref_count[1] = 0;
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1183 for(list=0; list<2; list++){
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1184 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
1185 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
1186 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
1187 }
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1188 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
1189 return;
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1190 for(list=0; list<2; list++){
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1191 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
1192 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
1193 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
1194 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
1195 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
1196 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
1197 break;
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1198 }
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1199 }
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1200 }
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1201 }
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1202
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1203 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
1204 MpegEncContext * const s = &h->s;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1205 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
1206 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
1207 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
1208 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
1209 const int16_t (*l1mv0)[2] = (const int16_t (*)[2]) &h->ref_list[1][0].motion_val[0][b4_xy];
2808
932ec96933f5 fixing colocated mv if colocated block is L1 predicted
michael
parents: 2803
diff changeset
1210 const int16_t (*l1mv1)[2] = (const int16_t (*)[2]) &h->ref_list[1][0].motion_val[1][b4_xy];
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1211 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
1212 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
1213 const int is_b8x8 = IS_8X8(*mb_type);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1214 int sub_mb_type;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1215 int i8, i4;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1216
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1217 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
1218 /* 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
1219 * so we know exactly what block size to use */
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1220 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
1221 *mb_type = MB_TYPE_8x8|MB_TYPE_L0L1;
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1222 }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
1223 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
1224 *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
1225 }else{
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1226 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
1227 *mb_type = MB_TYPE_8x8|MB_TYPE_L0L1;
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1228 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1229 if(!is_b8x8)
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1230 *mb_type |= MB_TYPE_DIRECT2;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1231
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
1232 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
1233
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1234 if(h->direct_spatial_mv_pred){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1235 int ref[2];
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1236 int mv[2][2];
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1237 int list;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1238
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1239 /* ref = min(neighbors) */
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1240 for(list=0; list<2; list++){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1241 int refa = h->ref_cache[list][scan8[0] - 1];
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1242 int refb = h->ref_cache[list][scan8[0] - 8];
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1243 int refc = h->ref_cache[list][scan8[0] - 8 + 4];
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1244 if(refc == -2)
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1245 refc = h->ref_cache[list][scan8[0] - 8 - 1];
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1246 ref[list] = refa;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1247 if(ref[list] < 0 || (refb < ref[list] && refb >= 0))
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1248 ref[list] = refb;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1249 if(ref[list] < 0 || (refc < ref[list] && refc >= 0))
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1250 ref[list] = refc;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1251 if(ref[list] < 0)
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1252 ref[list] = -1;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1253 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1254
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1255 if(ref[0] < 0 && ref[1] < 0){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1256 ref[0] = ref[1] = 0;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1257 mv[0][0] = mv[0][1] =
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1258 mv[1][0] = mv[1][1] = 0;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1259 }else{
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1260 for(list=0; list<2; list++){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1261 if(ref[list] >= 0)
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1262 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
1263 else
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1264 mv[list][0] = mv[list][1] = 0;
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 if(ref[1] < 0){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1269 *mb_type &= ~MB_TYPE_P0L1;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1270 sub_mb_type &= ~MB_TYPE_P0L1;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1271 }else if(ref[0] < 0){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1272 *mb_type &= ~MB_TYPE_P0L0;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1273 sub_mb_type &= ~MB_TYPE_P0L0;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1274 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1275
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1276 if(IS_16X16(*mb_type)){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1277 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
1278 fill_rectangle(&h->ref_cache[1][scan8[0]], 4, 4, 8, ref[1], 1);
2808
932ec96933f5 fixing colocated mv if colocated block is L1 predicted
michael
parents: 2803
diff changeset
1279 if(!IS_INTRA(mb_type_col)
2834
fd5d7c732c6b kill a bunch of compiler warnings
mru
parents: 2815
diff changeset
1280 && ( (l1ref0[0] == 0 && ABS(l1mv0[0][0]) <= 1 && ABS(l1mv0[0][1]) <= 1)
fd5d7c732c6b kill a bunch of compiler warnings
mru
parents: 2815
diff changeset
1281 || (l1ref0[0] < 0 && l1ref1[0] == 0 && ABS(l1mv1[0][0]) <= 1 && ABS(l1mv1[0][1]) <= 1
fd5d7c732c6b kill a bunch of compiler warnings
mru
parents: 2815
diff changeset
1282 && (h->x264_build>33 || !h->x264_build)))){
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1283 if(ref[0] > 0)
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1284 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
1285 else
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1286 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
1287 if(ref[1] > 0)
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1288 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
1289 else
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1290 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
1291 }else{
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1292 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
1293 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
1294 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1295 }else{
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1296 for(i8=0; i8<4; i8++){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1297 const int x8 = i8&1;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1298 const int y8 = i8>>1;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1299
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1300 if(is_b8x8 && !IS_DIRECT(h->sub_mb_type[i8]))
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1301 continue;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1302 h->sub_mb_type[i8] = sub_mb_type;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1303
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1304 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
1305 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
1306 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
1307 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
1308
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1309 /* col_zero_flag */
2808
932ec96933f5 fixing colocated mv if colocated block is L1 predicted
michael
parents: 2803
diff changeset
1310 if(!IS_INTRA(mb_type_col) && ( l1ref0[x8 + y8*h->b8_stride] == 0
2834
fd5d7c732c6b kill a bunch of compiler warnings
mru
parents: 2815
diff changeset
1311 || (l1ref0[x8 + y8*h->b8_stride] < 0 && l1ref1[x8 + y8*h->b8_stride] == 0
fd5d7c732c6b kill a bunch of compiler warnings
mru
parents: 2815
diff changeset
1312 && (h->x264_build>33 || !h->x264_build)))){
2808
932ec96933f5 fixing colocated mv if colocated block is L1 predicted
michael
parents: 2803
diff changeset
1313 const int16_t (*l1mv)[2]= l1ref0[x8 + y8*h->b8_stride] == 0 ? l1mv0 : l1mv1;
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1314 for(i4=0; i4<4; i4++){
2808
932ec96933f5 fixing colocated mv if colocated block is L1 predicted
michael
parents: 2803
diff changeset
1315 const int16_t *mv_col = l1mv[x8*2 + (i4&1) + (y8*2 + (i4>>1))*h->b_stride];
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1316 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
1317 if(ref[0] == 0)
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1318 *(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
1319 if(ref[1] == 0)
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1320 *(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
1321 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1322 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1323 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1324 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1325 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1326 }else{ /* direct temporal mv pred */
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1327 if(IS_16X16(*mb_type)){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1328 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
1329 if(IS_INTRA(mb_type_col)){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1330 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
1331 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
1332 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
1333 }else{
2537
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1334 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
1335 : h->map_col_to_list0[1][l1ref1[0]];
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1336 const int dist_scale_factor = h->dist_scale_factor[ref0];
2809
75400dfbe117 fixing colocated mv if colocated block is L1 predicted for the temporal direct case
michael
parents: 2808
diff changeset
1337 const int16_t *mv_col = l1ref0[0] >= 0 ? l1mv0[0] : l1mv1[0];
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1338 int mv_l0[2];
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1339 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
1340 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
1341 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
1342 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
1343 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
1344 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1345 }else{
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1346 for(i8=0; i8<4; i8++){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1347 const int x8 = i8&1;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1348 const int y8 = i8>>1;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1349 int ref0, dist_scale_factor;
2834
fd5d7c732c6b kill a bunch of compiler warnings
mru
parents: 2815
diff changeset
1350 const int16_t (*l1mv)[2]= l1mv0;
2809
75400dfbe117 fixing colocated mv if colocated block is L1 predicted for the temporal direct case
michael
parents: 2808
diff changeset
1351
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1352 if(is_b8x8 && !IS_DIRECT(h->sub_mb_type[i8]))
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1353 continue;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1354 h->sub_mb_type[i8] = sub_mb_type;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1355 if(IS_INTRA(mb_type_col)){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1356 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
1357 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
1358 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
1359 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
1360 continue;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1361 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1362
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1363 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
1364 if(ref0 >= 0)
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1365 ref0 = h->map_col_to_list0[0][ref0];
2809
75400dfbe117 fixing colocated mv if colocated block is L1 predicted for the temporal direct case
michael
parents: 2808
diff changeset
1366 else{
2537
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1367 ref0 = h->map_col_to_list0[1][l1ref1[x8 + y8*h->b8_stride]];
2809
75400dfbe117 fixing colocated mv if colocated block is L1 predicted for the temporal direct case
michael
parents: 2808
diff changeset
1368 l1mv= l1mv1;
75400dfbe117 fixing colocated mv if colocated block is L1 predicted for the temporal direct case
michael
parents: 2808
diff changeset
1369 }
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1370 dist_scale_factor = h->dist_scale_factor[ref0];
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1371
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1372 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
1373 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
1374 for(i4=0; i4<4; i4++){
2809
75400dfbe117 fixing colocated mv if colocated block is L1 predicted for the temporal direct case
michael
parents: 2808
diff changeset
1375 const int16_t *mv_col = l1mv[x8*2 + (i4&1) + (y8*2 + (i4>>1))*h->b_stride];
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1376 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
1377 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
1378 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
1379 *(uint32_t*)h->mv_cache[1][scan8[i8*4+i4]] =
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1380 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
1381 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1382 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1383 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1384 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1385 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1386
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1387 static inline void write_back_motion(H264Context *h, int mb_type){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1388 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1389 const int b_xy = 4*s->mb_x + 4*s->mb_y*h->b_stride;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1390 const int b8_xy= 2*s->mb_x + 2*s->mb_y*h->b8_stride;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1391 int list;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1392
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1393 for(list=0; list<2; list++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1394 int y;
2535
e0bf024629cf vismv didn't display 8x8 mvs in H.264
lorenm
parents: 2523
diff changeset
1395 if(!USES_LIST(mb_type, list)){
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
1396 if(1){ //FIXME skip or never read if mb_type doesn't use it
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1397 for(y=0; y<4; y++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1398 *(uint64_t*)s->current_picture.motion_val[list][b_xy + 0 + y*h->b_stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1399 *(uint64_t*)s->current_picture.motion_val[list][b_xy + 2 + y*h->b_stride]= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1400 }
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
1401 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
1402 /* FIXME needed ? */
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
1403 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
1404 *(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
1405 *(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
1406 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
1407 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1408 for(y=0; y<2; y++){
2675
c6aa5585954f alignment fix by (Gbor Kovcs >picard demoscene hu)
michael
parents: 2674
diff changeset
1409 s->current_picture.ref_index[list][b8_xy + 0 + y*h->b8_stride]=
c6aa5585954f alignment fix by (Gbor Kovcs >picard demoscene hu)
michael
parents: 2674
diff changeset
1410 s->current_picture.ref_index[list][b8_xy + 1 + y*h->b8_stride]= LIST_NOT_USED;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1411 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1412 }
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1413 continue;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1414 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1415
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1416 for(y=0; y<4; y++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1417 *(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
1418 *(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
1419 }
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
1420 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
1421 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
1422 *(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
1423 *(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
1424 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
1425 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1426 for(y=0; y<2; y++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1427 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
1428 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
1429 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1430 }
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1431
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1432 if(h->slice_type == B_TYPE && h->pps.cabac){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1433 if(IS_8X8(mb_type)){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1434 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
1435 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
1436 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
1437 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1438 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1439 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1440
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1441 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1442 * Decodes a network abstraction layer unit.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1443 * @param consumed is the number of bytes used as input
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1444 * @param length is the length of the array
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
1445 * @param dst_length is the number of decoded bytes FIXME here or a decode rbsp tailing?
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1446 * @returns decoded bytes, might be src+1 if no escapes
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1447 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1448 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
1449 int i, si, di;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1450 uint8_t *dst;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1451
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1452 // src[0]&0x80; //forbidden bit
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1453 h->nal_ref_idc= src[0]>>5;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1454 h->nal_unit_type= src[0]&0x1F;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1455
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1456 src++; length--;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1457 #if 0
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1458 for(i=0; i<length; i++)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1459 printf("%2X ", src[i]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1460 #endif
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1461 for(i=0; i+1<length; i+=2){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1462 if(src[i]) continue;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1463 if(i>0 && src[i-1]==0) i--;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1464 if(i+2<length && src[i+1]==0 && src[i+2]<=3){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1465 if(src[i+2]!=3){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1466 /* startcode, so we must be past the end */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1467 length=i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1468 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1469 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1470 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1471 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1472
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1473 if(i>=length-1){ //no escaped 0
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1474 *dst_length= length;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1475 *consumed= length+1; //+1 for the header
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1476 return src;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1477 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1478
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1479 h->rbsp_buffer= av_fast_realloc(h->rbsp_buffer, &h->rbsp_buffer_size, length);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1480 dst= h->rbsp_buffer;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1481
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
1482 //printf("decoding esc\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1483 si=di=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1484 while(si<length){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1485 //remove escapes (very rare 1:2^22)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1486 if(si+2<length && src[si]==0 && src[si+1]==0 && src[si+2]<=3){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1487 if(src[si+2]==3){ //escape
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1488 dst[di++]= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1489 dst[di++]= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1490 si+=3;
1957
54411768fa38 h264 nal decoding fix by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1956
diff changeset
1491 continue;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1492 }else //next start code
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1493 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1494 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1495
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1496 dst[di++]= src[si++];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1497 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1498
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1499 *dst_length= di;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1500 *consumed= si + 1;//+1 for the header
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1501 //FIXME store exact number of bits in the getbitcontext (its needed for decoding)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1502 return dst;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1503 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1504
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
1505 #if 0
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1506 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1507 * @param src the data which should be escaped
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1508 * @param dst the target buffer, dst+1 == src is allowed as a special case
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1509 * @param length the length of the src data
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1510 * @param dst_length the length of the dst array
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1511 * @returns length of escaped data in bytes or -1 if an error occured
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1512 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1513 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
1514 int i, escape_count, si, di;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1515 uint8_t *temp;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1516
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1517 assert(length>=0);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1518 assert(dst_length>0);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1519
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1520 dst[0]= (h->nal_ref_idc<<5) + h->nal_unit_type;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1521
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1522 if(length==0) return 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1523
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1524 escape_count= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1525 for(i=0; i<length; i+=2){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1526 if(src[i]) continue;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1527 if(i>0 && src[i-1]==0)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1528 i--;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1529 if(i+2<length && src[i+1]==0 && src[i+2]<=3){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1530 escape_count++;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1531 i+=2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1532 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1533 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1534
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1535 if(escape_count==0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1536 if(dst+1 != src)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1537 memcpy(dst+1, src, length);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1538 return length + 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1539 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1540
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1541 if(length + escape_count + 1> dst_length)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1542 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1543
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1544 //this should be damn rare (hopefully)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1545
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1546 h->rbsp_buffer= av_fast_realloc(h->rbsp_buffer, &h->rbsp_buffer_size, length + escape_count);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1547 temp= h->rbsp_buffer;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1548 //printf("encoding esc\n");
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1549
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1550 si= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1551 di= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1552 while(si < length){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1553 if(si+2<length && src[si]==0 && src[si+1]==0 && src[si+2]<=3){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1554 temp[di++]= 0; si++;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1555 temp[di++]= 0; si++;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1556 temp[di++]= 3;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1557 temp[di++]= src[si++];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1558 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1559 else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1560 temp[di++]= src[si++];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1561 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1562 memcpy(dst+1, temp, length+escape_count);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1563
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1564 assert(di == length+escape_count);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1565
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1566 return di + 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1567 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1568
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1569 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1570 * write 1,10,100,1000,... for alignment, yes its exactly inverse to mpeg4
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1571 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1572 static void encode_rbsp_trailing(PutBitContext *pb){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1573 int length;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1574 put_bits(pb, 1, 1);
1786
b7340afa261a get_bit_count -> put_bits_count
alex
parents: 1754
diff changeset
1575 length= (-put_bits_count(pb))&7;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1576 if(length) put_bits(pb, length, 0);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1577 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
1578 #endif
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1579
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1580 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1581 * identifies the exact end of the bitstream
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1582 * @return the length of the trailing, or 0 if damaged
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1583 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1584 static int decode_rbsp_trailing(uint8_t *src){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1585 int v= *src;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1586 int r;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1587
1170
4710976004a5 #ifdef TRACE printf() -> tprintf()
michaelni
parents: 1169
diff changeset
1588 tprintf("rbsp trailing %X\n", v);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1589
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1590 for(r=1; r<9; r++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1591 if(v&1) return r;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1592 v>>=1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1593 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1594 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1595 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1596
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1597 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1598 * idct tranforms the 16 dc values and dequantize them.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1599 * @param qp quantization parameter
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1600 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1601 static void h264_luma_dc_dequant_idct_c(DCTELEM *block, int qp){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1602 const int qmul= dequant_coeff[qp][0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1603 #define stride 16
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1604 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1605 int temp[16]; //FIXME check if this is a good idea
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1606 static const int x_offset[4]={0, 1*stride, 4* stride, 5*stride};
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1607 static const int y_offset[4]={0, 2*stride, 8* stride, 10*stride};
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1608
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1609 //memset(block, 64, 2*256);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1610 //return;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1611 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1612 const int offset= y_offset[i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1613 const int z0= block[offset+stride*0] + block[offset+stride*4];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1614 const int z1= block[offset+stride*0] - block[offset+stride*4];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1615 const int z2= block[offset+stride*1] - block[offset+stride*5];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1616 const int z3= block[offset+stride*1] + block[offset+stride*5];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1617
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1618 temp[4*i+0]= z0+z3;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1619 temp[4*i+1]= z1+z2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1620 temp[4*i+2]= z1-z2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1621 temp[4*i+3]= z0-z3;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1622 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1623
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1624 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1625 const int offset= x_offset[i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1626 const int z0= temp[4*0+i] + temp[4*2+i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1627 const int z1= temp[4*0+i] - temp[4*2+i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1628 const int z2= temp[4*1+i] - temp[4*3+i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1629 const int z3= temp[4*1+i] + temp[4*3+i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1630
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1631 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
1632 block[stride*2 +offset]= ((z1 + z2)*qmul + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1633 block[stride*8 +offset]= ((z1 - z2)*qmul + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1634 block[stride*10+offset]= ((z0 - z3)*qmul + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1635 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1636 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1637
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
1638 #if 0
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1639 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1640 * dct tranforms the 16 dc values.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1641 * @param qp quantization parameter ??? FIXME
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1642 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1643 static void h264_luma_dc_dct_c(DCTELEM *block/*, int qp*/){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1644 // const int qmul= dequant_coeff[qp][0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1645 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1646 int temp[16]; //FIXME check if this is a good idea
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1647 static const int x_offset[4]={0, 1*stride, 4* stride, 5*stride};
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1648 static const int y_offset[4]={0, 2*stride, 8* stride, 10*stride};
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1649
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1650 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1651 const int offset= y_offset[i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1652 const int z0= block[offset+stride*0] + block[offset+stride*4];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1653 const int z1= block[offset+stride*0] - block[offset+stride*4];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1654 const int z2= block[offset+stride*1] - block[offset+stride*5];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1655 const int z3= block[offset+stride*1] + block[offset+stride*5];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1656
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1657 temp[4*i+0]= z0+z3;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1658 temp[4*i+1]= z1+z2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1659 temp[4*i+2]= z1-z2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1660 temp[4*i+3]= z0-z3;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1661 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1662
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1663 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1664 const int offset= x_offset[i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1665 const int z0= temp[4*0+i] + temp[4*2+i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1666 const int z1= temp[4*0+i] - temp[4*2+i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1667 const int z2= temp[4*1+i] - temp[4*3+i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1668 const int z3= temp[4*1+i] + temp[4*3+i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1669
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1670 block[stride*0 +offset]= (z0 + z3)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1671 block[stride*2 +offset]= (z1 + z2)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1672 block[stride*8 +offset]= (z1 - z2)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1673 block[stride*10+offset]= (z0 - z3)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1674 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1675 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
1676 #endif
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
1677
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1678 #undef xStride
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1679 #undef stride
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1680
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1681 static void chroma_dc_dequant_idct_c(DCTELEM *block, int qp){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1682 const int qmul= dequant_coeff[qp][0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1683 const int stride= 16*2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1684 const int xStride= 16;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1685 int a,b,c,d,e;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1686
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1687 a= block[stride*0 + xStride*0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1688 b= block[stride*0 + xStride*1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1689 c= block[stride*1 + xStride*0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1690 d= block[stride*1 + xStride*1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1691
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1692 e= a-b;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1693 a= a+b;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1694 b= c-d;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1695 c= c+d;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1696
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1697 block[stride*0 + xStride*0]= ((a+c)*qmul + 0)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1698 block[stride*0 + xStride*1]= ((e+b)*qmul + 0)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1699 block[stride*1 + xStride*0]= ((a-c)*qmul + 0)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1700 block[stride*1 + xStride*1]= ((e-b)*qmul + 0)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1701 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1702
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
1703 #if 0
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1704 static void chroma_dc_dct_c(DCTELEM *block){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1705 const int stride= 16*2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1706 const int xStride= 16;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1707 int a,b,c,d,e;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1708
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1709 a= block[stride*0 + xStride*0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1710 b= block[stride*0 + xStride*1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1711 c= block[stride*1 + xStride*0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1712 d= block[stride*1 + xStride*1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1713
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1714 e= a-b;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1715 a= a+b;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1716 b= c-d;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1717 c= c+d;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1718
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1719 block[stride*0 + xStride*0]= (a+c);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1720 block[stride*0 + xStride*1]= (e+b);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1721 block[stride*1 + xStride*0]= (a-c);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1722 block[stride*1 + xStride*1]= (e-b);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1723 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
1724 #endif
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1725
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1726 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1727 * gets the chroma qp.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1728 */
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
1729 static inline int get_chroma_qp(int chroma_qp_index_offset, int qscale){
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
1730
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
1731 return chroma_qp[clip(qscale + chroma_qp_index_offset, 0, 51)];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1732 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1733
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1734
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
1735 #if 0
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1736 static void h264_diff_dct_c(DCTELEM *block, uint8_t *src1, uint8_t *src2, int stride){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1737 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1738 //FIXME try int temp instead of block
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1739
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1740 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1741 const int d0= src1[0 + i*stride] - src2[0 + i*stride];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1742 const int d1= src1[1 + i*stride] - src2[1 + i*stride];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1743 const int d2= src1[2 + i*stride] - src2[2 + i*stride];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1744 const int d3= src1[3 + i*stride] - src2[3 + i*stride];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1745 const int z0= d0 + d3;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1746 const int z3= d0 - d3;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1747 const int z1= d1 + d2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1748 const int z2= d1 - d2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1749
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1750 block[0 + 4*i]= z0 + z1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1751 block[1 + 4*i]= 2*z3 + z2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1752 block[2 + 4*i]= z0 - z1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1753 block[3 + 4*i]= z3 - 2*z2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1754 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1755
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1756 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1757 const int z0= block[0*4 + i] + block[3*4 + i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1758 const int z3= block[0*4 + i] - block[3*4 + i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1759 const int z1= block[1*4 + i] + block[2*4 + i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1760 const int z2= block[1*4 + i] - block[2*4 + i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1761
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1762 block[0*4 + i]= z0 + z1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1763 block[1*4 + i]= 2*z3 + z2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1764 block[2*4 + i]= z0 - z1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1765 block[3*4 + i]= z3 - 2*z2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1766 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1767 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
1768 #endif
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1769
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
1770 //FIXME need to check that this doesnt overflow signed 32 bit for low qp, i am not sure, it's very close
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1771 //FIXME check that gcc inlines this (and optimizes intra & seperate_dc stuff away)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1772 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
1773 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1774 const int * const quant_table= quant_coeff[qscale];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1775 const int bias= intra ? (1<<QUANT_SHIFT)/3 : (1<<QUANT_SHIFT)/6;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1776 const unsigned int threshold1= (1<<QUANT_SHIFT) - bias - 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1777 const unsigned int threshold2= (threshold1<<1);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1778 int last_non_zero;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1779
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1780 if(seperate_dc){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1781 if(qscale<=18){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1782 //avoid overflows
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1783 const int dc_bias= intra ? (1<<(QUANT_SHIFT-2))/3 : (1<<(QUANT_SHIFT-2))/6;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1784 const unsigned int dc_threshold1= (1<<(QUANT_SHIFT-2)) - dc_bias - 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1785 const unsigned int dc_threshold2= (dc_threshold1<<1);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1786
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1787 int level= block[0]*quant_coeff[qscale+18][0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1788 if(((unsigned)(level+dc_threshold1))>dc_threshold2){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1789 if(level>0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1790 level= (dc_bias + level)>>(QUANT_SHIFT-2);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1791 block[0]= level;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1792 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1793 level= (dc_bias - level)>>(QUANT_SHIFT-2);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1794 block[0]= -level;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1795 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1796 // last_non_zero = i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1797 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1798 block[0]=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1799 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1800 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1801 const int dc_bias= intra ? (1<<(QUANT_SHIFT+1))/3 : (1<<(QUANT_SHIFT+1))/6;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1802 const unsigned int dc_threshold1= (1<<(QUANT_SHIFT+1)) - dc_bias - 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1803 const unsigned int dc_threshold2= (dc_threshold1<<1);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1804
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1805 int level= block[0]*quant_table[0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1806 if(((unsigned)(level+dc_threshold1))>dc_threshold2){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1807 if(level>0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1808 level= (dc_bias + level)>>(QUANT_SHIFT+1);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1809 block[0]= level;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1810 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1811 level= (dc_bias - level)>>(QUANT_SHIFT+1);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1812 block[0]= -level;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1813 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1814 // last_non_zero = i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1815 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1816 block[0]=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1817 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1818 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1819 last_non_zero= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1820 i=1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1821 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1822 last_non_zero= -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1823 i=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1824 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1825
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1826 for(; i<16; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1827 const int j= scantable[i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1828 int level= block[j]*quant_table[j];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1829
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1830 // if( bias+level >= (1<<(QMAT_SHIFT - 3))
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1831 // || bias-level >= (1<<(QMAT_SHIFT - 3))){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1832 if(((unsigned)(level+threshold1))>threshold2){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1833 if(level>0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1834 level= (bias + level)>>QUANT_SHIFT;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1835 block[j]= level;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1836 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1837 level= (bias - level)>>QUANT_SHIFT;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1838 block[j]= -level;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1839 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1840 last_non_zero = i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1841 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1842 block[j]=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1843 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1844 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1845
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1846 return last_non_zero;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1847 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1848
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1849 static void pred4x4_vertical_c(uint8_t *src, uint8_t *topright, int stride){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1850 const uint32_t a= ((uint32_t*)(src-stride))[0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1851 ((uint32_t*)(src+0*stride))[0]= a;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1852 ((uint32_t*)(src+1*stride))[0]= a;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1853 ((uint32_t*)(src+2*stride))[0]= a;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1854 ((uint32_t*)(src+3*stride))[0]= a;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1855 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1856
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1857 static void pred4x4_horizontal_c(uint8_t *src, uint8_t *topright, int stride){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1858 ((uint32_t*)(src+0*stride))[0]= src[-1+0*stride]*0x01010101;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1859 ((uint32_t*)(src+1*stride))[0]= src[-1+1*stride]*0x01010101;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1860 ((uint32_t*)(src+2*stride))[0]= src[-1+2*stride]*0x01010101;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1861 ((uint32_t*)(src+3*stride))[0]= src[-1+3*stride]*0x01010101;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1862 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1863
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1864 static void pred4x4_dc_c(uint8_t *src, uint8_t *topright, int stride){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1865 const int dc= ( src[-stride] + src[1-stride] + src[2-stride] + src[3-stride]
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1866 + 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
1867
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1868 ((uint32_t*)(src+0*stride))[0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1869 ((uint32_t*)(src+1*stride))[0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1870 ((uint32_t*)(src+2*stride))[0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1871 ((uint32_t*)(src+3*stride))[0]= dc* 0x01010101;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1872 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1873
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1874 static void pred4x4_left_dc_c(uint8_t *src, uint8_t *topright, int stride){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1875 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
1876
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1877 ((uint32_t*)(src+0*stride))[0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1878 ((uint32_t*)(src+1*stride))[0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1879 ((uint32_t*)(src+2*stride))[0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1880 ((uint32_t*)(src+3*stride))[0]= dc* 0x01010101;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1881 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1882
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1883 static void pred4x4_top_dc_c(uint8_t *src, uint8_t *topright, int stride){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1884 const int dc= ( src[-stride] + src[1-stride] + src[2-stride] + src[3-stride] + 2) >>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1885
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1886 ((uint32_t*)(src+0*stride))[0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1887 ((uint32_t*)(src+1*stride))[0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1888 ((uint32_t*)(src+2*stride))[0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1889 ((uint32_t*)(src+3*stride))[0]= dc* 0x01010101;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1890 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1891
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1892 static void pred4x4_128_dc_c(uint8_t *src, uint8_t *topright, int stride){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1893 ((uint32_t*)(src+0*stride))[0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1894 ((uint32_t*)(src+1*stride))[0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1895 ((uint32_t*)(src+2*stride))[0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1896 ((uint32_t*)(src+3*stride))[0]= 128U*0x01010101U;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1897 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1898
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1899
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1900 #define LOAD_TOP_RIGHT_EDGE\
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1901 const int t4= topright[0];\
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1902 const int t5= topright[1];\
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1903 const int t6= topright[2];\
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1904 const int t7= topright[3];\
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1905
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1906 #define LOAD_LEFT_EDGE\
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1907 const int l0= src[-1+0*stride];\
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1908 const int l1= src[-1+1*stride];\
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1909 const int l2= src[-1+2*stride];\
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1910 const int l3= src[-1+3*stride];\
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1911
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1912 #define LOAD_TOP_EDGE\
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1913 const int t0= src[ 0-1*stride];\
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1914 const int t1= src[ 1-1*stride];\
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1915 const int t2= src[ 2-1*stride];\
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1916 const int t3= src[ 3-1*stride];\
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1917
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1918 static void pred4x4_down_right_c(uint8_t *src, uint8_t *topright, int stride){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1919 const int lt= src[-1-1*stride];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1920 LOAD_TOP_EDGE
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1921 LOAD_LEFT_EDGE
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1922
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1923 src[0+3*stride]=(l3 + 2*l2 + l1 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1924 src[0+2*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1925 src[1+3*stride]=(l2 + 2*l1 + l0 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1926 src[0+1*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1927 src[1+2*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1928 src[2+3*stride]=(l1 + 2*l0 + lt + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1929 src[0+0*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1930 src[1+1*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1931 src[2+2*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1932 src[3+3*stride]=(l0 + 2*lt + t0 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1933 src[1+0*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1934 src[2+1*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1935 src[3+2*stride]=(lt + 2*t0 + t1 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1936 src[2+0*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1937 src[3+1*stride]=(t0 + 2*t1 + t2 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1938 src[3+0*stride]=(t1 + 2*t2 + t3 + 2)>>2;
1282
8988af3ae1e8 Warning and compatibility fixes.
mellum
parents: 1269
diff changeset
1939 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1940
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1941 static void pred4x4_down_left_c(uint8_t *src, uint8_t *topright, int stride){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1942 LOAD_TOP_EDGE
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1943 LOAD_TOP_RIGHT_EDGE
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1944 // LOAD_LEFT_EDGE
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1945
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1946 src[0+0*stride]=(t0 + t2 + 2*t1 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1947 src[1+0*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1948 src[0+1*stride]=(t1 + t3 + 2*t2 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1949 src[2+0*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1950 src[1+1*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1951 src[0+2*stride]=(t2 + t4 + 2*t3 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1952 src[3+0*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1953 src[2+1*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1954 src[1+2*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1955 src[0+3*stride]=(t3 + t5 + 2*t4 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1956 src[3+1*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1957 src[2+2*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1958 src[1+3*stride]=(t4 + t6 + 2*t5 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1959 src[3+2*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1960 src[2+3*stride]=(t5 + t7 + 2*t6 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1961 src[3+3*stride]=(t6 + 3*t7 + 2)>>2;
1282
8988af3ae1e8 Warning and compatibility fixes.
mellum
parents: 1269
diff changeset
1962 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1963
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1964 static void pred4x4_vertical_right_c(uint8_t *src, uint8_t *topright, int stride){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1965 const int lt= src[-1-1*stride];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1966 LOAD_TOP_EDGE
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1967 LOAD_LEFT_EDGE
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1968 const __attribute__((unused)) int unu= l3;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1969
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1970 src[0+0*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1971 src[1+2*stride]=(lt + t0 + 1)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1972 src[1+0*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1973 src[2+2*stride]=(t0 + t1 + 1)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1974 src[2+0*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1975 src[3+2*stride]=(t1 + t2 + 1)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1976 src[3+0*stride]=(t2 + t3 + 1)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1977 src[0+1*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1978 src[1+3*stride]=(l0 + 2*lt + t0 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1979 src[1+1*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1980 src[2+3*stride]=(lt + 2*t0 + t1 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1981 src[2+1*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1982 src[3+3*stride]=(t0 + 2*t1 + t2 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1983 src[3+1*stride]=(t1 + 2*t2 + t3 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1984 src[0+2*stride]=(lt + 2*l0 + l1 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1985 src[0+3*stride]=(l0 + 2*l1 + l2 + 2)>>2;
1282
8988af3ae1e8 Warning and compatibility fixes.
mellum
parents: 1269
diff changeset
1986 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1987
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1988 static void pred4x4_vertical_left_c(uint8_t *src, uint8_t *topright, int stride){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1989 LOAD_TOP_EDGE
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1990 LOAD_TOP_RIGHT_EDGE
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1991 const __attribute__((unused)) int unu= t7;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1992
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1993 src[0+0*stride]=(t0 + t1 + 1)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1994 src[1+0*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1995 src[0+2*stride]=(t1 + t2 + 1)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1996 src[2+0*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1997 src[1+2*stride]=(t2 + t3 + 1)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1998 src[3+0*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1999 src[2+2*stride]=(t3 + t4+ 1)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2000 src[3+2*stride]=(t4 + t5+ 1)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2001 src[0+1*stride]=(t0 + 2*t1 + t2 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2002 src[1+1*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2003 src[0+3*stride]=(t1 + 2*t2 + t3 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2004 src[2+1*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2005 src[1+3*stride]=(t2 + 2*t3 + t4 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2006 src[3+1*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2007 src[2+3*stride]=(t3 + 2*t4 + t5 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2008 src[3+3*stride]=(t4 + 2*t5 + t6 + 2)>>2;
1282
8988af3ae1e8 Warning and compatibility fixes.
mellum
parents: 1269
diff changeset
2009 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2010
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2011 static void pred4x4_horizontal_up_c(uint8_t *src, uint8_t *topright, int stride){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2012 LOAD_LEFT_EDGE
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2013
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2014 src[0+0*stride]=(l0 + l1 + 1)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2015 src[1+0*stride]=(l0 + 2*l1 + l2 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2016 src[2+0*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2017 src[0+1*stride]=(l1 + l2 + 1)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2018 src[3+0*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2019 src[1+1*stride]=(l1 + 2*l2 + l3 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2020 src[2+1*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2021 src[0+2*stride]=(l2 + l3 + 1)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2022 src[3+1*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2023 src[1+2*stride]=(l2 + 2*l3 + l3 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2024 src[3+2*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2025 src[1+3*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2026 src[0+3*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2027 src[2+2*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2028 src[2+3*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2029 src[3+3*stride]=l3;
1282
8988af3ae1e8 Warning and compatibility fixes.
mellum
parents: 1269
diff changeset
2030 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2031
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2032 static void pred4x4_horizontal_down_c(uint8_t *src, uint8_t *topright, int stride){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2033 const int lt= src[-1-1*stride];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2034 LOAD_TOP_EDGE
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2035 LOAD_LEFT_EDGE
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2036 const __attribute__((unused)) int unu= t3;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2037
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2038 src[0+0*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2039 src[2+1*stride]=(lt + l0 + 1)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2040 src[1+0*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2041 src[3+1*stride]=(l0 + 2*lt + t0 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2042 src[2+0*stride]=(lt + 2*t0 + t1 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2043 src[3+0*stride]=(t0 + 2*t1 + t2 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2044 src[0+1*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2045 src[2+2*stride]=(l0 + l1 + 1)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2046 src[1+1*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2047 src[3+2*stride]=(lt + 2*l0 + l1 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2048 src[0+2*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2049 src[2+3*stride]=(l1 + l2+ 1)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2050 src[1+2*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2051 src[3+3*stride]=(l0 + 2*l1 + l2 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2052 src[0+3*stride]=(l2 + l3 + 1)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2053 src[1+3*stride]=(l1 + 2*l2 + l3 + 2)>>2;
1282
8988af3ae1e8 Warning and compatibility fixes.
mellum
parents: 1269
diff changeset
2054 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2055
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2056 static void pred16x16_vertical_c(uint8_t *src, int stride){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2057 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2058 const uint32_t a= ((uint32_t*)(src-stride))[0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2059 const uint32_t b= ((uint32_t*)(src-stride))[1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2060 const uint32_t c= ((uint32_t*)(src-stride))[2];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2061 const uint32_t d= ((uint32_t*)(src-stride))[3];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2062
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2063 for(i=0; i<16; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2064 ((uint32_t*)(src+i*stride))[0]= a;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2065 ((uint32_t*)(src+i*stride))[1]= b;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2066 ((uint32_t*)(src+i*stride))[2]= c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2067 ((uint32_t*)(src+i*stride))[3]= d;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2068 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2069 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2070
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2071 static void pred16x16_horizontal_c(uint8_t *src, int stride){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2072 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2073
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2074 for(i=0; i<16; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2075 ((uint32_t*)(src+i*stride))[0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2076 ((uint32_t*)(src+i*stride))[1]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2077 ((uint32_t*)(src+i*stride))[2]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2078 ((uint32_t*)(src+i*stride))[3]= src[-1+i*stride]*0x01010101;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2079 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2080 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2081
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2082 static void pred16x16_dc_c(uint8_t *src, int stride){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2083 int i, dc=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2084
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2085 for(i=0;i<16; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2086 dc+= src[-1+i*stride];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2087 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2088
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2089 for(i=0;i<16; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2090 dc+= src[i-stride];
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 dc= 0x01010101*((dc + 16)>>5);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2094
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2095 for(i=0; i<16; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2096 ((uint32_t*)(src+i*stride))[0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2097 ((uint32_t*)(src+i*stride))[1]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2098 ((uint32_t*)(src+i*stride))[2]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2099 ((uint32_t*)(src+i*stride))[3]= dc;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2100 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2101 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2102
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2103 static void pred16x16_left_dc_c(uint8_t *src, int stride){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2104 int i, dc=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2105
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2106 for(i=0;i<16; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2107 dc+= src[-1+i*stride];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2108 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2109
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2110 dc= 0x01010101*((dc + 8)>>4);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2111
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2112 for(i=0; i<16; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2113 ((uint32_t*)(src+i*stride))[0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2114 ((uint32_t*)(src+i*stride))[1]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2115 ((uint32_t*)(src+i*stride))[2]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2116 ((uint32_t*)(src+i*stride))[3]= dc;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2117 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2118 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2119
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2120 static void pred16x16_top_dc_c(uint8_t *src, int stride){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2121 int i, dc=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2122
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2123 for(i=0;i<16; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2124 dc+= src[i-stride];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2125 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2126 dc= 0x01010101*((dc + 8)>>4);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2127
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2128 for(i=0; i<16; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2129 ((uint32_t*)(src+i*stride))[0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2130 ((uint32_t*)(src+i*stride))[1]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2131 ((uint32_t*)(src+i*stride))[2]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2132 ((uint32_t*)(src+i*stride))[3]= dc;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2133 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2134 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2135
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2136 static void pred16x16_128_dc_c(uint8_t *src, int stride){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2137 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2138
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2139 for(i=0; i<16; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2140 ((uint32_t*)(src+i*stride))[0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2141 ((uint32_t*)(src+i*stride))[1]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2142 ((uint32_t*)(src+i*stride))[2]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2143 ((uint32_t*)(src+i*stride))[3]= 0x01010101U*128U;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2144 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2145 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2146
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
2147 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
2148 int i, j, k;
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
2149 int a;
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
2150 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
2151 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
2152 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
2153 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
2154 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
2155 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
2156 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
2157 src1 += stride; src2 -= stride;
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
2158 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
2159 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
2160 }
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
2161 if(svq3){
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
2162 H = ( 5*(H/4) ) / 16;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
2163 V = ( 5*(V/4) ) / 16;
1330
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1322
diff changeset
2164
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1322
diff changeset
2165 /* required for 100% accuracy */
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1322
diff changeset
2166 i = H; H = V; V = i;
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
2167 }else{
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
2168 H = ( 5*H+32 ) >> 6;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
2169 V = ( 5*V+32 ) >> 6;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
2170 }
1184
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
2171
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
2172 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
2173 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
2174 int b = a;
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
2175 a += V;
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
2176 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
2177 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
2178 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
2179 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
2180 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
2181 b += 4*H;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2182 }
1184
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
2183 src += stride;
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
2184 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2185 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2186
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
2187 static void pred16x16_plane_c(uint8_t *src, int stride){
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
2188 pred16x16_plane_compat_c(src, stride, 0);
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
2189 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
2190
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2191 static void pred8x8_vertical_c(uint8_t *src, int stride){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2192 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2193 const uint32_t a= ((uint32_t*)(src-stride))[0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2194 const uint32_t b= ((uint32_t*)(src-stride))[1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2195
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2196 for(i=0; i<8; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2197 ((uint32_t*)(src+i*stride))[0]= a;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2198 ((uint32_t*)(src+i*stride))[1]= b;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2199 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2200 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2201
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2202 static void pred8x8_horizontal_c(uint8_t *src, int stride){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2203 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2204
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2205 for(i=0; i<8; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2206 ((uint32_t*)(src+i*stride))[0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2207 ((uint32_t*)(src+i*stride))[1]= src[-1+i*stride]*0x01010101;
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
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2211 static void pred8x8_128_dc_c(uint8_t *src, int stride){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2212 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2213
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2214 for(i=0; i<8; i++){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2215 ((uint32_t*)(src+i*stride))[0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2216 ((uint32_t*)(src+i*stride))[1]= 0x01010101U*128U;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2217 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2218 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2219
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2220 static void pred8x8_left_dc_c(uint8_t *src, int stride){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2221 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2222 int dc0, dc2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2223
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2224 dc0=dc2=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2225 for(i=0;i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2226 dc0+= src[-1+i*stride];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2227 dc2+= src[-1+(i+4)*stride];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2228 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2229 dc0= 0x01010101*((dc0 + 2)>>2);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2230 dc2= 0x01010101*((dc2 + 2)>>2);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2231
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2232 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2233 ((uint32_t*)(src+i*stride))[0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2234 ((uint32_t*)(src+i*stride))[1]= dc0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2235 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2236 for(i=4; i<8; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2237 ((uint32_t*)(src+i*stride))[0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2238 ((uint32_t*)(src+i*stride))[1]= dc2;
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
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2242 static void pred8x8_top_dc_c(uint8_t *src, int stride){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2243 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2244 int dc0, dc1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2245
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2246 dc0=dc1=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2247 for(i=0;i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2248 dc0+= src[i-stride];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2249 dc1+= src[4+i-stride];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2250 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2251 dc0= 0x01010101*((dc0 + 2)>>2);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2252 dc1= 0x01010101*((dc1 + 2)>>2);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2253
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2254 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2255 ((uint32_t*)(src+i*stride))[0]= dc0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2256 ((uint32_t*)(src+i*stride))[1]= dc1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2257 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2258 for(i=4; i<8; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2259 ((uint32_t*)(src+i*stride))[0]= dc0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2260 ((uint32_t*)(src+i*stride))[1]= dc1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2261 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2262 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2263
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2264
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2265 static void pred8x8_dc_c(uint8_t *src, int stride){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2266 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2267 int dc0, dc1, dc2, dc3;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2268
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2269 dc0=dc1=dc2=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2270 for(i=0;i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2271 dc0+= src[-1+i*stride] + src[i-stride];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2272 dc1+= src[4+i-stride];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2273 dc2+= src[-1+(i+4)*stride];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2274 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2275 dc3= 0x01010101*((dc1 + dc2 + 4)>>3);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2276 dc0= 0x01010101*((dc0 + 4)>>3);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2277 dc1= 0x01010101*((dc1 + 2)>>2);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2278 dc2= 0x01010101*((dc2 + 2)>>2);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2279
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2280 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2281 ((uint32_t*)(src+i*stride))[0]= dc0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2282 ((uint32_t*)(src+i*stride))[1]= dc1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2283 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2284 for(i=4; i<8; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2285 ((uint32_t*)(src+i*stride))[0]= dc2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2286 ((uint32_t*)(src+i*stride))[1]= dc3;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2287 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2288 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2289
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2290 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
2291 int j, k;
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
2292 int a;
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
2293 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
2294 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
2295 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
2296 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
2297 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
2298 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
2299 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
2300 src1 += stride; src2 -= stride;
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
2301 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
2302 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
2303 }
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
2304 H = ( 17*H+16 ) >> 5;
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
2305 V = ( 17*V+16 ) >> 5;
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
2306
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
2307 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
2308 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
2309 int b = a;
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
2310 a += V;
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
2311 src[0] = cm[ (b ) >> 5 ];
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
2312 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
2313 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
2314 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
2315 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
2316 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
2317 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
2318 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
2319 src += stride;
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
2320 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2321 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2322
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2323 #define SRC(x,y) src[(x)+(y)*stride]
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2324 #define PL(y) \
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2325 const int l##y = (SRC(-1,y-1) + 2*SRC(-1,y) + SRC(-1,y+1) + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2326 #define PREDICT_8x8_LOAD_LEFT \
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2327 const int l0 = ((has_topleft ? SRC(-1,-1) : SRC(-1,0)) \
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2328 + 2*SRC(-1,0) + SRC(-1,1) + 2) >> 2; \
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2329 PL(1) PL(2) PL(3) PL(4) PL(5) PL(6) \
2834
fd5d7c732c6b kill a bunch of compiler warnings
mru
parents: 2815
diff changeset
2330 const int l7 attribute_unused = (SRC(-1,6) + 3*SRC(-1,7) + 2) >> 2
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2331
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2332 #define PT(x) \
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2333 const int t##x = (SRC(x-1,-1) + 2*SRC(x,-1) + SRC(x+1,-1) + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2334 #define PREDICT_8x8_LOAD_TOP \
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2335 const int t0 = ((has_topleft ? SRC(-1,-1) : SRC(0,-1)) \
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2336 + 2*SRC(0,-1) + SRC(1,-1) + 2) >> 2; \
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2337 PT(1) PT(2) PT(3) PT(4) PT(5) PT(6) \
2834
fd5d7c732c6b kill a bunch of compiler warnings
mru
parents: 2815
diff changeset
2338 const int t7 attribute_unused = ((has_topright ? SRC(8,-1) : SRC(7,-1)) \
2757
fa1c8955e291 remove mixed code/declarations
mru
parents: 2755
diff changeset
2339 + 2*SRC(7,-1) + SRC(6,-1) + 2) >> 2
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2340
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2341 #define PTR(x) \
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2342 t##x = (SRC(x-1,-1) + 2*SRC(x,-1) + SRC(x+1,-1) + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2343 #define PREDICT_8x8_LOAD_TOPRIGHT \
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2344 int t8, t9, t10, t11, t12, t13, t14, t15; \
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2345 if(has_topright) { \
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2346 PTR(8) PTR(9) PTR(10) PTR(11) PTR(12) PTR(13) PTR(14) \
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2347 t15 = (SRC(14,-1) + 3*SRC(15,-1) + 2) >> 2; \
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2348 } else t8=t9=t10=t11=t12=t13=t14=t15= SRC(7,-1);
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2349
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2350 #define PREDICT_8x8_LOAD_TOPLEFT \
2757
fa1c8955e291 remove mixed code/declarations
mru
parents: 2755
diff changeset
2351 const int lt = (SRC(-1,0) + 2*SRC(-1,-1) + SRC(0,-1) + 2) >> 2
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2352
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2353 #define PREDICT_8x8_DC(v) \
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2354 int y; \
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2355 for( y = 0; y < 8; y++ ) { \
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2356 ((uint32_t*)src)[0] = \
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2357 ((uint32_t*)src)[1] = v; \
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2358 src += stride; \
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2359 }
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2360
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2361 static void pred8x8l_128_dc_c(uint8_t *src, int has_topleft, int has_topright, int stride)
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2362 {
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2363 PREDICT_8x8_DC(0x80808080);
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2364 }
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2365 static void pred8x8l_left_dc_c(uint8_t *src, int has_topleft, int has_topright, int stride)
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2366 {
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2367 PREDICT_8x8_LOAD_LEFT;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2368 const uint32_t dc = ((l0+l1+l2+l3+l4+l5+l6+l7+4) >> 3) * 0x01010101;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2369 PREDICT_8x8_DC(dc);
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2370 }
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2371 static void pred8x8l_top_dc_c(uint8_t *src, int has_topleft, int has_topright, int stride)
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2372 {
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2373 PREDICT_8x8_LOAD_TOP;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2374 const uint32_t dc = ((t0+t1+t2+t3+t4+t5+t6+t7+4) >> 3) * 0x01010101;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2375 PREDICT_8x8_DC(dc);
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2376 }
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2377 static void pred8x8l_dc_c(uint8_t *src, int has_topleft, int has_topright, int stride)
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2378 {
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2379 PREDICT_8x8_LOAD_LEFT;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2380 PREDICT_8x8_LOAD_TOP;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2381 const uint32_t dc = ((l0+l1+l2+l3+l4+l5+l6+l7
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2382 +t0+t1+t2+t3+t4+t5+t6+t7+8) >> 4) * 0x01010101;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2383 PREDICT_8x8_DC(dc);
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2384 }
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2385 static void pred8x8l_horizontal_c(uint8_t *src, int has_topleft, int has_topright, int stride)
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2386 {
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2387 PREDICT_8x8_LOAD_LEFT;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2388 #define ROW(y) ((uint32_t*)(src+y*stride))[0] =\
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2389 ((uint32_t*)(src+y*stride))[1] = 0x01010101 * l##y
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2390 ROW(0); ROW(1); ROW(2); ROW(3); ROW(4); ROW(5); ROW(6); ROW(7);
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2391 #undef ROW
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2392 }
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2393 static void pred8x8l_vertical_c(uint8_t *src, int has_topleft, int has_topright, int stride)
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2394 {
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2395 int y;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2396 PREDICT_8x8_LOAD_TOP;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2397 src[0] = t0;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2398 src[1] = t1;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2399 src[2] = t2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2400 src[3] = t3;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2401 src[4] = t4;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2402 src[5] = t5;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2403 src[6] = t6;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2404 src[7] = t7;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2405 for( y = 1; y < 8; y++ )
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2406 *(uint64_t*)(src+y*stride) = *(uint64_t*)src;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2407 }
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2408 static void pred8x8l_down_left_c(uint8_t *src, int has_topleft, int has_topright, int stride)
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2409 {
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2410 PREDICT_8x8_LOAD_TOP;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2411 PREDICT_8x8_LOAD_TOPRIGHT;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2412 SRC(0,0)= (t0 + 2*t1 + t2 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2413 SRC(0,1)=SRC(1,0)= (t1 + 2*t2 + t3 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2414 SRC(0,2)=SRC(1,1)=SRC(2,0)= (t2 + 2*t3 + t4 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2415 SRC(0,3)=SRC(1,2)=SRC(2,1)=SRC(3,0)= (t3 + 2*t4 + t5 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2416 SRC(0,4)=SRC(1,3)=SRC(2,2)=SRC(3,1)=SRC(4,0)= (t4 + 2*t5 + t6 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2417 SRC(0,5)=SRC(1,4)=SRC(2,3)=SRC(3,2)=SRC(4,1)=SRC(5,0)= (t5 + 2*t6 + t7 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2418 SRC(0,6)=SRC(1,5)=SRC(2,4)=SRC(3,3)=SRC(4,2)=SRC(5,1)=SRC(6,0)= (t6 + 2*t7 + t8 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2419 SRC(0,7)=SRC(1,6)=SRC(2,5)=SRC(3,4)=SRC(4,3)=SRC(5,2)=SRC(6,1)=SRC(7,0)= (t7 + 2*t8 + t9 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2420 SRC(1,7)=SRC(2,6)=SRC(3,5)=SRC(4,4)=SRC(5,3)=SRC(6,2)=SRC(7,1)= (t8 + 2*t9 + t10 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2421 SRC(2,7)=SRC(3,6)=SRC(4,5)=SRC(5,4)=SRC(6,3)=SRC(7,2)= (t9 + 2*t10 + t11 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2422 SRC(3,7)=SRC(4,6)=SRC(5,5)=SRC(6,4)=SRC(7,3)= (t10 + 2*t11 + t12 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2423 SRC(4,7)=SRC(5,6)=SRC(6,5)=SRC(7,4)= (t11 + 2*t12 + t13 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2424 SRC(5,7)=SRC(6,6)=SRC(7,5)= (t12 + 2*t13 + t14 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2425 SRC(6,7)=SRC(7,6)= (t13 + 2*t14 + t15 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2426 SRC(7,7)= (t14 + 3*t15 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2427 }
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2428 static void pred8x8l_down_right_c(uint8_t *src, int has_topleft, int has_topright, int stride)
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2429 {
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2430 PREDICT_8x8_LOAD_TOP;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2431 PREDICT_8x8_LOAD_LEFT;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2432 PREDICT_8x8_LOAD_TOPLEFT;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2433 SRC(0,7)= (l7 + 2*l6 + l5 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2434 SRC(0,6)=SRC(1,7)= (l6 + 2*l5 + l4 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2435 SRC(0,5)=SRC(1,6)=SRC(2,7)= (l5 + 2*l4 + l3 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2436 SRC(0,4)=SRC(1,5)=SRC(2,6)=SRC(3,7)= (l4 + 2*l3 + l2 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2437 SRC(0,3)=SRC(1,4)=SRC(2,5)=SRC(3,6)=SRC(4,7)= (l3 + 2*l2 + l1 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2438 SRC(0,2)=SRC(1,3)=SRC(2,4)=SRC(3,5)=SRC(4,6)=SRC(5,7)= (l2 + 2*l1 + l0 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2439 SRC(0,1)=SRC(1,2)=SRC(2,3)=SRC(3,4)=SRC(4,5)=SRC(5,6)=SRC(6,7)= (l1 + 2*l0 + lt + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2440 SRC(0,0)=SRC(1,1)=SRC(2,2)=SRC(3,3)=SRC(4,4)=SRC(5,5)=SRC(6,6)=SRC(7,7)= (l0 + 2*lt + t0 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2441 SRC(1,0)=SRC(2,1)=SRC(3,2)=SRC(4,3)=SRC(5,4)=SRC(6,5)=SRC(7,6)= (lt + 2*t0 + t1 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2442 SRC(2,0)=SRC(3,1)=SRC(4,2)=SRC(5,3)=SRC(6,4)=SRC(7,5)= (t0 + 2*t1 + t2 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2443 SRC(3,0)=SRC(4,1)=SRC(5,2)=SRC(6,3)=SRC(7,4)= (t1 + 2*t2 + t3 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2444 SRC(4,0)=SRC(5,1)=SRC(6,2)=SRC(7,3)= (t2 + 2*t3 + t4 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2445 SRC(5,0)=SRC(6,1)=SRC(7,2)= (t3 + 2*t4 + t5 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2446 SRC(6,0)=SRC(7,1)= (t4 + 2*t5 + t6 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2447 SRC(7,0)= (t5 + 2*t6 + t7 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2448
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2449 }
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2450 static void pred8x8l_vertical_right_c(uint8_t *src, int has_topleft, int has_topright, int stride)
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2451 {
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2452 PREDICT_8x8_LOAD_TOP;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2453 PREDICT_8x8_LOAD_LEFT;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2454 PREDICT_8x8_LOAD_TOPLEFT;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2455 SRC(0,6)= (l5 + 2*l4 + l3 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2456 SRC(0,7)= (l6 + 2*l5 + l4 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2457 SRC(0,4)=SRC(1,6)= (l3 + 2*l2 + l1 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2458 SRC(0,5)=SRC(1,7)= (l4 + 2*l3 + l2 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2459 SRC(0,2)=SRC(1,4)=SRC(2,6)= (l1 + 2*l0 + lt + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2460 SRC(0,3)=SRC(1,5)=SRC(2,7)= (l2 + 2*l1 + l0 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2461 SRC(0,1)=SRC(1,3)=SRC(2,5)=SRC(3,7)= (l0 + 2*lt + t0 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2462 SRC(0,0)=SRC(1,2)=SRC(2,4)=SRC(3,6)= (lt + t0 + 1) >> 1;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2463 SRC(1,1)=SRC(2,3)=SRC(3,5)=SRC(4,7)= (lt + 2*t0 + t1 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2464 SRC(1,0)=SRC(2,2)=SRC(3,4)=SRC(4,6)= (t0 + t1 + 1) >> 1;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2465 SRC(2,1)=SRC(3,3)=SRC(4,5)=SRC(5,7)= (t0 + 2*t1 + t2 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2466 SRC(2,0)=SRC(3,2)=SRC(4,4)=SRC(5,6)= (t1 + t2 + 1) >> 1;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2467 SRC(3,1)=SRC(4,3)=SRC(5,5)=SRC(6,7)= (t1 + 2*t2 + t3 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2468 SRC(3,0)=SRC(4,2)=SRC(5,4)=SRC(6,6)= (t2 + t3 + 1) >> 1;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2469 SRC(4,1)=SRC(5,3)=SRC(6,5)=SRC(7,7)= (t2 + 2*t3 + t4 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2470 SRC(4,0)=SRC(5,2)=SRC(6,4)=SRC(7,6)= (t3 + t4 + 1) >> 1;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2471 SRC(5,1)=SRC(6,3)=SRC(7,5)= (t3 + 2*t4 + t5 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2472 SRC(5,0)=SRC(6,2)=SRC(7,4)= (t4 + t5 + 1) >> 1;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2473 SRC(6,1)=SRC(7,3)= (t4 + 2*t5 + t6 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2474 SRC(6,0)=SRC(7,2)= (t5 + t6 + 1) >> 1;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2475 SRC(7,1)= (t5 + 2*t6 + t7 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2476 SRC(7,0)= (t6 + t7 + 1) >> 1;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2477 }
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2478 static void pred8x8l_horizontal_down_c(uint8_t *src, int has_topleft, int has_topright, int stride)
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2479 {
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2480 PREDICT_8x8_LOAD_TOP;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2481 PREDICT_8x8_LOAD_LEFT;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2482 PREDICT_8x8_LOAD_TOPLEFT;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2483 SRC(0,7)= (l6 + l7 + 1) >> 1;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2484 SRC(1,7)= (l5 + 2*l6 + l7 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2485 SRC(0,6)=SRC(2,7)= (l5 + l6 + 1) >> 1;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2486 SRC(1,6)=SRC(3,7)= (l4 + 2*l5 + l6 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2487 SRC(0,5)=SRC(2,6)=SRC(4,7)= (l4 + l5 + 1) >> 1;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2488 SRC(1,5)=SRC(3,6)=SRC(5,7)= (l3 + 2*l4 + l5 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2489 SRC(0,4)=SRC(2,5)=SRC(4,6)=SRC(6,7)= (l3 + l4 + 1) >> 1;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2490 SRC(1,4)=SRC(3,5)=SRC(5,6)=SRC(7,7)= (l2 + 2*l3 + l4 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2491 SRC(0,3)=SRC(2,4)=SRC(4,5)=SRC(6,6)= (l2 + l3 + 1) >> 1;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2492 SRC(1,3)=SRC(3,4)=SRC(5,5)=SRC(7,6)= (l1 + 2*l2 + l3 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2493 SRC(0,2)=SRC(2,3)=SRC(4,4)=SRC(6,5)= (l1 + l2 + 1) >> 1;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2494 SRC(1,2)=SRC(3,3)=SRC(5,4)=SRC(7,5)= (l0 + 2*l1 + l2 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2495 SRC(0,1)=SRC(2,2)=SRC(4,3)=SRC(6,4)= (l0 + l1 + 1) >> 1;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2496 SRC(1,1)=SRC(3,2)=SRC(5,3)=SRC(7,4)= (lt + 2*l0 + l1 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2497 SRC(0,0)=SRC(2,1)=SRC(4,2)=SRC(6,3)= (lt + l0 + 1) >> 1;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2498 SRC(1,0)=SRC(3,1)=SRC(5,2)=SRC(7,3)= (l0 + 2*lt + t0 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2499 SRC(2,0)=SRC(4,1)=SRC(6,2)= (t1 + 2*t0 + lt + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2500 SRC(3,0)=SRC(5,1)=SRC(7,2)= (t2 + 2*t1 + t0 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2501 SRC(4,0)=SRC(6,1)= (t3 + 2*t2 + t1 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2502 SRC(5,0)=SRC(7,1)= (t4 + 2*t3 + t2 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2503 SRC(6,0)= (t5 + 2*t4 + t3 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2504 SRC(7,0)= (t6 + 2*t5 + t4 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2505 }
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2506 static void pred8x8l_vertical_left_c(uint8_t *src, int has_topleft, int has_topright, int stride)
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2507 {
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2508 PREDICT_8x8_LOAD_TOP;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2509 PREDICT_8x8_LOAD_TOPRIGHT;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2510 SRC(0,0)= (t0 + t1 + 1) >> 1;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2511 SRC(0,1)= (t0 + 2*t1 + t2 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2512 SRC(0,2)=SRC(1,0)= (t1 + t2 + 1) >> 1;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2513 SRC(0,3)=SRC(1,1)= (t1 + 2*t2 + t3 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2514 SRC(0,4)=SRC(1,2)=SRC(2,0)= (t2 + t3 + 1) >> 1;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2515 SRC(0,5)=SRC(1,3)=SRC(2,1)= (t2 + 2*t3 + t4 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2516 SRC(0,6)=SRC(1,4)=SRC(2,2)=SRC(3,0)= (t3 + t4 + 1) >> 1;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2517 SRC(0,7)=SRC(1,5)=SRC(2,3)=SRC(3,1)= (t3 + 2*t4 + t5 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2518 SRC(1,6)=SRC(2,4)=SRC(3,2)=SRC(4,0)= (t4 + t5 + 1) >> 1;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2519 SRC(1,7)=SRC(2,5)=SRC(3,3)=SRC(4,1)= (t4 + 2*t5 + t6 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2520 SRC(2,6)=SRC(3,4)=SRC(4,2)=SRC(5,0)= (t5 + t6 + 1) >> 1;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2521 SRC(2,7)=SRC(3,5)=SRC(4,3)=SRC(5,1)= (t5 + 2*t6 + t7 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2522 SRC(3,6)=SRC(4,4)=SRC(5,2)=SRC(6,0)= (t6 + t7 + 1) >> 1;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2523 SRC(3,7)=SRC(4,5)=SRC(5,3)=SRC(6,1)= (t6 + 2*t7 + t8 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2524 SRC(4,6)=SRC(5,4)=SRC(6,2)=SRC(7,0)= (t7 + t8 + 1) >> 1;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2525 SRC(4,7)=SRC(5,5)=SRC(6,3)=SRC(7,1)= (t7 + 2*t8 + t9 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2526 SRC(5,6)=SRC(6,4)=SRC(7,2)= (t8 + t9 + 1) >> 1;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2527 SRC(5,7)=SRC(6,5)=SRC(7,3)= (t8 + 2*t9 + t10 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2528 SRC(6,6)=SRC(7,4)= (t9 + t10 + 1) >> 1;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2529 SRC(6,7)=SRC(7,5)= (t9 + 2*t10 + t11 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2530 SRC(7,6)= (t10 + t11 + 1) >> 1;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2531 SRC(7,7)= (t10 + 2*t11 + t12 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2532 }
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2533 static void pred8x8l_horizontal_up_c(uint8_t *src, int has_topleft, int has_topright, int stride)
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2534 {
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2535 PREDICT_8x8_LOAD_LEFT;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2536 SRC(0,0)= (l0 + l1 + 1) >> 1;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2537 SRC(1,0)= (l0 + 2*l1 + l2 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2538 SRC(0,1)=SRC(2,0)= (l1 + l2 + 1) >> 1;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2539 SRC(1,1)=SRC(3,0)= (l1 + 2*l2 + l3 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2540 SRC(0,2)=SRC(2,1)=SRC(4,0)= (l2 + l3 + 1) >> 1;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2541 SRC(1,2)=SRC(3,1)=SRC(5,0)= (l2 + 2*l3 + l4 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2542 SRC(0,3)=SRC(2,2)=SRC(4,1)=SRC(6,0)= (l3 + l4 + 1) >> 1;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2543 SRC(1,3)=SRC(3,2)=SRC(5,1)=SRC(7,0)= (l3 + 2*l4 + l5 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2544 SRC(0,4)=SRC(2,3)=SRC(4,2)=SRC(6,1)= (l4 + l5 + 1) >> 1;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2545 SRC(1,4)=SRC(3,3)=SRC(5,2)=SRC(7,1)= (l4 + 2*l5 + l6 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2546 SRC(0,5)=SRC(2,4)=SRC(4,3)=SRC(6,2)= (l5 + l6 + 1) >> 1;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2547 SRC(1,5)=SRC(3,4)=SRC(5,3)=SRC(7,2)= (l5 + 2*l6 + l7 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2548 SRC(0,6)=SRC(2,5)=SRC(4,4)=SRC(6,3)= (l6 + l7 + 1) >> 1;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2549 SRC(1,6)=SRC(3,5)=SRC(5,4)=SRC(7,3)= (l6 + 3*l7 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2550 SRC(0,7)=SRC(1,7)=SRC(2,6)=SRC(2,7)=SRC(3,6)=
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2551 SRC(3,7)=SRC(4,5)=SRC(4,6)=SRC(4,7)=SRC(5,5)=
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2552 SRC(5,6)=SRC(5,7)=SRC(6,4)=SRC(6,5)=SRC(6,6)=
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2553 SRC(6,7)=SRC(7,4)=SRC(7,5)=SRC(7,6)=SRC(7,7)= l7;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2554 }
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2555 #undef PREDICT_8x8_LOAD_LEFT
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2556 #undef PREDICT_8x8_LOAD_TOP
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2557 #undef PREDICT_8x8_LOAD_TOPLEFT
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2558 #undef PREDICT_8x8_LOAD_TOPRIGHT
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2559 #undef PREDICT_8x8_DC
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2560 #undef PTR
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2561 #undef PT
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2562 #undef PL
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2563 #undef SRC
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2564
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2565 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
2566 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2567 int src_x_offset, int src_y_offset,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2568 qpel_mc_func *qpix_op, h264_chroma_mc_func chroma_op){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2569 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2570 const int mx= h->mv_cache[list][ scan8[n] ][0] + src_x_offset*8;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2571 const int my= h->mv_cache[list][ scan8[n] ][1] + src_y_offset*8;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2572 const int luma_xy= (mx&3) + ((my&3)<<2);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2573 uint8_t * src_y = pic->data[0] + (mx>>2) + (my>>2)*s->linesize;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2574 uint8_t * src_cb= pic->data[1] + (mx>>3) + (my>>3)*s->uvlinesize;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2575 uint8_t * src_cr= pic->data[2] + (mx>>3) + (my>>3)*s->uvlinesize;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2576 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
2577 int extra_height= extra_width;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2578 int emu=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2579 const int full_mx= mx>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2580 const int full_my= my>>2;
2861
3b920e274b26 fix emulated edge motion compensation when resolution%16!=0
lorenm
parents: 2846
diff changeset
2581 const int pic_width = 16*s->mb_width;
3b920e274b26 fix emulated edge motion compensation when resolution%16!=0
lorenm
parents: 2846
diff changeset
2582 const int pic_height = 16*s->mb_height;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2583
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2584 assert(pic->data[0]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2585
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2586 if(mx&7) extra_width -= 3;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2587 if(my&7) extra_height -= 3;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2588
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2589 if( full_mx < 0-extra_width
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2590 || full_my < 0-extra_height
2861
3b920e274b26 fix emulated edge motion compensation when resolution%16!=0
lorenm
parents: 2846
diff changeset
2591 || full_mx + 16/*FIXME*/ > pic_width + extra_width
3b920e274b26 fix emulated edge motion compensation when resolution%16!=0
lorenm
parents: 2846
diff changeset
2592 || full_my + 16/*FIXME*/ > pic_height + extra_height){
3b920e274b26 fix emulated edge motion compensation when resolution%16!=0
lorenm
parents: 2846
diff changeset
2593 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, pic_width, pic_height);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2594 src_y= s->edge_emu_buffer + 2 + 2*s->linesize;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2595 emu=1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2596 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2597
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2598 qpix_op[luma_xy](dest_y, src_y, s->linesize); //FIXME try variable height perhaps?
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2599 if(!square){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2600 qpix_op[luma_xy](dest_y + delta, src_y + delta, s->linesize);
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 if(s->flags&CODEC_FLAG_GRAY) return;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2604
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2605 if(emu){
2861
3b920e274b26 fix emulated edge motion compensation when resolution%16!=0
lorenm
parents: 2846
diff changeset
2606 ff_emulated_edge_mc(s->edge_emu_buffer, src_cb, s->uvlinesize, 9, 9/*FIXME*/, (mx>>3), (my>>3), pic_width>>1, pic_height>>1);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2607 src_cb= s->edge_emu_buffer;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2608 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2609 chroma_op(dest_cb, src_cb, s->uvlinesize, chroma_height, mx&7, my&7);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2610
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2611 if(emu){
2861
3b920e274b26 fix emulated edge motion compensation when resolution%16!=0
lorenm
parents: 2846
diff changeset
2612 ff_emulated_edge_mc(s->edge_emu_buffer, src_cr, s->uvlinesize, 9, 9/*FIXME*/, (mx>>3), (my>>3), pic_width>>1, pic_height>>1);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2613 src_cr= s->edge_emu_buffer;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2614 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2615 chroma_op(dest_cr, src_cr, s->uvlinesize, chroma_height, mx&7, my&7);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2616 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2617
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2618 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
2619 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2620 int x_offset, int y_offset,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2621 qpel_mc_func *qpix_put, h264_chroma_mc_func chroma_put,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2622 qpel_mc_func *qpix_avg, h264_chroma_mc_func chroma_avg,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2623 int list0, int list1){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2624 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2625 qpel_mc_func *qpix_op= qpix_put;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2626 h264_chroma_mc_func chroma_op= chroma_put;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2627
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2628 dest_y += 2*x_offset + 2*y_offset*s-> linesize;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2629 dest_cb += x_offset + y_offset*s->uvlinesize;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2630 dest_cr += x_offset + y_offset*s->uvlinesize;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2631 x_offset += 8*s->mb_x;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2632 y_offset += 8*s->mb_y;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2633
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2634 if(list0){
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
2635 Picture *ref= &h->ref_list[0][ h->ref_cache[0][ scan8[n] ] ];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2636 mc_dir_part(h, ref, n, square, chroma_height, delta, 0,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2637 dest_y, dest_cb, dest_cr, x_offset, y_offset,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2638 qpix_op, chroma_op);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2639
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2640 qpix_op= qpix_avg;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2641 chroma_op= chroma_avg;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2642 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2643
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2644 if(list1){
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
2645 Picture *ref= &h->ref_list[1][ h->ref_cache[1][ scan8[n] ] ];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2646 mc_dir_part(h, ref, n, square, chroma_height, delta, 1,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2647 dest_y, dest_cb, dest_cr, x_offset, y_offset,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2648 qpix_op, chroma_op);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2649 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2650 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2651
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2652 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
2653 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2654 int x_offset, int y_offset,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2655 qpel_mc_func *qpix_put, h264_chroma_mc_func chroma_put,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2656 h264_weight_func luma_weight_op, h264_weight_func chroma_weight_op,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2657 h264_biweight_func luma_weight_avg, h264_biweight_func chroma_weight_avg,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2658 int list0, int list1){
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2659 MpegEncContext * const s = &h->s;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2660
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2661 dest_y += 2*x_offset + 2*y_offset*s-> linesize;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2662 dest_cb += x_offset + y_offset*s->uvlinesize;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2663 dest_cr += x_offset + y_offset*s->uvlinesize;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2664 x_offset += 8*s->mb_x;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2665 y_offset += 8*s->mb_y;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2666
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2667 if(list0 && list1){
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2668 /* don't optimize for luma-only case, since B-frames usually
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2669 * use implicit weights => chroma too. */
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2670 uint8_t *tmp_cb = s->obmc_scratchpad;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2671 uint8_t *tmp_cr = tmp_cb + 8*s->uvlinesize;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2672 uint8_t *tmp_y = tmp_cr + 8*s->uvlinesize;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2673 int refn0 = h->ref_cache[0][ scan8[n] ];
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2674 int refn1 = h->ref_cache[1][ scan8[n] ];
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2675
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2676 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
2677 dest_y, dest_cb, dest_cr,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2678 x_offset, y_offset, qpix_put, chroma_put);
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2679 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
2680 tmp_y, tmp_cb, tmp_cr,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2681 x_offset, y_offset, qpix_put, chroma_put);
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2682
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2683 if(h->use_weight == 2){
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2684 int weight0 = h->implicit_weight[refn0][refn1];
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2685 int weight1 = 64 - weight0;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2686 luma_weight_avg( dest_y, tmp_y, s-> linesize, 5, weight0, weight1, 0, 0);
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2687 chroma_weight_avg(dest_cb, tmp_cb, s->uvlinesize, 5, weight0, weight1, 0, 0);
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2688 chroma_weight_avg(dest_cr, tmp_cr, s->uvlinesize, 5, weight0, weight1, 0, 0);
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2689 }else{
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2690 luma_weight_avg(dest_y, tmp_y, s->linesize, h->luma_log2_weight_denom,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2691 h->luma_weight[0][refn0], h->luma_weight[1][refn1],
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2692 h->luma_offset[0][refn0], h->luma_offset[1][refn1]);
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2693 chroma_weight_avg(dest_cb, tmp_cb, s->uvlinesize, h->chroma_log2_weight_denom,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2694 h->chroma_weight[0][refn0][0], h->chroma_weight[1][refn1][0],
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2695 h->chroma_offset[0][refn0][0], h->chroma_offset[1][refn1][0]);
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2696 chroma_weight_avg(dest_cr, tmp_cr, s->uvlinesize, h->chroma_log2_weight_denom,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2697 h->chroma_weight[0][refn0][1], h->chroma_weight[1][refn1][1],
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2698 h->chroma_offset[0][refn0][1], h->chroma_offset[1][refn1][1]);
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2699 }
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2700 }else{
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2701 int list = list1 ? 1 : 0;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2702 int refn = h->ref_cache[list][ scan8[n] ];
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2703 Picture *ref= &h->ref_list[list][refn];
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2704 mc_dir_part(h, ref, n, square, chroma_height, delta, list,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2705 dest_y, dest_cb, dest_cr, x_offset, y_offset,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2706 qpix_put, chroma_put);
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2707
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2708 luma_weight_op(dest_y, s->linesize, h->luma_log2_weight_denom,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2709 h->luma_weight[list][refn], h->luma_offset[list][refn]);
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2710 if(h->use_weight_chroma){
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2711 chroma_weight_op(dest_cb, s->uvlinesize, h->chroma_log2_weight_denom,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2712 h->chroma_weight[list][refn][0], h->chroma_offset[list][refn][0]);
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2713 chroma_weight_op(dest_cr, s->uvlinesize, h->chroma_log2_weight_denom,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2714 h->chroma_weight[list][refn][1], h->chroma_offset[list][refn][1]);
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2715 }
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2716 }
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2717 }
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2718
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2719 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
2720 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2721 int x_offset, int y_offset,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2722 qpel_mc_func *qpix_put, h264_chroma_mc_func chroma_put,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2723 qpel_mc_func *qpix_avg, h264_chroma_mc_func chroma_avg,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2724 h264_weight_func *weight_op, h264_biweight_func *weight_avg,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2725 int list0, int list1){
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2726 if((h->use_weight==2 && list0 && list1
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2727 && (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
2728 || h->use_weight==1)
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2729 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
2730 x_offset, y_offset, qpix_put, chroma_put,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2731 weight_op[0], weight_op[3], weight_avg[0], weight_avg[3], list0, list1);
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2732 else
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2733 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
2734 x_offset, y_offset, qpix_put, chroma_put, qpix_avg, chroma_avg, list0, list1);
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2735 }
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2736
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2737 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
2738 qpel_mc_func (*qpix_put)[16], h264_chroma_mc_func (*chroma_put),
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2739 qpel_mc_func (*qpix_avg)[16], h264_chroma_mc_func (*chroma_avg),
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2740 h264_weight_func *weight_op, h264_biweight_func *weight_avg){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2741 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
2742 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2743 const int mb_type= s->current_picture.mb_type[mb_xy];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2744
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2745 assert(IS_INTER(mb_type));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2746
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2747 if(IS_16X16(mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2748 mc_part(h, 0, 1, 8, 0, dest_y, dest_cb, dest_cr, 0, 0,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2749 qpix_put[0], chroma_put[0], qpix_avg[0], chroma_avg[0],
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2750 &weight_op[0], &weight_avg[0],
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2751 IS_DIR(mb_type, 0, 0), IS_DIR(mb_type, 0, 1));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2752 }else if(IS_16X8(mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2753 mc_part(h, 0, 0, 4, 8, dest_y, dest_cb, dest_cr, 0, 0,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2754 qpix_put[1], chroma_put[0], qpix_avg[1], chroma_avg[0],
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2755 &weight_op[1], &weight_avg[1],
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2756 IS_DIR(mb_type, 0, 0), IS_DIR(mb_type, 0, 1));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2757 mc_part(h, 8, 0, 4, 8, dest_y, dest_cb, dest_cr, 0, 4,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2758 qpix_put[1], chroma_put[0], qpix_avg[1], chroma_avg[0],
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2759 &weight_op[1], &weight_avg[1],
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2760 IS_DIR(mb_type, 1, 0), IS_DIR(mb_type, 1, 1));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2761 }else if(IS_8X16(mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2762 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
2763 qpix_put[1], chroma_put[1], qpix_avg[1], chroma_avg[1],
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2764 &weight_op[2], &weight_avg[2],
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2765 IS_DIR(mb_type, 0, 0), IS_DIR(mb_type, 0, 1));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2766 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
2767 qpix_put[1], chroma_put[1], qpix_avg[1], chroma_avg[1],
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2768 &weight_op[2], &weight_avg[2],
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2769 IS_DIR(mb_type, 1, 0), IS_DIR(mb_type, 1, 1));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2770 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2771 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2772
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2773 assert(IS_8X8(mb_type));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2774
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2775 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2776 const int sub_mb_type= h->sub_mb_type[i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2777 const int n= 4*i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2778 int x_offset= (i&1)<<2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2779 int y_offset= (i&2)<<1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2780
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2781 if(IS_SUB_8X8(sub_mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2782 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
2783 qpix_put[1], chroma_put[1], qpix_avg[1], chroma_avg[1],
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2784 &weight_op[3], &weight_avg[3],
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2785 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2786 }else if(IS_SUB_8X4(sub_mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2787 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
2788 qpix_put[2], chroma_put[1], qpix_avg[2], chroma_avg[1],
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2789 &weight_op[4], &weight_avg[4],
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2790 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2791 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
2792 qpix_put[2], chroma_put[1], qpix_avg[2], chroma_avg[1],
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2793 &weight_op[4], &weight_avg[4],
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2794 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2795 }else if(IS_SUB_4X8(sub_mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2796 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
2797 qpix_put[2], chroma_put[2], qpix_avg[2], chroma_avg[2],
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2798 &weight_op[5], &weight_avg[5],
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2799 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2800 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
2801 qpix_put[2], chroma_put[2], qpix_avg[2], chroma_avg[2],
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2802 &weight_op[5], &weight_avg[5],
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2803 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2804 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2805 int j;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2806 assert(IS_SUB_4X4(sub_mb_type));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2807 for(j=0; j<4; j++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2808 int sub_x_offset= x_offset + 2*(j&1);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2809 int sub_y_offset= y_offset + (j&2);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2810 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
2811 qpix_put[2], chroma_put[2], qpix_avg[2], chroma_avg[2],
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2812 &weight_op[6], &weight_avg[6],
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2813 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2814 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2815 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2816 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2817 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2818 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2819
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2820 static void decode_init_vlc(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2821 static int done = 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2822
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2823 if (!done) {
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2824 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2825 done = 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2826
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2827 init_vlc(&chroma_dc_coeff_token_vlc, CHROMA_DC_COEFF_TOKEN_VLC_BITS, 4*5,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2828 &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
2829 &chroma_dc_coeff_token_bits[0], 1, 1, 1);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2830
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2831 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2832 init_vlc(&coeff_token_vlc[i], COEFF_TOKEN_VLC_BITS, 4*17,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2833 &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
2834 &coeff_token_bits[i][0], 1, 1, 1);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2835 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2836
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2837 for(i=0; i<3; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2838 init_vlc(&chroma_dc_total_zeros_vlc[i], CHROMA_DC_TOTAL_ZEROS_VLC_BITS, 4,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2839 &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
2840 &chroma_dc_total_zeros_bits[i][0], 1, 1, 1);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2841 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2842 for(i=0; i<15; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2843 init_vlc(&total_zeros_vlc[i], TOTAL_ZEROS_VLC_BITS, 16,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2844 &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
2845 &total_zeros_bits[i][0], 1, 1, 1);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2846 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2847
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2848 for(i=0; i<6; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2849 init_vlc(&run_vlc[i], RUN_VLC_BITS, 7,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2850 &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
2851 &run_bits[i][0], 1, 1, 1);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2852 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2853 init_vlc(&run7_vlc, RUN7_VLC_BITS, 16,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2854 &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
2855 &run_bits[6][0], 1, 1, 1);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2856 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2857 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2858
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2859 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2860 * Sets the intra prediction function pointers.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2861 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2862 static void init_pred_ptrs(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2863 // MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2864
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2865 h->pred4x4[VERT_PRED ]= pred4x4_vertical_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2866 h->pred4x4[HOR_PRED ]= pred4x4_horizontal_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2867 h->pred4x4[DC_PRED ]= pred4x4_dc_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2868 h->pred4x4[DIAG_DOWN_LEFT_PRED ]= pred4x4_down_left_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2869 h->pred4x4[DIAG_DOWN_RIGHT_PRED]= pred4x4_down_right_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2870 h->pred4x4[VERT_RIGHT_PRED ]= pred4x4_vertical_right_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2871 h->pred4x4[HOR_DOWN_PRED ]= pred4x4_horizontal_down_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2872 h->pred4x4[VERT_LEFT_PRED ]= pred4x4_vertical_left_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2873 h->pred4x4[HOR_UP_PRED ]= pred4x4_horizontal_up_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2874 h->pred4x4[LEFT_DC_PRED ]= pred4x4_left_dc_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2875 h->pred4x4[TOP_DC_PRED ]= pred4x4_top_dc_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2876 h->pred4x4[DC_128_PRED ]= pred4x4_128_dc_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2877
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2878 h->pred8x8l[VERT_PRED ]= pred8x8l_vertical_c;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2879 h->pred8x8l[HOR_PRED ]= pred8x8l_horizontal_c;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2880 h->pred8x8l[DC_PRED ]= pred8x8l_dc_c;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2881 h->pred8x8l[DIAG_DOWN_LEFT_PRED ]= pred8x8l_down_left_c;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2882 h->pred8x8l[DIAG_DOWN_RIGHT_PRED]= pred8x8l_down_right_c;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2883 h->pred8x8l[VERT_RIGHT_PRED ]= pred8x8l_vertical_right_c;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2884 h->pred8x8l[HOR_DOWN_PRED ]= pred8x8l_horizontal_down_c;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2885 h->pred8x8l[VERT_LEFT_PRED ]= pred8x8l_vertical_left_c;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2886 h->pred8x8l[HOR_UP_PRED ]= pred8x8l_horizontal_up_c;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2887 h->pred8x8l[LEFT_DC_PRED ]= pred8x8l_left_dc_c;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2888 h->pred8x8l[TOP_DC_PRED ]= pred8x8l_top_dc_c;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2889 h->pred8x8l[DC_128_PRED ]= pred8x8l_128_dc_c;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2890
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2891 h->pred8x8[DC_PRED8x8 ]= pred8x8_dc_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2892 h->pred8x8[VERT_PRED8x8 ]= pred8x8_vertical_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2893 h->pred8x8[HOR_PRED8x8 ]= pred8x8_horizontal_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2894 h->pred8x8[PLANE_PRED8x8 ]= pred8x8_plane_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2895 h->pred8x8[LEFT_DC_PRED8x8]= pred8x8_left_dc_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2896 h->pred8x8[TOP_DC_PRED8x8 ]= pred8x8_top_dc_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2897 h->pred8x8[DC_128_PRED8x8 ]= pred8x8_128_dc_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2898
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2899 h->pred16x16[DC_PRED8x8 ]= pred16x16_dc_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2900 h->pred16x16[VERT_PRED8x8 ]= pred16x16_vertical_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2901 h->pred16x16[HOR_PRED8x8 ]= pred16x16_horizontal_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2902 h->pred16x16[PLANE_PRED8x8 ]= pred16x16_plane_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2903 h->pred16x16[LEFT_DC_PRED8x8]= pred16x16_left_dc_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2904 h->pred16x16[TOP_DC_PRED8x8 ]= pred16x16_top_dc_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2905 h->pred16x16[DC_128_PRED8x8 ]= pred16x16_128_dc_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2906 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2907
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2908 static void free_tables(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2909 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
2910 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
2911 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
2912 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
2913 av_freep(&h->mvd_table[1]);
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
2914 av_freep(&h->direct_table);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2915 av_freep(&h->non_zero_count);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2916 av_freep(&h->slice_table_base);
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2917 av_freep(&h->top_borders[1]);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2918 av_freep(&h->top_borders[0]);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2919 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
2920
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2921 av_freep(&h->mb2b_xy);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2922 av_freep(&h->mb2b8_xy);
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2923
2763
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
2924 av_freep(&h->dequant4_coeff);
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2925 av_freep(&h->dequant8_coeff);
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2926
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2927 av_freep(&h->s.obmc_scratchpad);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2928 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2929
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2930 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2931 * allocates tables.
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
2932 * needs width/height
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2933 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2934 static int alloc_tables(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2935 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
2936 const int big_mb_num= s->mb_stride * (s->mb_height+1);
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2937 int x,y,q;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2938
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2939 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
2940
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2941 CHECKED_ALLOCZ(h->non_zero_count , big_mb_num * 16 * sizeof(uint8_t))
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2942 CHECKED_ALLOCZ(h->slice_table_base , big_mb_num * sizeof(uint8_t))
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2943 CHECKED_ALLOCZ(h->top_borders[0] , s->mb_width * (16+8+8) * sizeof(uint8_t))
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2944 CHECKED_ALLOCZ(h->top_borders[1] , s->mb_width * (16+8+8) * sizeof(uint8_t))
2336
9cd834fc7325 segfault fix
michael
parents: 2317
diff changeset
2945 CHECKED_ALLOCZ(h->cbp_table, big_mb_num * sizeof(uint16_t))
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2946
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
2947 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
2948 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
2949 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
2950 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
2951 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
2952 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
2953
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2954 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
2955 h->slice_table= h->slice_table_base + s->mb_stride + 1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2956
2641
c337f851d0f9 fix storage of motion vectors for frames with more than 4096 macroblocks.
lorenm
parents: 2640
diff changeset
2957 CHECKED_ALLOCZ(h->mb2b_xy , big_mb_num * sizeof(uint32_t));
c337f851d0f9 fix storage of motion vectors for frames with more than 4096 macroblocks.
lorenm
parents: 2640
diff changeset
2958 CHECKED_ALLOCZ(h->mb2b8_xy , big_mb_num * sizeof(uint32_t));
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2959 for(y=0; y<s->mb_height; y++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2960 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
2961 const int mb_xy= x + y*s->mb_stride;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2962 const int b_xy = 4*x + 4*y*h->b_stride;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2963 const int b8_xy= 2*x + 2*y*h->b8_stride;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2964
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2965 h->mb2b_xy [mb_xy]= b_xy;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2966 h->mb2b8_xy[mb_xy]= b8_xy;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2967 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2968 }
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2969
2763
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
2970 CHECKED_ALLOCZ(h->dequant4_coeff, 52*16 * sizeof(uint16_t));
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2971 CHECKED_ALLOCZ(h->dequant8_coeff, 52*64 * sizeof(uint16_t));
2763
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
2972 memcpy(h->dequant4_coeff, dequant_coeff, 52*16 * sizeof(uint16_t));
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2973 for(q=0; q<52; q++){
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2974 int shift = div6[q];
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2975 int idx = rem6[q];
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2976 if(shift >= 2) // qp<12 are shifted during dequant
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2977 shift -= 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2978 for(x=0; x<64; x++)
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2979 h->dequant8_coeff[q][x] = dequant8_coeff_init[idx][
2781
899a2ea0907c parenthesing to avoid compiler errors in the future - compared asm outputs, behaviour didnt changed
alex
parents: 2774
diff changeset
2980 dequant8_coeff_init_scan[((x>>1)&12) | (x&3)] ] << shift;
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2981 }
2763
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
2982 if(h->sps.transform_bypass){
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
2983 for(x=0; x<16; x++)
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
2984 h->dequant4_coeff[0][x] = 1;
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
2985 for(x=0; x<64; x++)
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
2986 h->dequant8_coeff[0][x] = 1<<2;
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
2987 }
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2988
2417
991f39305057 10l (obmc_scratchpad not always initialize)
lorenm
parents: 2416
diff changeset
2989 s->obmc_scratchpad = NULL;
991f39305057 10l (obmc_scratchpad not always initialize)
lorenm
parents: 2416
diff changeset
2990
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2991 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2992 fail:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2993 free_tables(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2994 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2995 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2996
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2997 static void common_init(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2998 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2999
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3000 s->width = s->avctx->width;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3001 s->height = s->avctx->height;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3002 s->codec_id= s->avctx->codec->id;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3003
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3004 init_pred_ptrs(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3005
1698
420cac032278 svq3 fix
michael
parents: 1636
diff changeset
3006 s->unrestricted_mv=1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3007 s->decode=1; //FIXME
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3008 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3009
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3010 static int decode_init(AVCodecContext *avctx){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3011 H264Context *h= avctx->priv_data;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3012 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3013
1892
5ac49e7a1b8f init cleanup
michael
parents: 1786
diff changeset
3014 MPV_decode_defaults(s);
5ac49e7a1b8f init cleanup
michael
parents: 1786
diff changeset
3015
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3016 s->avctx = avctx;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3017 common_init(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3018
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3019 s->out_format = FMT_H264;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3020 s->workaround_bugs= avctx->workaround_bugs;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3021
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3022 // set defaults
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3023 // s->decode_mb= ff_h263_decode_mb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3024 s->low_delay= 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3025 avctx->pix_fmt= PIX_FMT_YUV420P;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3026
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3027 decode_init_vlc(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3028
2547
c5781912ad8a improved detection of "AVC1" style H.264 patch by (Mns Rullgrd <mru inprovide com>)
michael
parents: 2538
diff changeset
3029 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
3030 *(char *)avctx->extradata == 1){
2227
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
3031 h->is_avc = 1;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
3032 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
3033 } else {
c5781912ad8a improved detection of "AVC1" style H.264 patch by (Mns Rullgrd <mru inprovide com>)
michael
parents: 2538
diff changeset
3034 h->is_avc = 0;
2227
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
3035 }
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
3036
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3037 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3038 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3039
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3040 static void frame_start(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3041 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3042 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3043
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3044 MPV_frame_start(s, s->avctx);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3045 ff_er_frame_start(s);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3046
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3047 assert(s->linesize && s->uvlinesize);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3048
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3049 for(i=0; i<16; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3050 h->block_offset[i]= 4*((scan8[i] - scan8[0])&7) + 4*s->linesize*((scan8[i] - scan8[0])>>3);
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
3051 h->block_offset[24+i]= 4*((scan8[i] - scan8[0])&7) + 8*s->linesize*((scan8[i] - scan8[0])>>3);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3052 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3053 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3054 h->block_offset[16+i]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3055 h->block_offset[20+i]= 4*((scan8[i] - scan8[0])&7) + 4*s->uvlinesize*((scan8[i] - scan8[0])>>3);
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
3056 h->block_offset[24+16+i]=
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
3057 h->block_offset[24+20+i]= 4*((scan8[i] - scan8[0])&7) + 8*s->uvlinesize*((scan8[i] - scan8[0])>>3);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3058 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3059
2416
06b7d678b582 10l: scratchpad could be allocated before its size was known.
lorenm
parents: 2415
diff changeset
3060 /* 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
3061 * 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
3062 if(!s->obmc_scratchpad)
06b7d678b582 10l: scratchpad could be allocated before its size was known.
lorenm
parents: 2415
diff changeset
3063 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
3064
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3065 // 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
3066 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3067
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
3068 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
3069 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
3070 int i;
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
3071
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
3072 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
3073 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
3074 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
3075
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
3076 // There are two lines saved, the line above the the top macroblock of a pair,
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
3077 // and the line above the bottom macroblock
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3078 h->left_border[0]= h->top_borders[0][s->mb_x][15];
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
3079 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
3080 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
3081 }
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
3082
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3083 *(uint64_t*)(h->top_borders[0][s->mb_x]+0)= *(uint64_t*)(src_y + 16*linesize);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3084 *(uint64_t*)(h->top_borders[0][s->mb_x]+8)= *(uint64_t*)(src_y +8+16*linesize);
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
3085
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
3086 if(!(s->flags&CODEC_FLAG_GRAY)){
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3087 h->left_border[17 ]= h->top_borders[0][s->mb_x][16+7];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3088 h->left_border[17+9]= h->top_borders[0][s->mb_x][24+7];
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
3089 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
3090 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
3091 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
3092 }
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3093 *(uint64_t*)(h->top_borders[0][s->mb_x]+16)= *(uint64_t*)(src_cb+8*uvlinesize);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3094 *(uint64_t*)(h->top_borders[0][s->mb_x]+24)= *(uint64_t*)(src_cr+8*uvlinesize);
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
3095 }
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
3096 }
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
3097
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
3098 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
3099 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
3100 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
3101 uint64_t temp64;
2200
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
3102 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
3103 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
3104
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
3105 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
3106 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
3107 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
3108
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
3109 #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
3110 t= a;\
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
3111 if(xchg)\
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
3112 a= b;\
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
3113 b= t;
2200
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
3114
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
3115 if(deblock_left){
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
3116 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
3117 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
3118 }
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
3119 }
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
3120
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
3121 if(deblock_top){
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3122 XCHG(*(uint64_t*)(h->top_borders[0][s->mb_x]+0), *(uint64_t*)(src_y +1), temp64, xchg);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3123 XCHG(*(uint64_t*)(h->top_borders[0][s->mb_x]+8), *(uint64_t*)(src_y +9), temp64, 1);
2803
26970df644f1 Add missing +1 in bounds check.
reimar
parents: 2793
diff changeset
3124 if(s->mb_x+1 < s->mb_width){
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
3125 XCHG(*(uint64_t*)(h->top_borders[0][s->mb_x+1]), *(uint64_t*)(src_y +17), temp64, 1);
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
3126 }
2200
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
3127 }
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
3128
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
3129 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
3130 if(deblock_left){
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
3131 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
3132 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
3133 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
3134 }
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
3135 }
2200
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
3136 if(deblock_top){
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3137 XCHG(*(uint64_t*)(h->top_borders[0][s->mb_x]+16), *(uint64_t*)(src_cb+1), temp64, 1);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3138 XCHG(*(uint64_t*)(h->top_borders[0][s->mb_x]+24), *(uint64_t*)(src_cr+1), temp64, 1);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3139 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3140 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3141 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3142
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3143 static inline void backup_pair_border(H264Context *h, uint8_t *src_y, uint8_t *src_cb, uint8_t *src_cr, int linesize, int uvlinesize){
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3144 MpegEncContext * const s = &h->s;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3145 int i;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3146
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3147 src_y -= 2 * linesize;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3148 src_cb -= 2 * uvlinesize;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3149 src_cr -= 2 * uvlinesize;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3150
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
3151 // There are two lines saved, the line above the the top macroblock of a pair,
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3152 // and the line above the bottom macroblock
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3153 h->left_border[0]= h->top_borders[0][s->mb_x][15];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3154 h->left_border[1]= h->top_borders[1][s->mb_x][15];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3155 for(i=2; i<34; i++){
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3156 h->left_border[i]= src_y[15+i* linesize];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3157 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3158
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3159 *(uint64_t*)(h->top_borders[0][s->mb_x]+0)= *(uint64_t*)(src_y + 32*linesize);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3160 *(uint64_t*)(h->top_borders[0][s->mb_x]+8)= *(uint64_t*)(src_y +8+32*linesize);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3161 *(uint64_t*)(h->top_borders[1][s->mb_x]+0)= *(uint64_t*)(src_y + 33*linesize);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3162 *(uint64_t*)(h->top_borders[1][s->mb_x]+8)= *(uint64_t*)(src_y +8+33*linesize);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3163
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3164 if(!(s->flags&CODEC_FLAG_GRAY)){
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3165 h->left_border[34 ]= h->top_borders[0][s->mb_x][16+7];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3166 h->left_border[34+ 1]= h->top_borders[1][s->mb_x][16+7];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3167 h->left_border[34+18 ]= h->top_borders[0][s->mb_x][24+7];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3168 h->left_border[34+18+1]= h->top_borders[1][s->mb_x][24+7];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3169 for(i=2; i<18; i++){
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3170 h->left_border[i+34 ]= src_cb[7+i*uvlinesize];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3171 h->left_border[i+34+18]= src_cr[7+i*uvlinesize];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3172 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3173 *(uint64_t*)(h->top_borders[0][s->mb_x]+16)= *(uint64_t*)(src_cb+16*uvlinesize);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3174 *(uint64_t*)(h->top_borders[0][s->mb_x]+24)= *(uint64_t*)(src_cr+16*uvlinesize);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3175 *(uint64_t*)(h->top_borders[1][s->mb_x]+16)= *(uint64_t*)(src_cb+17*uvlinesize);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3176 *(uint64_t*)(h->top_borders[1][s->mb_x]+24)= *(uint64_t*)(src_cr+17*uvlinesize);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3177 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3178 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3179
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3180 static inline void xchg_pair_border(H264Context *h, uint8_t *src_y, uint8_t *src_cb, uint8_t *src_cr, int linesize, int uvlinesize, int xchg){
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3181 MpegEncContext * const s = &h->s;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3182 int temp8, i;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3183 uint64_t temp64;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3184 int deblock_left = (s->mb_x > 0);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3185 int deblock_top = (s->mb_y > 0);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3186
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3187 tprintf("xchg_pair_border: src_y:%p src_cb:%p src_cr:%p ls:%d uvls:%d\n", src_y, src_cb, src_cr, linesize, uvlinesize);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3188
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3189 src_y -= 2 * linesize + 1;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3190 src_cb -= 2 * uvlinesize + 1;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3191 src_cr -= 2 * uvlinesize + 1;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3192
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3193 #define XCHG(a,b,t,xchg)\
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3194 t= a;\
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3195 if(xchg)\
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3196 a= b;\
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3197 b= t;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3198
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3199 if(deblock_left){
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3200 for(i = (!deblock_top)<<1; i<34; i++){
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3201 XCHG(h->left_border[i ], src_y [i* linesize], temp8, xchg);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3202 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3203 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3204
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3205 if(deblock_top){
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3206 XCHG(*(uint64_t*)(h->top_borders[0][s->mb_x]+0), *(uint64_t*)(src_y +1), temp64, xchg);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3207 XCHG(*(uint64_t*)(h->top_borders[0][s->mb_x]+8), *(uint64_t*)(src_y +9), temp64, 1);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3208 XCHG(*(uint64_t*)(h->top_borders[1][s->mb_x]+0), *(uint64_t*)(src_y +1 +linesize), temp64, xchg);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3209 XCHG(*(uint64_t*)(h->top_borders[1][s->mb_x]+8), *(uint64_t*)(src_y +9 +linesize), temp64, 1);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3210 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3211
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3212 if(!(s->flags&CODEC_FLAG_GRAY)){
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3213 if(deblock_left){
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3214 for(i = (!deblock_top) << 1; i<18; i++){
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3215 XCHG(h->left_border[i+34 ], src_cb[i*uvlinesize], temp8, xchg);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3216 XCHG(h->left_border[i+34+18], src_cr[i*uvlinesize], temp8, xchg);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3217 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3218 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3219 if(deblock_top){
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3220 XCHG(*(uint64_t*)(h->top_borders[0][s->mb_x]+16), *(uint64_t*)(src_cb+1), temp64, 1);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3221 XCHG(*(uint64_t*)(h->top_borders[0][s->mb_x]+24), *(uint64_t*)(src_cr+1), temp64, 1);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3222 XCHG(*(uint64_t*)(h->top_borders[1][s->mb_x]+16), *(uint64_t*)(src_cb+1 +uvlinesize), temp64, 1);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3223 XCHG(*(uint64_t*)(h->top_borders[1][s->mb_x]+24), *(uint64_t*)(src_cr+1 +uvlinesize), temp64, 1);
2200
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
3224 }
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
3225 }
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
3226 }
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
3227
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3228 static void hl_decode_mb(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3229 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3230 const int mb_x= s->mb_x;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3231 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
3232 const int mb_xy= mb_x + mb_y*s->mb_stride;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3233 const int mb_type= s->current_picture.mb_type[mb_xy];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3234 uint8_t *dest_y, *dest_cb, *dest_cr;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3235 int linesize, uvlinesize /*dct_offset*/;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3236 int i;
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
3237 int *block_offset = &h->block_offset[0];
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3238 const unsigned int bottom = mb_y & 1;
2763
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
3239 const int transform_bypass = (s->qscale == 0 && h->sps.transform_bypass);
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
3240 void (*idct_add)(uint8_t *dst, DCTELEM *block, int stride);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3241
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3242 if(!s->decode)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3243 return;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3244
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3245 dest_y = s->current_picture.data[0] + (mb_y * 16* s->linesize ) + mb_x * 16;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3246 dest_cb = s->current_picture.data[1] + (mb_y * 8 * s->uvlinesize) + mb_x * 8;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3247 dest_cr = s->current_picture.data[2] + (mb_y * 8 * s->uvlinesize) + mb_x * 8;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3248
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3249 if (h->mb_field_decoding_flag) {
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3250 linesize = s->linesize * 2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3251 uvlinesize = s->uvlinesize * 2;
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
3252 block_offset = &h->block_offset[24];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3253 if(mb_y&1){ //FIXME move out of this func?
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3254 dest_y -= s->linesize*15;
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
3255 dest_cb-= s->uvlinesize*7;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
3256 dest_cr-= s->uvlinesize*7;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3257 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3258 } else {
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3259 linesize = s->linesize;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3260 uvlinesize = s->uvlinesize;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3261 // dct_offset = s->linesize * 16;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3262 }
2763
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
3263
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
3264 idct_add = transform_bypass
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
3265 ? IS_8x8DCT(mb_type) ? s->dsp.add_pixels8 : s->dsp.add_pixels4
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
3266 : IS_8x8DCT(mb_type) ? s->dsp.h264_idct8_add : s->dsp.h264_idct_add;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3267
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
3268 if (IS_INTRA_PCM(mb_type)) {
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
3269 unsigned int x, y;
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
3270
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
3271 // 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
3272 // 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
3273 for(i=0; i<16; i++) {
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
3274 for (y=0; y<4; y++) {
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
3275 for (x=0; x<4; x++) {
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
3276 *(dest_y + block_offset[i] + y*linesize + x) = h->mb[i*16+y*4+x];
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
3277 }
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
3278 }
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
3279 }
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
3280 for(i=16; i<16+4; i++) {
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
3281 for (y=0; y<4; y++) {
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
3282 for (x=0; x<4; x++) {
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
3283 *(dest_cb + block_offset[i] + y*uvlinesize + x) = h->mb[i*16+y*4+x];
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
3284 }
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
3285 }
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
3286 }
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
3287 for(i=20; i<20+4; i++) {
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
3288 for (y=0; y<4; y++) {
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
3289 for (x=0; x<4; x++) {
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
3290 *(dest_cr + block_offset[i] + y*uvlinesize + x) = h->mb[i*16+y*4+x];
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
3291 }
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
3292 }
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
3293 }
2509
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3294 } else {
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3295 if(IS_INTRA(mb_type)){
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3296 if(h->deblocking_filter) {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3297 if (h->mb_aff_frame) {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3298 if (!bottom)
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3299 xchg_pair_border(h, dest_y, dest_cb, dest_cr, s->linesize, s->uvlinesize, 1);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3300 } else {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3301 xchg_mb_border(h, dest_y, dest_cb, dest_cr, linesize, uvlinesize, 1);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3302 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3303 }
2509
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3304
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3305 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
3306 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
3307 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
3308 }
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3309
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3310 if(IS_INTRA4x4(mb_type)){
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3311 if(!s->encoding){
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
3312 if(IS_8x8DCT(mb_type)){
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
3313 for(i=0; i<16; i+=4){
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
3314 uint8_t * const ptr= dest_y + block_offset[i];
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
3315 const int dir= h->intra4x4_pred_mode_cache[ scan8[i] ];
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
3316 h->pred8x8l[ dir ](ptr, (h->topleft_samples_available<<i)&0x8000,
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
3317 (h->topright_samples_available<<(i+1))&0x8000, linesize);
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
3318 if(h->non_zero_count_cache[ scan8[i] ])
2763
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
3319 idct_add(ptr, h->mb + i*16, linesize);
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
3320 }
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
3321 }else
2509
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3322 for(i=0; i<16; i++){
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
3323 uint8_t * const ptr= dest_y + block_offset[i];
2509
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3324 uint8_t *topright;
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3325 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
3326 int tr;
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3327
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3328 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
3329 const int topright_avail= (h->topright_samples_available<<i)&0x8000;
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
3330 assert(mb_y || linesize <= block_offset[i]);
2509
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3331 if(!topright_avail){
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3332 tr= ptr[3 - linesize]*0x01010101;
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3333 topright= (uint8_t*) &tr;
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
3334 }else
2509
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3335 topright= ptr + 4 - linesize;
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3336 }else
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3337 topright= NULL;
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3338
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3339 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
3340 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
3341 if(s->codec_id == CODEC_ID_H264)
2763
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
3342 idct_add(ptr, h->mb + i*16, linesize);
2509
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3343 else
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3344 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
3345 }
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3346 }
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3347 }
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3348 }else{
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3349 h->pred16x16[ h->intra16x16_pred_mode ](dest_y , linesize);
2763
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
3350 if(s->codec_id == CODEC_ID_H264){
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
3351 if(!transform_bypass)
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
3352 h264_luma_dc_dequant_idct_c(h->mb, s->qscale);
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
3353 }else
2509
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3354 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
3355 }
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3356 if(h->deblocking_filter) {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3357 if (h->mb_aff_frame) {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3358 if (bottom) {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3359 uint8_t *pair_dest_y = s->current_picture.data[0] + ((mb_y-1) * 16* s->linesize ) + mb_x * 16;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3360 uint8_t *pair_dest_cb = s->current_picture.data[1] + ((mb_y-1) * 8 * s->uvlinesize) + mb_x * 8;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3361 uint8_t *pair_dest_cr = s->current_picture.data[2] + ((mb_y-1) * 8 * s->uvlinesize) + mb_x * 8;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3362 s->mb_y--;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3363 xchg_pair_border(h, pair_dest_y, pair_dest_cb, pair_dest_cr, s->linesize, s->uvlinesize, 0);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3364 s->mb_y++;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3365 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3366 } else {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3367 xchg_mb_border(h, dest_y, dest_cb, dest_cr, linesize, uvlinesize, 0);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3368 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3369 }
2509
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3370 }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
3371 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
3372 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
3373 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
3374 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
3375 }
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3376
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3377
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3378 if(!IS_INTRA4x4(mb_type)){
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3379 if(s->codec_id == CODEC_ID_H264){
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
3380 const int di = IS_8x8DCT(mb_type) ? 4 : 1;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
3381 for(i=0; i<16; i+=di){
2509
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3382 if(h->non_zero_count_cache[ scan8[i] ] || h->mb[i*16]){ //FIXME benchmark weird rule, & below
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
3383 uint8_t * const ptr= dest_y + block_offset[i];
2763
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
3384 idct_add(ptr, h->mb + i*16, linesize);
2509
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3385 }
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3386 }
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3387 }else{
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3388 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
3389 if(h->non_zero_count_cache[ scan8[i] ] || h->mb[i*16]){ //FIXME benchmark weird rule, & below
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
3390 uint8_t * const ptr= dest_y + block_offset[i];
2509
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3391 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
3392 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3393 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3394 }
2509
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3395 }
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3396
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3397 if(!(s->flags&CODEC_FLAG_GRAY)){
2763
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
3398 idct_add = transform_bypass ? s->dsp.add_pixels4 : s->dsp.h264_idct_add;
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
3399 if(!transform_bypass){
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
3400 chroma_dc_dequant_idct_c(h->mb + 16*16, h->chroma_qp);
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
3401 chroma_dc_dequant_idct_c(h->mb + 16*16+4*16, h->chroma_qp);
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
3402 }
2509
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3403 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
3404 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
3405 if(h->non_zero_count_cache[ scan8[i] ] || h->mb[i*16]){
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
3406 uint8_t * const ptr= dest_cb + block_offset[i];
2763
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
3407 idct_add(ptr, h->mb + i*16, uvlinesize);
2509
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3408 }
1250
fa181d095027 optimizations
michaelni
parents: 1234
diff changeset
3409 }
2509
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3410 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
3411 if(h->non_zero_count_cache[ scan8[i] ] || h->mb[i*16]){
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
3412 uint8_t * const ptr= dest_cr + block_offset[i];
2763
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
3413 idct_add(ptr, h->mb + i*16, uvlinesize);
2509
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3414 }
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3415 }
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3416 }else{
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3417 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
3418 if(h->non_zero_count_cache[ scan8[i] ] || h->mb[i*16]){
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
3419 uint8_t * const ptr= dest_cb + block_offset[i];
2509
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3420 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
3421 }
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3422 }
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3423 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
3424 if(h->non_zero_count_cache[ scan8[i] ] || h->mb[i*16]){
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
3425 uint8_t * const ptr= dest_cr + block_offset[i];
2509
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3426 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
3427 }
1250
fa181d095027 optimizations
michaelni
parents: 1234
diff changeset
3428 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3429 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3430 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3431 }
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
3432 if(h->deblocking_filter) {
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3433 if (h->mb_aff_frame) {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3434 const int mb_y = s->mb_y - 1;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3435 uint8_t *pair_dest_y, *pair_dest_cb, *pair_dest_cr;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3436 const int mb_xy= mb_x + mb_y*s->mb_stride;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3437 const int mb_type_top = s->current_picture.mb_type[mb_xy];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3438 const int mb_type_bottom= s->current_picture.mb_type[mb_xy+s->mb_stride];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3439 uint8_t tmp = s->current_picture.data[1][384];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3440 if (!bottom) return;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3441 pair_dest_y = s->current_picture.data[0] + (mb_y * 16* s->linesize ) + mb_x * 16;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3442 pair_dest_cb = s->current_picture.data[1] + (mb_y * 8 * s->uvlinesize) + mb_x * 8;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3443 pair_dest_cr = s->current_picture.data[2] + (mb_y * 8 * s->uvlinesize) + mb_x * 8;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3444
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3445 backup_pair_border(h, pair_dest_y, pair_dest_cb, pair_dest_cr, s->linesize, s->uvlinesize);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3446 // TODO deblock a pair
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3447 // top
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3448 s->mb_y--;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3449 tprintf("call mbaff filter_mb mb_x:%d mb_y:%d pair_dest_y = %p, dest_y = %p\n", mb_x, mb_y, pair_dest_y, dest_y);
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
3450 fill_caches(h, mb_type_top, 1); //FIXME don't fill stuff which isn't used by filter_mb
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3451 filter_mb(h, mb_x, mb_y, pair_dest_y, pair_dest_cb, pair_dest_cr, linesize, uvlinesize);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3452 if (tmp != s->current_picture.data[1][384]) {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3453 tprintf("modified pixel 8,1 (1)\n");
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3454 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3455 // bottom
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3456 s->mb_y++;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3457 tprintf("call mbaff filter_mb\n");
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
3458 fill_caches(h, mb_type_bottom, 1); //FIXME don't fill stuff which isn't used by filter_mb
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3459 filter_mb(h, mb_x, mb_y+1, dest_y, dest_cb, dest_cr, linesize, uvlinesize);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3460 if (tmp != s->current_picture.data[1][384]) {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3461 tprintf("modified pixel 8,1 (2)\n");
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3462 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3463 } else {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3464 tprintf("call filter_mb\n");
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3465 backup_mb_border(h, dest_y, dest_cb, dest_cr, linesize, uvlinesize);
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
3466 fill_caches(h, mb_type, 1); //FIXME don't fill stuff which isn't used by filter_mb
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3467 filter_mb(h, mb_x, mb_y, dest_y, dest_cb, dest_cr, linesize, uvlinesize);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3468 }
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
3469 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3470 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3471
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3472 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3473 * fills the default_ref_list.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3474 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3475 static int fill_default_ref_list(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3476 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3477 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
3478 int smallest_poc_greater_than_current = -1;
2582
3c27a074de7a allow 16 refs with B-frames
lorenm
parents: 2581
diff changeset
3479 Picture sorted_short_ref[32];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3480
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3481 if(h->slice_type==B_TYPE){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3482 int out_i;
2713
16258de8ae06 fix crash on negative POC
lorenm
parents: 2707
diff changeset
3483 int limit= INT_MIN;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3484
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
3485 /* sort frame according to poc in B slice */
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3486 for(out_i=0; out_i<h->short_ref_count; out_i++){
2713
16258de8ae06 fix crash on negative POC
lorenm
parents: 2707
diff changeset
3487 int best_i=INT_MIN;
2255
507690ff49a2 assertion when playing AVC/H.264 streams fix by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2254
diff changeset
3488 int best_poc=INT_MAX;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3489
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3490 for(i=0; i<h->short_ref_count; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3491 const int poc= h->short_ref[i]->poc;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3492 if(poc > limit && poc < best_poc){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3493 best_poc= poc;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3494 best_i= i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3495 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3496 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3497
2713
16258de8ae06 fix crash on negative POC
lorenm
parents: 2707
diff changeset
3498 assert(best_i != INT_MIN);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3499
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3500 limit= best_poc;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3501 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
3502 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
3503 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
3504 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
3505 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
3506 }
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
3507 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3508 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3509 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3510
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3511 if(s->picture_structure == PICT_FRAME){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3512 if(h->slice_type==B_TYPE){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3513 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
3514 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
3515
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
3516 // find the largest poc
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3517 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
3518 int index = 0;
2447
0237bb5ca0f0 simplify
michael
parents: 2441
diff changeset
3519 int j= -99;
0237bb5ca0f0 simplify
michael
parents: 2441
diff changeset
3520 int step= list ? -1 : 1;
0237bb5ca0f0 simplify
michael
parents: 2441
diff changeset
3521
0237bb5ca0f0 simplify
michael
parents: 2441
diff changeset
3522 for(i=0; i<h->short_ref_count && index < h->ref_count[list]; i++, j+=step) {
0237bb5ca0f0 simplify
michael
parents: 2441
diff changeset
3523 while(j<0 || j>= h->short_ref_count){
2680
1a6192e0b1f9 fill missing reference pictures with something to avoid assertion failure
michael
parents: 2675
diff changeset
3524 if(j != -99 && step == (list ? -1 : 1))
1a6192e0b1f9 fill missing reference pictures with something to avoid assertion failure
michael
parents: 2675
diff changeset
3525 return -1;
2447
0237bb5ca0f0 simplify
michael
parents: 2441
diff changeset
3526 step = -step;
0237bb5ca0f0 simplify
michael
parents: 2441
diff changeset
3527 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
3528 }
2447
0237bb5ca0f0 simplify
michael
parents: 2441
diff changeset
3529 if(sorted_short_ref[j].reference != 3) continue;
0237bb5ca0f0 simplify
michael
parents: 2441
diff changeset
3530 h->default_ref_list[list][index ]= sorted_short_ref[j];
0237bb5ca0f0 simplify
michael
parents: 2441
diff changeset
3531 h->default_ref_list[list][index++].pic_id= sorted_short_ref[j].frame_num;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3532 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3533
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
3534 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
3535 if(h->long_ref[i] == NULL) continue;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3536 if(h->long_ref[i]->reference != 3) continue;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3537
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3538 h->default_ref_list[ list ][index ]= *h->long_ref[i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3539 h->default_ref_list[ list ][index++].pic_id= i;;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3540 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3541
2447
0237bb5ca0f0 simplify
michael
parents: 2441
diff changeset
3542 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
3543 // 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
3544 // L0 and L1 are identical
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3545 Picture temp= h->default_ref_list[1][0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3546 h->default_ref_list[1][0] = h->default_ref_list[1][1];
2673
6f04c7a5bf24 typo found by Chengji Zhao
michael
parents: 2669
diff changeset
3547 h->default_ref_list[1][1] = temp;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3548 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3549
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3550 if(index < h->ref_count[ list ])
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3551 memset(&h->default_ref_list[list][index], 0, sizeof(Picture)*(h->ref_count[ list ] - index));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3552 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3553 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3554 int index=0;
2537
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
3555 for(i=0; i<h->short_ref_count; i++){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3556 if(h->short_ref[i]->reference != 3) continue; //FIXME refernce field shit
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3557 h->default_ref_list[0][index ]= *h->short_ref[i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3558 h->default_ref_list[0][index++].pic_id= h->short_ref[i]->frame_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3559 }
2537
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
3560 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
3561 if(h->long_ref[i] == NULL) continue;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3562 if(h->long_ref[i]->reference != 3) continue;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3563 h->default_ref_list[0][index ]= *h->long_ref[i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3564 h->default_ref_list[0][index++].pic_id= i;;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3565 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3566 if(index < h->ref_count[0])
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3567 memset(&h->default_ref_list[0][index], 0, sizeof(Picture)*(h->ref_count[0] - index));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3568 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3569 }else{ //FIELD
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3570 if(h->slice_type==B_TYPE){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3571 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3572 //FIXME second field balh
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3573 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3574 }
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
3575 #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
3576 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
3577 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
3578 }
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
3579 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
3580 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
3581 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
3582 }
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
3583 }
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
3584 #endif
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3585 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3586 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3587
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
3588 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
3589 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
3590
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3591 static int decode_ref_pic_list_reordering(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3592 MpegEncContext * const s = &h->s;
2680
1a6192e0b1f9 fill missing reference pictures with something to avoid assertion failure
michael
parents: 2675
diff changeset
3593 int list, index;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3594
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
3595 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
3596 print_long_term(h);
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
3597 if(h->slice_type==I_TYPE || h->slice_type==SI_TYPE) return 0; //FIXME move before func
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3598
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3599 for(list=0; list<2; list++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3600 memcpy(h->ref_list[list], h->default_ref_list[list], sizeof(Picture)*h->ref_count[list]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3601
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3602 if(get_bits1(&s->gb)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3603 int pred= h->curr_pic_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3604
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3605 for(index=0; ; index++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3606 int reordering_of_pic_nums_idc= get_ue_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3607 int pic_id;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3608 int i;
2537
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
3609 Picture *ref = NULL;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3610
2284
6d26e105f68f h.264 ref list reordering bugfix patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2272
diff changeset
3611 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
3612 break;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3613
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3614 if(index >= h->ref_count[list]){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
3615 av_log(h->s.avctx, AV_LOG_ERROR, "reference count overflow\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3616 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3617 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3618
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3619 if(reordering_of_pic_nums_idc<3){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3620 if(reordering_of_pic_nums_idc<2){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3621 const int abs_diff_pic_num= get_ue_golomb(&s->gb) + 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3622
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3623 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
3624 av_log(h->s.avctx, AV_LOG_ERROR, "abs_diff_pic_num overflow\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3625 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3626 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3627
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3628 if(reordering_of_pic_nums_idc == 0) pred-= abs_diff_pic_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3629 else pred+= abs_diff_pic_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3630 pred &= h->max_pic_num - 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3631
2683
7d86ebbccecf another try at decode_ref_pic_list_reordering()
michael
parents: 2680
diff changeset
3632 for(i= h->short_ref_count-1; i>=0; i--){
7d86ebbccecf another try at decode_ref_pic_list_reordering()
michael
parents: 2680
diff changeset
3633 ref = h->short_ref[i];
7d86ebbccecf another try at decode_ref_pic_list_reordering()
michael
parents: 2680
diff changeset
3634 assert(ref->reference == 3);
7d86ebbccecf another try at decode_ref_pic_list_reordering()
michael
parents: 2680
diff changeset
3635 assert(!ref->long_ref);
7d86ebbccecf another try at decode_ref_pic_list_reordering()
michael
parents: 2680
diff changeset
3636 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
3637 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3638 }
2683
7d86ebbccecf another try at decode_ref_pic_list_reordering()
michael
parents: 2680
diff changeset
3639 if(i>=0)
7d86ebbccecf another try at decode_ref_pic_list_reordering()
michael
parents: 2680
diff changeset
3640 ref->pic_id= ref->frame_num;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3641 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3642 pic_id= get_ue_golomb(&s->gb); //long_term_pic_idx
2683
7d86ebbccecf another try at decode_ref_pic_list_reordering()
michael
parents: 2680
diff changeset
3643 ref = h->long_ref[pic_id];
7d86ebbccecf another try at decode_ref_pic_list_reordering()
michael
parents: 2680
diff changeset
3644 ref->pic_id= pic_id;
7d86ebbccecf another try at decode_ref_pic_list_reordering()
michael
parents: 2680
diff changeset
3645 assert(ref->reference == 3);
7d86ebbccecf another try at decode_ref_pic_list_reordering()
michael
parents: 2680
diff changeset
3646 assert(ref->long_ref);
7d86ebbccecf another try at decode_ref_pic_list_reordering()
michael
parents: 2680
diff changeset
3647 i=0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3648 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3649
2485
2844b8cf4e11 H.264 multiplce instance in reference list patch by (Loic <lll+ffmpeg m4x org )
michael
parents: 2484
diff changeset
3650 if (i < 0) {
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
3651 av_log(h->s.avctx, AV_LOG_ERROR, "reference picture missing during reorder\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3652 memset(&h->ref_list[list][index], 0, sizeof(Picture)); //FIXME
2683
7d86ebbccecf another try at decode_ref_pic_list_reordering()
michael
parents: 2680
diff changeset
3653 } else {
7d86ebbccecf another try at decode_ref_pic_list_reordering()
michael
parents: 2680
diff changeset
3654 for(i=index; i+1<h->ref_count[list]; i++){
7d86ebbccecf another try at decode_ref_pic_list_reordering()
michael
parents: 2680
diff changeset
3655 if(ref->long_ref == h->ref_list[list][i].long_ref && ref->pic_id == h->ref_list[list][i].pic_id)
7d86ebbccecf another try at decode_ref_pic_list_reordering()
michael
parents: 2680
diff changeset
3656 break;
2650
d321fbf0b2ce reverse 1 hunk from 1.96->1.97, fixes decoding of (MR1_BT_A.h264 and MR1_MW_A.264)
michael
parents: 2649
diff changeset
3657 }
d321fbf0b2ce reverse 1 hunk from 1.96->1.97, fixes decoding of (MR1_BT_A.h264 and MR1_MW_A.264)
michael
parents: 2649
diff changeset
3658 for(; i > index; i--){
d321fbf0b2ce reverse 1 hunk from 1.96->1.97, fixes decoding of (MR1_BT_A.h264 and MR1_MW_A.264)
michael
parents: 2649
diff changeset
3659 h->ref_list[list][i]= h->ref_list[list][i-1];
d321fbf0b2ce reverse 1 hunk from 1.96->1.97, fixes decoding of (MR1_BT_A.h264 and MR1_MW_A.264)
michael
parents: 2649
diff changeset
3660 }
2683
7d86ebbccecf another try at decode_ref_pic_list_reordering()
michael
parents: 2680
diff changeset
3661 h->ref_list[list][index]= *ref;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3662 }
2284
6d26e105f68f h.264 ref list reordering bugfix patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2272
diff changeset
3663 }else{
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
3664 av_log(h->s.avctx, AV_LOG_ERROR, "illegal reordering_of_pic_nums_idc\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3665 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3666 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3667 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3668 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3669
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3670 if(h->slice_type!=B_TYPE) break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3671 }
2680
1a6192e0b1f9 fill missing reference pictures with something to avoid assertion failure
michael
parents: 2675
diff changeset
3672 for(list=0; list<2; list++){
1a6192e0b1f9 fill missing reference pictures with something to avoid assertion failure
michael
parents: 2675
diff changeset
3673 for(index= 0; index < h->ref_count[list]; index++){
1a6192e0b1f9 fill missing reference pictures with something to avoid assertion failure
michael
parents: 2675
diff changeset
3674 if(!h->ref_list[list][index].data[0])
1a6192e0b1f9 fill missing reference pictures with something to avoid assertion failure
michael
parents: 2675
diff changeset
3675 h->ref_list[list][index]= s->current_picture;
1a6192e0b1f9 fill missing reference pictures with something to avoid assertion failure
michael
parents: 2675
diff changeset
3676 }
1a6192e0b1f9 fill missing reference pictures with something to avoid assertion failure
michael
parents: 2675
diff changeset
3677 if(h->slice_type!=B_TYPE) break;
1a6192e0b1f9 fill missing reference pictures with something to avoid assertion failure
michael
parents: 2675
diff changeset
3678 }
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
3679
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
3680 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
3681 direct_dist_scale_factor(h);
2537
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
3682 direct_ref_list_init(h);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3683 return 0;
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 static int pred_weight_table(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3687 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3688 int list, i;
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3689 int luma_def, chroma_def;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3690
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3691 h->use_weight= 0;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3692 h->use_weight_chroma= 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3693 h->luma_log2_weight_denom= get_ue_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3694 h->chroma_log2_weight_denom= get_ue_golomb(&s->gb);
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3695 luma_def = 1<<h->luma_log2_weight_denom;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3696 chroma_def = 1<<h->chroma_log2_weight_denom;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3697
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3698 for(list=0; list<2; list++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3699 for(i=0; i<h->ref_count[list]; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3700 int luma_weight_flag, chroma_weight_flag;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3701
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3702 luma_weight_flag= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3703 if(luma_weight_flag){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3704 h->luma_weight[list][i]= get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3705 h->luma_offset[list][i]= get_se_golomb(&s->gb);
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3706 if( h->luma_weight[list][i] != luma_def
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3707 || h->luma_offset[list][i] != 0)
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3708 h->use_weight= 1;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3709 }else{
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3710 h->luma_weight[list][i]= luma_def;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3711 h->luma_offset[list][i]= 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3712 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3713
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3714 chroma_weight_flag= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3715 if(chroma_weight_flag){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3716 int j;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3717 for(j=0; j<2; j++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3718 h->chroma_weight[list][i][j]= get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3719 h->chroma_offset[list][i][j]= get_se_golomb(&s->gb);
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3720 if( h->chroma_weight[list][i][j] != chroma_def
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3721 || h->chroma_offset[list][i][j] != 0)
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3722 h->use_weight_chroma= 1;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3723 }
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3724 }else{
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3725 int j;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3726 for(j=0; j<2; j++){
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3727 h->chroma_weight[list][i][j]= chroma_def;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3728 h->chroma_offset[list][i][j]= 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3729 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3730 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3731 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3732 if(h->slice_type != B_TYPE) break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3733 }
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3734 h->use_weight= h->use_weight || h->use_weight_chroma;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3735 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3736 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3737
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3738 static void implicit_weight_table(H264Context *h){
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3739 MpegEncContext * const s = &h->s;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3740 int ref0, ref1;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3741 int cur_poc = s->current_picture_ptr->poc;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3742
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3743 if( h->ref_count[0] == 1 && h->ref_count[1] == 1
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3744 && 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
3745 h->use_weight= 0;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3746 h->use_weight_chroma= 0;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3747 return;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3748 }
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3749
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3750 h->use_weight= 2;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3751 h->use_weight_chroma= 2;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3752 h->luma_log2_weight_denom= 5;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3753 h->chroma_log2_weight_denom= 5;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3754
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3755 /* FIXME: MBAFF */
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3756 for(ref0=0; ref0 < h->ref_count[0]; ref0++){
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3757 int poc0 = h->ref_list[0][ref0].poc;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3758 for(ref1=0; ref1 < h->ref_count[1]; ref1++){
2519
b34f2cac6a71 10l in implicit_weight_table
lorenm
parents: 2509
diff changeset
3759 int poc1 = h->ref_list[1][ref1].poc;
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3760 int td = clip(poc1 - poc0, -128, 127);
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3761 if(td){
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3762 int tb = clip(cur_poc - poc0, -128, 127);
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3763 int tx = (16384 + (ABS(td) >> 1)) / td;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3764 int dist_scale_factor = clip((tb*tx + 32) >> 6, -1024, 1023) >> 2;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3765 if(dist_scale_factor < -64 || dist_scale_factor > 128)
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3766 h->implicit_weight[ref0][ref1] = 32;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3767 else
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3768 h->implicit_weight[ref0][ref1] = 64 - dist_scale_factor;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3769 }else
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3770 h->implicit_weight[ref0][ref1] = 32;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3771 }
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3772 }
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3773 }
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3774
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
3775 static inline void unreference_pic(H264Context *h, Picture *pic){
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
3776 int i;
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
3777 pic->reference=0;
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
3778 if(pic == h->delayed_output_pic)
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
3779 pic->reference=1;
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
3780 else{
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
3781 for(i = 0; h->delayed_pic[i]; i++)
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
3782 if(pic == h->delayed_pic[i]){
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
3783 pic->reference=1;
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
3784 break;
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
3785 }
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
3786 }
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
3787 }
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
3788
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3789 /**
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
3790 * instantaneous decoder refresh.
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3791 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3792 static void idr(H264Context *h){
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
3793 int i;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3794
2484
a3188eb4266c correct long term picture management patch by (Loic <lll+ffmpeg m4x org>)
michael
parents: 2471
diff changeset
3795 for(i=0; i<16; i++){
a3188eb4266c correct long term picture management patch by (Loic <lll+ffmpeg m4x org>)
michael
parents: 2471
diff changeset
3796 if (h->long_ref[i] != NULL) {
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
3797 unreference_pic(h, h->long_ref[i]);
2484
a3188eb4266c correct long term picture management patch by (Loic <lll+ffmpeg m4x org>)
michael
parents: 2471
diff changeset
3798 h->long_ref[i]= NULL;
a3188eb4266c correct long term picture management patch by (Loic <lll+ffmpeg m4x org>)
michael
parents: 2471
diff changeset
3799 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3800 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3801 h->long_ref_count=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3802
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3803 for(i=0; i<h->short_ref_count; i++){
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
3804 unreference_pic(h, h->short_ref[i]);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3805 h->short_ref[i]= NULL;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3806 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3807 h->short_ref_count=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3808 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3809
2640
d5de8b677bad clear the DPB after seeking.
lorenm
parents: 2637
diff changeset
3810 /* forget old pics after a seek */
d5de8b677bad clear the DPB after seeking.
lorenm
parents: 2637
diff changeset
3811 static void flush_dpb(AVCodecContext *avctx){
d5de8b677bad clear the DPB after seeking.
lorenm
parents: 2637
diff changeset
3812 H264Context *h= avctx->priv_data;
d5de8b677bad clear the DPB after seeking.
lorenm
parents: 2637
diff changeset
3813 int i;
d5de8b677bad clear the DPB after seeking.
lorenm
parents: 2637
diff changeset
3814 for(i=0; i<16; i++)
d5de8b677bad clear the DPB after seeking.
lorenm
parents: 2637
diff changeset
3815 h->delayed_pic[i]= NULL;
d5de8b677bad clear the DPB after seeking.
lorenm
parents: 2637
diff changeset
3816 h->delayed_output_pic= NULL;
d5de8b677bad clear the DPB after seeking.
lorenm
parents: 2637
diff changeset
3817 idr(h);
2751
3247049dfc7a fix segfault if flush is called before the first frame
mru
parents: 2748
diff changeset
3818 if(h->s.current_picture_ptr)
3247049dfc7a fix segfault if flush is called before the first frame
mru
parents: 2748
diff changeset
3819 h->s.current_picture_ptr->reference= 0;
2640
d5de8b677bad clear the DPB after seeking.
lorenm
parents: 2637
diff changeset
3820 }
d5de8b677bad clear the DPB after seeking.
lorenm
parents: 2637
diff changeset
3821
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3822 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3823 *
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
3824 * @return the removed picture or NULL if an error occurs
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3825 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3826 static Picture * remove_short(H264Context *h, int frame_num){
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
3827 MpegEncContext * const s = &h->s;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3828 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3829
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
3830 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
3831 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
3832
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3833 for(i=0; i<h->short_ref_count; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3834 Picture *pic= h->short_ref[i];
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
3835 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
3836 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
3837 if(pic->frame_num == frame_num){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3838 h->short_ref[i]= NULL;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3839 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
3840 h->short_ref_count--;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3841 return pic;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3842 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3843 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3844 return NULL;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3845 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3846
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3847 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3848 *
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
3849 * @return the removed picture or NULL if an error occurs
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3850 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3851 static Picture * remove_long(H264Context *h, int i){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3852 Picture *pic;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3853
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3854 pic= h->long_ref[i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3855 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
3856 if(pic) h->long_ref_count--;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3857
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3858 return pic;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3859 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3860
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3861 /**
2441
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3862 * 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
3863 */
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
3864 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
3865 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
3866 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
3867 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
3868 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
3869 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
3870 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
3871 }
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
3872 }
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
3873 }
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
3874
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
3875 /**
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
3876 * 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
3877 */
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
3878 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
3879 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
3880 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
3881 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
3882 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
3883 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
3884 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
3885 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
3886 }
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
3887 }
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
3888 }
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
3889 }
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
3890
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
3891 /**
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3892 * Executes the reference picture marking (memory management control operations).
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3893 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3894 static int execute_ref_pic_marking(H264Context *h, MMCO *mmco, int mmco_count){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3895 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
3896 int i, j;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3897 int current_is_long=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3898 Picture *pic;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3899
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3900 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
3901 av_log(h->s.avctx, AV_LOG_DEBUG, "no mmco here\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3902
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3903 for(i=0; i<mmco_count; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3904 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
3905 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
3906
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3907 switch(mmco[i].opcode){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3908 case MMCO_SHORT2UNUSED:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3909 pic= remove_short(h, mmco[i].short_frame_num);
2766
0609f405e000 make decoder a little bit more tolerant to missing NAL units
michael
parents: 2763
diff changeset
3910 if(pic)
0609f405e000 make decoder a little bit more tolerant to missing NAL units
michael
parents: 2763
diff changeset
3911 unreference_pic(h, pic);
0609f405e000 make decoder a little bit more tolerant to missing NAL units
michael
parents: 2763
diff changeset
3912 else if(s->avctx->debug&FF_DEBUG_MMCO)
0609f405e000 make decoder a little bit more tolerant to missing NAL units
michael
parents: 2763
diff changeset
3913 av_log(h->s.avctx, AV_LOG_DEBUG, "mmco: remove_short() failure\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3914 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3915 case MMCO_SHORT2LONG:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3916 pic= remove_long(h, mmco[i].long_index);
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
3917 if(pic) unreference_pic(h, pic);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3918
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3919 h->long_ref[ mmco[i].long_index ]= remove_short(h, mmco[i].short_frame_num);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3920 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
3921 h->long_ref_count++;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3922 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3923 case MMCO_LONG2UNUSED:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3924 pic= remove_long(h, mmco[i].long_index);
2766
0609f405e000 make decoder a little bit more tolerant to missing NAL units
michael
parents: 2763
diff changeset
3925 if(pic)
0609f405e000 make decoder a little bit more tolerant to missing NAL units
michael
parents: 2763
diff changeset
3926 unreference_pic(h, pic);
0609f405e000 make decoder a little bit more tolerant to missing NAL units
michael
parents: 2763
diff changeset
3927 else if(s->avctx->debug&FF_DEBUG_MMCO)
0609f405e000 make decoder a little bit more tolerant to missing NAL units
michael
parents: 2763
diff changeset
3928 av_log(h->s.avctx, AV_LOG_DEBUG, "mmco: remove_long() failure\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3929 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3930 case MMCO_LONG:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3931 pic= remove_long(h, mmco[i].long_index);
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
3932 if(pic) unreference_pic(h, pic);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3933
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3934 h->long_ref[ mmco[i].long_index ]= s->current_picture_ptr;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3935 h->long_ref[ mmco[i].long_index ]->long_ref=1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3936 h->long_ref_count++;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3937
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3938 current_is_long=1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3939 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3940 case MMCO_SET_MAX_LONG:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3941 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
3942 // 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
3943 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
3944 pic = remove_long(h, j);
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
3945 if (pic) unreference_pic(h, pic);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3946 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3947 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3948 case MMCO_RESET:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3949 while(h->short_ref_count){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3950 pic= remove_short(h, h->short_ref[0]->frame_num);
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
3951 unreference_pic(h, pic);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3952 }
2441
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3953 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
3954 pic= remove_long(h, j);
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
3955 if(pic) unreference_pic(h, pic);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3956 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3957 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3958 default: assert(0);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3959 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3960 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3961
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3962 if(!current_is_long){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3963 pic= remove_short(h, s->current_picture_ptr->frame_num);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3964 if(pic){
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
3965 unreference_pic(h, pic);
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
3966 av_log(h->s.avctx, AV_LOG_ERROR, "illegal short term buffer state detected\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3967 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3968
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3969 if(h->short_ref_count)
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
3970 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
3971
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
3972 h->short_ref[0]= s->current_picture_ptr;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3973 h->short_ref[0]->long_ref=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3974 h->short_ref_count++;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3975 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3976
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
3977 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
3978 print_long_term(h);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3979 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3980 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3981
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3982 static int decode_ref_pic_marking(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3983 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3984 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3985
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3986 if(h->nal_unit_type == NAL_IDR_SLICE){ //FIXME fields
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3987 s->broken_link= get_bits1(&s->gb) -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3988 h->mmco[0].long_index= get_bits1(&s->gb) - 1; // current_long_term_idx
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3989 if(h->mmco[0].long_index == -1)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3990 h->mmco_index= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3991 else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3992 h->mmco[0].opcode= MMCO_LONG;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3993 h->mmco_index= 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3994 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3995 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3996 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
3997 for(i= 0; i<MAX_MMCO_COUNT; i++) {
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3998 MMCOOpcode opcode= get_ue_golomb(&s->gb);;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3999
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4000 h->mmco[i].opcode= opcode;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4001 if(opcode==MMCO_SHORT2UNUSED || opcode==MMCO_SHORT2LONG){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4002 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
4003 /* if(h->mmco[i].short_frame_num >= h->short_ref_count || h->short_ref[ h->mmco[i].short_frame_num ] == NULL){
2846
40765c51a7a9 Compilation fixes part 1 patch by (Arvind R. and Burkhard Plaum, plaum, ipf uni-stuttgart de)
michael
parents: 2844
diff changeset
4004 av_log(s->avctx, AV_LOG_ERROR, "illegal short ref in memory management control operation %d\n", mmco);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4005 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4006 }*/
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4007 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4008 if(opcode==MMCO_SHORT2LONG || opcode==MMCO_LONG2UNUSED || opcode==MMCO_LONG || opcode==MMCO_SET_MAX_LONG){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4009 h->mmco[i].long_index= get_ue_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4010 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
4011 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
4012 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4013 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4014 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4015
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4016 if(opcode > MMCO_LONG){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
4017 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
4018 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4019 }
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
4020 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
4021 break;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4022 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4023 h->mmco_index= i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4024 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4025 assert(h->long_ref_count + h->short_ref_count <= h->sps.ref_frame_count);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4026
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4027 if(h->long_ref_count + h->short_ref_count == h->sps.ref_frame_count){ //FIXME fields
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4028 h->mmco[0].opcode= MMCO_SHORT2UNUSED;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4029 h->mmco[0].short_frame_num= h->short_ref[ h->short_ref_count - 1 ]->frame_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4030 h->mmco_index= 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4031 }else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4032 h->mmco_index= 0;
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
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4036 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4037 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4038
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4039 static int init_poc(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4040 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4041 const int max_frame_num= 1<<h->sps.log2_max_frame_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4042 int field_poc[2];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4043
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4044 if(h->nal_unit_type == NAL_IDR_SLICE){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4045 h->frame_num_offset= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4046 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4047 if(h->frame_num < h->prev_frame_num)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4048 h->frame_num_offset= h->prev_frame_num_offset + max_frame_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4049 else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4050 h->frame_num_offset= h->prev_frame_num_offset;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4051 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4052
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4053 if(h->sps.poc_type==0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4054 const int max_poc_lsb= 1<<h->sps.log2_max_poc_lsb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4055
2649
b2e6c5e9240b fix decoding of conformace streams AUD_MW_E.264 and BA1_FT_C.264 again (there where last correctly decoded with h264.c rev 1.96)
michael
parents: 2648
diff changeset
4056 if(h->nal_unit_type == NAL_IDR_SLICE){
b2e6c5e9240b fix decoding of conformace streams AUD_MW_E.264 and BA1_FT_C.264 again (there where last correctly decoded with h264.c rev 1.96)
michael
parents: 2648
diff changeset
4057 h->prev_poc_msb=
b2e6c5e9240b fix decoding of conformace streams AUD_MW_E.264 and BA1_FT_C.264 again (there where last correctly decoded with h264.c rev 1.96)
michael
parents: 2648
diff changeset
4058 h->prev_poc_lsb= 0;
b2e6c5e9240b fix decoding of conformace streams AUD_MW_E.264 and BA1_FT_C.264 again (there where last correctly decoded with h264.c rev 1.96)
michael
parents: 2648
diff changeset
4059 }
b2e6c5e9240b fix decoding of conformace streams AUD_MW_E.264 and BA1_FT_C.264 again (there where last correctly decoded with h264.c rev 1.96)
michael
parents: 2648
diff changeset
4060
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4061 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
4062 h->poc_msb = h->prev_poc_msb + max_poc_lsb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4063 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
4064 h->poc_msb = h->prev_poc_msb - max_poc_lsb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4065 else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4066 h->poc_msb = h->prev_poc_msb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4067 //printf("poc: %d %d\n", h->poc_msb, h->poc_lsb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4068 field_poc[0] =
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4069 field_poc[1] = h->poc_msb + h->poc_lsb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4070 if(s->picture_structure == PICT_FRAME)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4071 field_poc[1] += h->delta_poc_bottom;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4072 }else if(h->sps.poc_type==1){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4073 int abs_frame_num, expected_delta_per_poc_cycle, expectedpoc;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4074 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4075
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4076 if(h->sps.poc_cycle_length != 0)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4077 abs_frame_num = h->frame_num_offset + h->frame_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4078 else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4079 abs_frame_num = 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4080
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4081 if(h->nal_ref_idc==0 && abs_frame_num > 0)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4082 abs_frame_num--;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4083
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4084 expected_delta_per_poc_cycle = 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4085 for(i=0; i < h->sps.poc_cycle_length; i++)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4086 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
4087
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4088 if(abs_frame_num > 0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4089 int poc_cycle_cnt = (abs_frame_num - 1) / h->sps.poc_cycle_length;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4090 int frame_num_in_poc_cycle = (abs_frame_num - 1) % h->sps.poc_cycle_length;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4091
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4092 expectedpoc = poc_cycle_cnt * expected_delta_per_poc_cycle;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4093 for(i = 0; i <= frame_num_in_poc_cycle; i++)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4094 expectedpoc = expectedpoc + h->sps.offset_for_ref_frame[ i ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4095 } else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4096 expectedpoc = 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4097
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4098 if(h->nal_ref_idc == 0)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4099 expectedpoc = expectedpoc + h->sps.offset_for_non_ref_pic;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4100
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4101 field_poc[0] = expectedpoc + h->delta_poc[0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4102 field_poc[1] = field_poc[0] + h->sps.offset_for_top_to_bottom_field;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4103
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4104 if(s->picture_structure == PICT_FRAME)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4105 field_poc[1] += h->delta_poc[1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4106 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4107 int poc;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4108 if(h->nal_unit_type == NAL_IDR_SLICE){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4109 poc= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4110 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4111 if(h->nal_ref_idc) poc= 2*(h->frame_num_offset + h->frame_num);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4112 else poc= 2*(h->frame_num_offset + h->frame_num) - 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4113 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4114 field_poc[0]= poc;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4115 field_poc[1]= poc;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4116 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4117
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4118 if(s->picture_structure != PICT_BOTTOM_FIELD)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4119 s->current_picture_ptr->field_poc[0]= field_poc[0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4120 if(s->picture_structure != PICT_TOP_FIELD)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4121 s->current_picture_ptr->field_poc[1]= field_poc[1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4122 if(s->picture_structure == PICT_FRAME) // FIXME field pix?
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4123 s->current_picture_ptr->poc= FFMIN(field_poc[0], field_poc[1]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4124
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4125 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4126 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4127
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4128 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4129 * decodes a slice header.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4130 * this will allso call MPV_common_init() and frame_start() as needed
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4131 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4132 static int decode_slice_header(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4133 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4134 int first_mb_in_slice, pps_id;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4135 int num_ref_idx_active_override_flag;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4136 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
4137 int slice_type;
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
4138 int default_ref_list_done = 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4139
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4140 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
4141 s->dropable= h->nal_ref_idc == 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4142
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4143 first_mb_in_slice= get_ue_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4144
2498
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
4145 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
4146 if(slice_type > 9){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
4147 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
4148 return -1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4149 }
2498
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
4150 if(slice_type > 4){
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
4151 slice_type -= 5;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4152 h->slice_type_fixed=1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4153 }else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4154 h->slice_type_fixed=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4155
2498
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
4156 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
4157 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
4158 || (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
4159 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
4160 }
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
4161 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
4162
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
4163 s->pict_type= h->slice_type; // to make a few old func happy, it's wrong though
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4164
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4165 pps_id= get_ue_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4166 if(pps_id>255){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
4167 av_log(h->s.avctx, AV_LOG_ERROR, "pps_id out of range\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4168 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4169 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4170 h->pps= h->pps_buffer[pps_id];
1174
2de2a847af67 some checks to avoid segfault
michaelni
parents: 1170
diff changeset
4171 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
4172 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
4173 return -1;
2de2a847af67 some checks to avoid segfault
michaelni
parents: 1170
diff changeset
4174 }
2de2a847af67 some checks to avoid segfault
michaelni
parents: 1170
diff changeset
4175
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4176 h->sps= h->sps_buffer[ h->pps.sps_id ];
1174
2de2a847af67 some checks to avoid segfault
michaelni
parents: 1170
diff changeset
4177 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
4178 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
4179 return -1;
2de2a847af67 some checks to avoid segfault
michaelni
parents: 1170
diff changeset
4180 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4181
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4182 s->mb_width= h->sps.mb_width;
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
4183 s->mb_height= h->sps.mb_height * (2 - h->sps.frame_mbs_only_flag);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4184
2395
81516be6d0e4 vismv for h264 displayed incorrect motion vectors.
lorenm
parents: 2392
diff changeset
4185 h->b_stride= s->mb_width*4 + 1;
81516be6d0e4 vismv for h264 displayed incorrect motion vectors.
lorenm
parents: 2392
diff changeset
4186 h->b8_stride= s->mb_width*2 + 1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4187
1371
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
4188 s->width = 16*s->mb_width - 2*(h->sps.crop_left + h->sps.crop_right );
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4189 if(h->sps.frame_mbs_only_flag)
1371
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
4190 s->height= 16*s->mb_height - 2*(h->sps.crop_top + h->sps.crop_bottom);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4191 else
1371
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
4192 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
4193
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4194 if (s->context_initialized
1548
dd544554ed42 AVRational
michael
parents: 1524
diff changeset
4195 && ( s->width != s->avctx->width || s->height != s->avctx->height)) {
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4196 free_tables(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4197 MPV_common_end(s);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4198 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4199 if (!s->context_initialized) {
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4200 if (MPV_common_init(s) < 0)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4201 return -1;
2758
a7925aaeea1e 10l (dont read variables before they have been set)
michael
parents: 2757
diff changeset
4202
a7925aaeea1e 10l (dont read variables before they have been set)
michael
parents: 2757
diff changeset
4203 if(s->dsp.h264_idct_add == ff_h264_idct_add_c){ //FIXME little ugly
a7925aaeea1e 10l (dont read variables before they have been set)
michael
parents: 2757
diff changeset
4204 memcpy(h->zigzag_scan, zigzag_scan, 16*sizeof(uint8_t));
a7925aaeea1e 10l (dont read variables before they have been set)
michael
parents: 2757
diff changeset
4205 memcpy(h-> field_scan, field_scan, 16*sizeof(uint8_t));
a7925aaeea1e 10l (dont read variables before they have been set)
michael
parents: 2757
diff changeset
4206 }else{
a7925aaeea1e 10l (dont read variables before they have been set)
michael
parents: 2757
diff changeset
4207 int i;
a7925aaeea1e 10l (dont read variables before they have been set)
michael
parents: 2757
diff changeset
4208 for(i=0; i<16; i++){
a7925aaeea1e 10l (dont read variables before they have been set)
michael
parents: 2757
diff changeset
4209 #define T(x) (x>>2) | ((x<<2) & 0xF)
a7925aaeea1e 10l (dont read variables before they have been set)
michael
parents: 2757
diff changeset
4210 h->zigzag_scan[i] = T(zigzag_scan[i]);
a7925aaeea1e 10l (dont read variables before they have been set)
michael
parents: 2757
diff changeset
4211 h-> field_scan[i] = T( field_scan[i]);
a7925aaeea1e 10l (dont read variables before they have been set)
michael
parents: 2757
diff changeset
4212 }
a7925aaeea1e 10l (dont read variables before they have been set)
michael
parents: 2757
diff changeset
4213 }
2763
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
4214 if(h->sps.transform_bypass){ //FIXME same ugly
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
4215 h->zigzag_scan_q0 = zigzag_scan;
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
4216 h->field_scan_q0 = field_scan;
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
4217 }else{
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
4218 h->zigzag_scan_q0 = h->zigzag_scan;
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
4219 h->field_scan_q0 = h->field_scan;
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
4220 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4221
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4222 alloc_tables(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4223
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4224 s->avctx->width = s->width;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4225 s->avctx->height = s->height;
1548
dd544554ed42 AVRational
michael
parents: 1524
diff changeset
4226 s->avctx->sample_aspect_ratio= h->sps.sar;
2440
cf97353f94c6 div by zero aspect fix
michael
parents: 2422
diff changeset
4227 if(!s->avctx->sample_aspect_ratio.den)
cf97353f94c6 div by zero aspect fix
michael
parents: 2422
diff changeset
4228 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
4229
2648
c3a06b0b00e2 set time_base for variable fps too
michael
parents: 2645
diff changeset
4230 if(h->sps.timing_info_present_flag){
2637
ef44d24680d1 switch to native time bases
michael
parents: 2633
diff changeset
4231 s->avctx->time_base= (AVRational){h->sps.num_units_in_tick, h->sps.time_scale};
2174
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents: 2163
diff changeset
4232 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4233 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4234
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
4235 if(h->slice_num == 0){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4236 frame_start(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4237 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4238
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
4239 s->current_picture_ptr->frame_num= //FIXME frame_num cleanup
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4240 h->frame_num= get_bits(&s->gb, h->sps.log2_max_frame_num);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4241
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
4242 h->mb_aff_frame = 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4243 if(h->sps.frame_mbs_only_flag){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4244 s->picture_structure= PICT_FRAME;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4245 }else{
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
4246 if(get_bits1(&s->gb)) { //field_pic_flag
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4247 s->picture_structure= PICT_TOP_FIELD + get_bits1(&s->gb); //bottom_field_flag
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
4248 } else {
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4249 s->picture_structure= PICT_FRAME;
2773
1d1b328d07ce fixing first_mb_in_slice if frame_mbs_only_flag==0 && mb_aff==0
michael
parents: 2772
diff changeset
4250 first_mb_in_slice <<= h->sps.mb_aff;
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
4251 h->mb_aff_frame = h->sps.mb_aff;
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
4252 }
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
4253 }
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
4254
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
4255 s->resync_mb_x = s->mb_x = first_mb_in_slice % s->mb_width;
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
4256 s->resync_mb_y = s->mb_y = first_mb_in_slice / s->mb_width;
2772
4d8010054ba9 check mb_y
michael
parents: 2771
diff changeset
4257 if(s->mb_y >= s->mb_height){
4d8010054ba9 check mb_y
michael
parents: 2771
diff changeset
4258 return -1;
4d8010054ba9 check mb_y
michael
parents: 2771
diff changeset
4259 }
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
4260
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4261 if(s->picture_structure==PICT_FRAME){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4262 h->curr_pic_num= h->frame_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4263 h->max_pic_num= 1<< h->sps.log2_max_frame_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4264 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4265 h->curr_pic_num= 2*h->frame_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4266 h->max_pic_num= 1<<(h->sps.log2_max_frame_num + 1);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4267 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4268
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4269 if(h->nal_unit_type == NAL_IDR_SLICE){
1453
20a79b0e6d2a removed warnings
bellard
parents: 1371
diff changeset
4270 get_ue_golomb(&s->gb); /* idr_pic_id */
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4271 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4272
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4273 if(h->sps.poc_type==0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4274 h->poc_lsb= get_bits(&s->gb, h->sps.log2_max_poc_lsb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4275
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4276 if(h->pps.pic_order_present==1 && s->picture_structure==PICT_FRAME){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4277 h->delta_poc_bottom= get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4278 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4279 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4280
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4281 if(h->sps.poc_type==1 && !h->sps.delta_pic_order_always_zero_flag){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4282 h->delta_poc[0]= get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4283
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4284 if(h->pps.pic_order_present==1 && s->picture_structure==PICT_FRAME)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4285 h->delta_poc[1]= get_se_golomb(&s->gb);
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 init_poc(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4289
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4290 if(h->pps.redundant_pic_cnt_present){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4291 h->redundant_pic_count= get_ue_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4292 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4293
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4294 //set defaults, might be overriden a few line later
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4295 h->ref_count[0]= h->pps.ref_count[0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4296 h->ref_count[1]= h->pps.ref_count[1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4297
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4298 if(h->slice_type == P_TYPE || h->slice_type == SP_TYPE || h->slice_type == B_TYPE){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4299 if(h->slice_type == B_TYPE){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4300 h->direct_spatial_mv_pred= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4301 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4302 num_ref_idx_active_override_flag= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4303
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4304 if(num_ref_idx_active_override_flag){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4305 h->ref_count[0]= get_ue_golomb(&s->gb) + 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4306 if(h->slice_type==B_TYPE)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4307 h->ref_count[1]= get_ue_golomb(&s->gb) + 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4308
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4309 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
4310 av_log(h->s.avctx, AV_LOG_ERROR, "reference overflow\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4311 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4312 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4313 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4314 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4315
2498
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
4316 if(!default_ref_list_done){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4317 fill_default_ref_list(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4318 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4319
2766
0609f405e000 make decoder a little bit more tolerant to missing NAL units
michael
parents: 2763
diff changeset
4320 if(decode_ref_pic_list_reordering(h) < 0)
0609f405e000 make decoder a little bit more tolerant to missing NAL units
michael
parents: 2763
diff changeset
4321 return -1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4322
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4323 if( (h->pps.weighted_pred && (h->slice_type == P_TYPE || h->slice_type == SP_TYPE ))
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4324 || (h->pps.weighted_bipred_idc==1 && h->slice_type==B_TYPE ) )
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4325 pred_weight_table(h);
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
4326 else if(h->pps.weighted_bipred_idc==2 && h->slice_type==B_TYPE)
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
4327 implicit_weight_table(h);
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
4328 else
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
4329 h->use_weight = 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4330
2580
b4f6f89ec2f6 The cvs version 1.103 of h264.c brokes 13 conformance streams, this
michael
parents: 2561
diff changeset
4331 if(s->current_picture.reference)
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4332 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
4333
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4334 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
4335 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
4336
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4337 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
4338 s->qscale = h->pps.init_qp + get_se_golomb(&s->gb);
1898
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4339 if(s->qscale<0 || s->qscale>51){
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4340 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
4341 return -1;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4342 }
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
4343 h->chroma_qp = get_chroma_qp(h->pps.chroma_qp_index_offset, s->qscale);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4344 //FIXME qscale / qp ... stuff
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4345 if(h->slice_type == SP_TYPE){
1453
20a79b0e6d2a removed warnings
bellard
parents: 1371
diff changeset
4346 get_bits1(&s->gb); /* sp_for_switch_flag */
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4347 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4348 if(h->slice_type==SP_TYPE || h->slice_type == SI_TYPE){
1453
20a79b0e6d2a removed warnings
bellard
parents: 1371
diff changeset
4349 get_se_golomb(&s->gb); /* slice_qs_delta */
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4350 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4351
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
4352 h->deblocking_filter = 1;
1898
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4353 h->slice_alpha_c0_offset = 0;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4354 h->slice_beta_offset = 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4355 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
4356 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
4357 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
4358 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
4359
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
4360 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
4361 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
4362 h->slice_beta_offset = get_se_golomb(&s->gb) << 1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4363 }
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
4364 }
2792
0a8c847ad5e7 skip_idct
michael
parents: 2781
diff changeset
4365 if( s->avctx->skip_loop_filter >= AVDISCARD_ALL
0a8c847ad5e7 skip_idct
michael
parents: 2781
diff changeset
4366 ||(s->avctx->skip_loop_filter >= AVDISCARD_NONKEY && h->slice_type != I_TYPE)
0a8c847ad5e7 skip_idct
michael
parents: 2781
diff changeset
4367 ||(s->avctx->skip_loop_filter >= AVDISCARD_BIDIR && h->slice_type == B_TYPE)
0a8c847ad5e7 skip_idct
michael
parents: 2781
diff changeset
4368 ||(s->avctx->skip_loop_filter >= AVDISCARD_NONREF && h->nal_ref_idc == 0))
0a8c847ad5e7 skip_idct
michael
parents: 2781
diff changeset
4369 h->deblocking_filter= 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4370
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4371 #if 0 //FMO
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4372 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
4373 slice_group_change_cycle= get_bits(&s->gb, ?);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4374 #endif
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4375
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
4376 h->slice_num++;
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
4377
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4378 if(s->avctx->debug&FF_DEBUG_PICT_INFO){
2583
61a08e2b9822 display deblocking strength in FF_DEBUG_PICT_INFO
lorenm
parents: 2582
diff changeset
4379 av_log(h->s.avctx, AV_LOG_DEBUG, "slice:%d %s mb:%d %c pps:%d frame:%d poc:%d/%d ref:%d/%d qp:%d loop:%d:%d:%d weight:%d%s\n",
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
4380 h->slice_num,
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
4381 (s->picture_structure==PICT_FRAME ? "F" : s->picture_structure==PICT_TOP_FIELD ? "T" : "B"),
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
4382 first_mb_in_slice,
1264
2fa34e615c76 cleanup
michaelni
parents: 1252
diff changeset
4383 av_get_pict_type_char(h->slice_type),
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4384 pps_id, h->frame_num,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4385 s->current_picture_ptr->field_poc[0], s->current_picture_ptr->field_poc[1],
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4386 h->ref_count[0], h->ref_count[1],
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4387 s->qscale,
2583
61a08e2b9822 display deblocking strength in FF_DEBUG_PICT_INFO
lorenm
parents: 2582
diff changeset
4388 h->deblocking_filter, h->slice_alpha_c0_offset/2, h->slice_beta_offset/2,
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
4389 h->use_weight,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
4390 h->use_weight==1 && h->use_weight_chroma ? "c" : ""
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4391 );
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4392 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4393
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4394 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4395 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4396
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4397 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4398 *
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4399 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4400 static inline int get_level_prefix(GetBitContext *gb){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4401 unsigned int buf;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4402 int log;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4403
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4404 OPEN_READER(re, gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4405 UPDATE_CACHE(re, gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4406 buf=GET_CACHE(re, gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4407
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4408 log= 32 - av_log2(buf);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4409 #ifdef TRACE
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4410 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
4411 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
4412 #endif
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4413
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4414 LAST_SKIP_BITS(re, gb, log);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4415 CLOSE_READER(re, gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4416
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4417 return log-1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4418 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4419
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4420 static inline int get_dct8x8_allowed(H264Context *h){
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4421 int i;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4422 for(i=0; i<4; i++){
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4423 if(!IS_SUB_8X8(h->sub_mb_type[i])
2781
899a2ea0907c parenthesing to avoid compiler errors in the future - compared asm outputs, behaviour didnt changed
alex
parents: 2774
diff changeset
4424 || (!h->sps.direct_8x8_inference_flag && IS_DIRECT(h->sub_mb_type[i])))
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4425 return 0;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4426 }
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4427 return 1;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4428 }
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4429
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4430 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4431 * decodes a residual block.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4432 * @param n block index
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4433 * @param scantable scantable
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4434 * @param max_coeff number of coefficients in the block
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4435 * @return <0 if an error occured
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4436 */
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4437 static int decode_residual(H264Context *h, GetBitContext *gb, DCTELEM *block, int n, const uint8_t *scantable, const uint16_t *qmul, int max_coeff){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4438 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4439 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
4440 int level[16], run[16];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4441 int suffix_length, zeros_left, coeff_num, coeff_token, total_coeff, i, trailing_ones;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4442
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4443 //FIXME put trailing_onex into the context
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4444
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4445 if(n == CHROMA_DC_BLOCK_INDEX){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4446 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
4447 total_coeff= coeff_token>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4448 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4449 if(n == LUMA_DC_BLOCK_INDEX){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4450 total_coeff= pred_non_zero_count(h, 0);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4451 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
4452 total_coeff= coeff_token>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4453 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4454 total_coeff= pred_non_zero_count(h, n);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4455 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
4456 total_coeff= coeff_token>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4457 h->non_zero_count_cache[ scan8[n] ]= total_coeff;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4458 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4459 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4460
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4461 //FIXME set last_non_zero?
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4462
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4463 if(total_coeff==0)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4464 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4465
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4466 trailing_ones= coeff_token&3;
1170
4710976004a5 #ifdef TRACE printf() -> tprintf()
michaelni
parents: 1169
diff changeset
4467 tprintf("trailing:%d, total:%d\n", trailing_ones, total_coeff);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4468 assert(total_coeff<=16);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4469
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4470 for(i=0; i<trailing_ones; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4471 level[i]= 1 - 2*get_bits1(gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4472 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4473
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4474 suffix_length= total_coeff > 10 && trailing_ones < 3;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4475
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4476 for(; i<total_coeff; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4477 const int prefix= get_level_prefix(gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4478 int level_code, mask;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4479
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4480 if(prefix<14){ //FIXME try to build a large unified VLC table for all this
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4481 if(suffix_length)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4482 level_code= (prefix<<suffix_length) + get_bits(gb, suffix_length); //part
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4483 else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4484 level_code= (prefix<<suffix_length); //part
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4485 }else if(prefix==14){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4486 if(suffix_length)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4487 level_code= (prefix<<suffix_length) + get_bits(gb, suffix_length); //part
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4488 else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4489 level_code= prefix + get_bits(gb, 4); //part
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4490 }else if(prefix==15){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4491 level_code= (prefix<<suffix_length) + get_bits(gb, 12); //part
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
4492 if(suffix_length==0) level_code+=15; //FIXME doesn't make (much)sense
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4493 }else{
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
4494 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
4495 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4496 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4497
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4498 if(i==trailing_ones && i<3) level_code+= 2; //FIXME split first iteration
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4499
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4500 mask= -(level_code&1);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4501 level[i]= (((2+level_code)>>1) ^ mask) - mask;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4502
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4503 if(suffix_length==0) suffix_length=1; //FIXME split first iteration
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4504
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4505 #if 1
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4506 if(ABS(level[i]) > (3<<(suffix_length-1)) && suffix_length<6) suffix_length++;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4507 #else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4508 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
4509 /* ? == prefix > 2 or sth */
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4510 #endif
1170
4710976004a5 #ifdef TRACE printf() -> tprintf()
michaelni
parents: 1169
diff changeset
4511 tprintf("level: %d suffix_length:%d\n", level[i], suffix_length);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4512 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4513
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4514 if(total_coeff == max_coeff)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4515 zeros_left=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4516 else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4517 if(n == CHROMA_DC_BLOCK_INDEX)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4518 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
4519 else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4520 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
4521 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4522
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4523 for(i=0; i<total_coeff-1; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4524 if(zeros_left <=0)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4525 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4526 else if(zeros_left < 7){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4527 run[i]= get_vlc2(gb, run_vlc[zeros_left-1].table, RUN_VLC_BITS, 1);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4528 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4529 run[i]= get_vlc2(gb, run7_vlc.table, RUN7_VLC_BITS, 2);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4530 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4531 zeros_left -= run[i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4532 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4533
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4534 if(zeros_left<0){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
4535 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
4536 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4537 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4538
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4539 for(; i<total_coeff-1; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4540 run[i]= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4541 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4542
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4543 run[i]= zeros_left;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4544
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4545 coeff_num=-1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4546 if(n > 24){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4547 for(i=total_coeff-1; i>=0; i--){ //FIXME merge into rundecode?
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4548 int j;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4549
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4550 coeff_num += run[i] + 1; //FIXME add 1 earlier ?
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4551 j= scantable[ coeff_num ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4552
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4553 block[j]= level[i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4554 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4555 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4556 for(i=total_coeff-1; i>=0; i--){ //FIXME merge into rundecode?
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4557 int j;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4558
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4559 coeff_num += run[i] + 1; //FIXME add 1 earlier ?
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4560 j= scantable[ coeff_num ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4561
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4562 block[j]= level[i] * qmul[j];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4563 // printf("%d %d ", block[j], qmul[j]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4564 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4565 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4566 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4567 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4568
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4569 /**
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4570 * decodes a P_SKIP or B_SKIP macroblock
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4571 */
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4572 static void decode_mb_skip(H264Context *h){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4573 MpegEncContext * const s = &h->s;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4574 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride;
2674
58fb8e1efcae 10l (mb_type uninitalized and then changed and overwritten)
michael
parents: 2673
diff changeset
4575 int mb_type=0;
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4576
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4577 memset(h->non_zero_count[mb_xy], 0, 16);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4578 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
4579
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
4580 if(h->mb_aff_frame && s->mb_skip_run==0 && (s->mb_y&1)==0){
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
4581 h->mb_field_decoding_flag= get_bits1(&s->gb);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
4582 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
4583 if(h->mb_field_decoding_flag)
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
4584 mb_type|= MB_TYPE_INTERLACED;
2674
58fb8e1efcae 10l (mb_type uninitalized and then changed and overwritten)
michael
parents: 2673
diff changeset
4585
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4586 if( h->slice_type == B_TYPE )
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4587 {
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4588 // just for fill_caches. pred_direct_motion will set the real mb_type
2674
58fb8e1efcae 10l (mb_type uninitalized and then changed and overwritten)
michael
parents: 2673
diff changeset
4589 mb_type|= MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2|MB_TYPE_SKIP;
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4590
2449
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
4591 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
4592 pred_direct_motion(h, &mb_type);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4593 if(h->pps.cabac){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4594 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
4595 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
4596 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4597 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4598 else
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4599 {
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4600 int mx, my;
2674
58fb8e1efcae 10l (mb_type uninitalized and then changed and overwritten)
michael
parents: 2673
diff changeset
4601 mb_type|= MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P1L0|MB_TYPE_SKIP;
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4602
2449
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
4603 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
4604 pred_pskip_motion(h, &mx, &my);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4605 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
4606 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
4607 if(h->pps.cabac)
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4608 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
4609 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4610
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4611 write_back_motion(h, mb_type);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4612 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
4613 s->current_picture.qscale_table[mb_xy]= s->qscale;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4614 h->slice_table[ mb_xy ]= h->slice_num;
2628
511e3afc43e1 Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents: 2623
diff changeset
4615 h->prev_mb_skipped= 1;
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4616 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4617
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4618 /**
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4619 * decodes a macroblock
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4620 * @returns 0 if ok, AC_ERROR / DC_ERROR / MV_ERROR if an error is noticed
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4621 */
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4622 static int decode_mb_cavlc(H264Context *h){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4623 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
4624 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride;
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
4625 int mb_type, partition_count, cbp;
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4626 int dct8x8_allowed= h->pps.transform_8x8_mode;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4627
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
4628 s->dsp.clear_blocks(h->mb); //FIXME avoid if already clear (move after skip handlong?
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4629
1170
4710976004a5 #ifdef TRACE printf() -> tprintf()
michaelni
parents: 1169
diff changeset
4630 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
4631 cbp = 0; /* avoid warning. FIXME: find a solution without slowing
20a79b0e6d2a removed warnings
bellard
parents: 1371
diff changeset
4632 down the code */
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4633 if(h->slice_type != I_TYPE && h->slice_type != SI_TYPE){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4634 if(s->mb_skip_run==-1)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4635 s->mb_skip_run= get_ue_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4636
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4637 if (s->mb_skip_run--) {
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4638 decode_mb_skip(h);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4639 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4640 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4641 }
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
4642 if(h->mb_aff_frame){
2628
511e3afc43e1 Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents: 2623
diff changeset
4643 if ( ((s->mb_y&1) == 0) || h->prev_mb_skipped)
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4644 h->mb_field_decoding_flag = get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4645 }else
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
4646 h->mb_field_decoding_flag= (s->picture_structure!=PICT_FRAME);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4647
2628
511e3afc43e1 Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents: 2623
diff changeset
4648 h->prev_mb_skipped= 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4649
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4650 mb_type= get_ue_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4651 if(h->slice_type == B_TYPE){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4652 if(mb_type < 23){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4653 partition_count= b_mb_type_info[mb_type].partition_count;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4654 mb_type= b_mb_type_info[mb_type].type;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4655 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4656 mb_type -= 23;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4657 goto decode_intra_mb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4658 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4659 }else if(h->slice_type == P_TYPE /*|| h->slice_type == SP_TYPE */){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4660 if(mb_type < 5){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4661 partition_count= p_mb_type_info[mb_type].partition_count;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4662 mb_type= p_mb_type_info[mb_type].type;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4663 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4664 mb_type -= 5;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4665 goto decode_intra_mb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4666 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4667 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4668 assert(h->slice_type == I_TYPE);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4669 decode_intra_mb:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4670 if(mb_type > 25){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
4671 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
4672 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4673 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4674 partition_count=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4675 cbp= i_mb_type_info[mb_type].cbp;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4676 h->intra16x16_pred_mode= i_mb_type_info[mb_type].pred_mode;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4677 mb_type= i_mb_type_info[mb_type].type;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4678 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4679
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4680 if(h->mb_field_decoding_flag)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4681 mb_type |= MB_TYPE_INTERLACED;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4682
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4683 h->slice_table[ mb_xy ]= h->slice_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4684
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4685 if(IS_INTRA_PCM(mb_type)){
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
4686 unsigned int x, y;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4687
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4688 // we assume these blocks are very rare so we dont optimize it
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4689 align_get_bits(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4690
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
4691 // The pixels are stored in the same order as levels in h->mb array.
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4692 for(y=0; y<16; y++){
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
4693 const int index= 4*(y&3) + 32*((y>>2)&1) + 128*(y>>3);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4694 for(x=0; x<16; x++){
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
4695 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
4696 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
4697 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4698 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4699 for(y=0; y<8; y++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4700 const int index= 256 + 4*(y&3) + 32*(y>>2);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4701 for(x=0; x<8; x++){
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
4702 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
4703 h->mb[index + (x&3) + 16*(x>>2)]= get_bits(&s->gb, 8);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4704 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4705 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4706 for(y=0; y<8; y++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4707 const int index= 256 + 64 + 4*(y&3) + 32*(y>>2);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4708 for(x=0; x<8; x++){
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
4709 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
4710 h->mb[index + (x&3) + 16*(x>>2)]= get_bits(&s->gb, 8);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4711 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4712 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4713
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
4714 // In deblocking, the quantizer is 0
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
4715 s->current_picture.qscale_table[mb_xy]= 0;
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
4716 h->chroma_qp = get_chroma_qp(h->pps.chroma_qp_index_offset, 0);
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
4717 // All coeffs are present
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
4718 memset(h->non_zero_count[mb_xy], 16, 16);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4719
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4720 s->current_picture.mb_type[mb_xy]= mb_type;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4721 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4722 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4723
2449
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
4724 fill_caches(h, mb_type, 0);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4725
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4726 //mb_pred
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4727 if(IS_INTRA(mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4728 // init_top_left_availability(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4729 if(IS_INTRA4x4(mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4730 int i;
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4731 int di = 1;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4732 if(dct8x8_allowed && get_bits1(&s->gb)){
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4733 mb_type |= MB_TYPE_8x8DCT;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4734 di = 4;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4735 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4736
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4737 // fill_intra4x4_pred_table(h);
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4738 for(i=0; i<16; i+=di){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4739 const int mode_coded= !get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4740 const int predicted_mode= pred_intra_mode(h, i);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4741 int mode;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4742
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4743 if(mode_coded){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4744 const int rem_mode= get_bits(&s->gb, 3);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4745 if(rem_mode<predicted_mode)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4746 mode= rem_mode;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4747 else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4748 mode= rem_mode + 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4749 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4750 mode= predicted_mode;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4751 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4752
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4753 if(di==4)
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4754 fill_rectangle( &h->intra4x4_pred_mode_cache[ scan8[i] ], 2, 2, 8, mode, 1 );
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4755 else
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4756 h->intra4x4_pred_mode_cache[ scan8[i] ] = mode;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4757 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4758 write_back_intra_pred_mode(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4759 if( check_intra4x4_pred_mode(h) < 0)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4760 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4761 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4762 h->intra16x16_pred_mode= check_intra_pred_mode(h, h->intra16x16_pred_mode);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4763 if(h->intra16x16_pred_mode < 0)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4764 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4765 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4766 h->chroma_pred_mode= get_ue_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4767
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4768 h->chroma_pred_mode= check_intra_pred_mode(h, h->chroma_pred_mode);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4769 if(h->chroma_pred_mode < 0)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4770 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4771 }else if(partition_count==4){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4772 int i, j, sub_partition_count[4], list, ref[2][4];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4773
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4774 if(h->slice_type == B_TYPE){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4775 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4776 h->sub_mb_type[i]= get_ue_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4777 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
4778 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
4779 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4780 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4781 sub_partition_count[i]= b_sub_mb_type_info[ h->sub_mb_type[i] ].partition_count;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4782 h->sub_mb_type[i]= b_sub_mb_type_info[ h->sub_mb_type[i] ].type;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4783 }
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4784 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
4785 || 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
4786 pred_direct_motion(h, &mb_type);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4787 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4788 assert(h->slice_type == P_TYPE || h->slice_type == SP_TYPE); //FIXME SP correct ?
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4789 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4790 h->sub_mb_type[i]= get_ue_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4791 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
4792 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
4793 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4794 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4795 sub_partition_count[i]= p_sub_mb_type_info[ h->sub_mb_type[i] ].partition_count;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4796 h->sub_mb_type[i]= p_sub_mb_type_info[ h->sub_mb_type[i] ].type;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4797 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4798 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4799
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4800 for(list=0; list<2; list++){
2594
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
4801 int ref_count= IS_REF0(mb_type) ? 1 : h->ref_count[list];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4802 if(ref_count == 0) continue;
2594
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
4803 if (h->mb_aff_frame && h->mb_field_decoding_flag) {
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
4804 ref_count <<= 1;
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
4805 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4806 for(i=0; i<4; i++){
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4807 if(IS_DIRECT(h->sub_mb_type[i])) continue;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4808 if(IS_DIR(h->sub_mb_type[i], 0, list)){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4809 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
4810 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4811 //FIXME
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4812 ref[list][i] = -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4813 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4814 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4815 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4816
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4817 if(dct8x8_allowed)
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4818 dct8x8_allowed = get_dct8x8_allowed(h);
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4819
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4820 for(list=0; list<2; list++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4821 const int ref_count= IS_REF0(mb_type) ? 1 : h->ref_count[list];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4822 if(ref_count == 0) continue;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4823
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4824 for(i=0; i<4; i++){
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4825 if(IS_DIRECT(h->sub_mb_type[i])) continue;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4826 h->ref_cache[list][ scan8[4*i] ]=h->ref_cache[list][ scan8[4*i]+1 ]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4827 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
4828
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4829 if(IS_DIR(h->sub_mb_type[i], 0, list)){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4830 const int sub_mb_type= h->sub_mb_type[i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4831 const int block_width= (sub_mb_type & (MB_TYPE_16x16|MB_TYPE_16x8)) ? 2 : 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4832 for(j=0; j<sub_partition_count[i]; j++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4833 int mx, my;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4834 const int index= 4*i + block_width*j;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4835 int16_t (* mv_cache)[2]= &h->mv_cache[list][ scan8[index] ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4836 pred_motion(h, index, block_width, list, h->ref_cache[list][ scan8[index] ], &mx, &my);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4837 mx += get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4838 my += get_se_golomb(&s->gb);
1170
4710976004a5 #ifdef TRACE printf() -> tprintf()
michaelni
parents: 1169
diff changeset
4839 tprintf("final mv:%d %d\n", mx, my);
4710976004a5 #ifdef TRACE printf() -> tprintf()
michaelni
parents: 1169
diff changeset
4840
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4841 if(IS_SUB_8X8(sub_mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4842 mv_cache[ 0 ][0]= mv_cache[ 1 ][0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4843 mv_cache[ 8 ][0]= mv_cache[ 9 ][0]= mx;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4844 mv_cache[ 0 ][1]= mv_cache[ 1 ][1]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4845 mv_cache[ 8 ][1]= mv_cache[ 9 ][1]= my;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4846 }else if(IS_SUB_8X4(sub_mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4847 mv_cache[ 0 ][0]= mv_cache[ 1 ][0]= mx;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4848 mv_cache[ 0 ][1]= mv_cache[ 1 ][1]= my;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4849 }else if(IS_SUB_4X8(sub_mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4850 mv_cache[ 0 ][0]= mv_cache[ 8 ][0]= mx;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4851 mv_cache[ 0 ][1]= mv_cache[ 8 ][1]= my;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4852 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4853 assert(IS_SUB_4X4(sub_mb_type));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4854 mv_cache[ 0 ][0]= mx;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4855 mv_cache[ 0 ][1]= my;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4856 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4857 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4858 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4859 uint32_t *p= (uint32_t *)&h->mv_cache[list][ scan8[4*i] ][0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4860 p[0] = p[1]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4861 p[8] = p[9]= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4862 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4863 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4864 }
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4865 }else if(IS_DIRECT(mb_type)){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4866 pred_direct_motion(h, &mb_type);
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4867 dct8x8_allowed &= h->sps.direct_8x8_inference_flag;
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4868 }else{
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4869 int list, mx, my, i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4870 //FIXME we should set ref_idx_l? to 0 if we use that later ...
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4871 if(IS_16X16(mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4872 for(list=0; list<2; list++){
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
4873 if(h->ref_count[list]>0){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4874 if(IS_DIR(mb_type, 0, list)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4875 const int val= get_te0_golomb(&s->gb, h->ref_count[list]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4876 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
4877 }else
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
4878 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
4879 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4880 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4881 for(list=0; list<2; list++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4882 if(IS_DIR(mb_type, 0, list)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4883 pred_motion(h, 0, 4, list, h->ref_cache[list][ scan8[0] ], &mx, &my);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4884 mx += get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4885 my += get_se_golomb(&s->gb);
1170
4710976004a5 #ifdef TRACE printf() -> tprintf()
michaelni
parents: 1169
diff changeset
4886 tprintf("final mv:%d %d\n", mx, my);
4710976004a5 #ifdef TRACE printf() -> tprintf()
michaelni
parents: 1169
diff changeset
4887
1269
2498a7045b37 bigendian fix
michaelni
parents: 1266
diff changeset
4888 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
4889 }else
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
4890 fill_rectangle(h->mv_cache[list][ scan8[0] ], 4, 4, 8, 0, 4);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4891 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4892 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4893 else if(IS_16X8(mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4894 for(list=0; list<2; list++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4895 if(h->ref_count[list]>0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4896 for(i=0; i<2; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4897 if(IS_DIR(mb_type, i, list)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4898 const int val= get_te0_golomb(&s->gb, h->ref_count[list]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4899 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
4900 }else
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4901 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
4902 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4903 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4904 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4905 for(list=0; list<2; list++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4906 for(i=0; i<2; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4907 if(IS_DIR(mb_type, i, list)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4908 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
4909 mx += get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4910 my += get_se_golomb(&s->gb);
1170
4710976004a5 #ifdef TRACE printf() -> tprintf()
michaelni
parents: 1169
diff changeset
4911 tprintf("final mv:%d %d\n", mx, my);
4710976004a5 #ifdef TRACE printf() -> tprintf()
michaelni
parents: 1169
diff changeset
4912
1269
2498a7045b37 bigendian fix
michaelni
parents: 1266
diff changeset
4913 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
4914 }else
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4915 fill_rectangle(h->mv_cache[list][ scan8[0] + 16*i ], 4, 2, 8, 0, 4);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4916 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4917 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4918 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4919 assert(IS_8X16(mb_type));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4920 for(list=0; list<2; list++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4921 if(h->ref_count[list]>0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4922 for(i=0; i<2; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4923 if(IS_DIR(mb_type, i, list)){ //FIXME optimize
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4924 const int val= get_te0_golomb(&s->gb, h->ref_count[list]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4925 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
4926 }else
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4927 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
4928 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4929 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4930 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4931 for(list=0; list<2; list++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4932 for(i=0; i<2; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4933 if(IS_DIR(mb_type, i, list)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4934 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
4935 mx += get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4936 my += get_se_golomb(&s->gb);
1170
4710976004a5 #ifdef TRACE printf() -> tprintf()
michaelni
parents: 1169
diff changeset
4937 tprintf("final mv:%d %d\n", mx, my);
4710976004a5 #ifdef TRACE printf() -> tprintf()
michaelni
parents: 1169
diff changeset
4938
1269
2498a7045b37 bigendian fix
michaelni
parents: 1266
diff changeset
4939 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
4940 }else
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4941 fill_rectangle(h->mv_cache[list][ scan8[0] + 2*i ], 2, 4, 8, 0, 4);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4942 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4943 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4944 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4945 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4946
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4947 if(IS_INTER(mb_type))
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4948 write_back_motion(h, mb_type);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4949
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4950 if(!IS_INTRA16x16(mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4951 cbp= get_ue_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4952 if(cbp > 47){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
4953 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
4954 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4955 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4956
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4957 if(IS_INTRA4x4(mb_type))
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4958 cbp= golomb_to_intra4x4_cbp[cbp];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4959 else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4960 cbp= golomb_to_inter_cbp[cbp];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4961 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4962
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4963 if(dct8x8_allowed && (cbp&15) && !IS_INTRA(mb_type)){
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4964 if(get_bits1(&s->gb))
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4965 mb_type |= MB_TYPE_8x8DCT;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4966 }
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4967 s->current_picture.mb_type[mb_xy]= mb_type;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4968
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4969 if(cbp || IS_INTRA16x16(mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4970 int i8x8, i4x4, chroma_idx;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4971 int chroma_qp, dquant;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4972 GetBitContext *gb= IS_INTRA(mb_type) ? h->intra_gb_ptr : h->inter_gb_ptr;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4973 const uint8_t *scan, *dc_scan;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4974
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4975 // fill_non_zero_count_cache(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4976
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4977 if(IS_INTERLACED(mb_type)){
2763
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
4978 scan= s->qscale ? h->field_scan : h->field_scan_q0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4979 dc_scan= luma_dc_field_scan;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4980 }else{
2763
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
4981 scan= s->qscale ? h->zigzag_scan : h->zigzag_scan_q0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4982 dc_scan= luma_dc_zigzag_scan;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4983 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4984
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4985 dquant= get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4986
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4987 if( dquant > 25 || dquant < -26 ){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
4988 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
4989 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4990 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4991
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4992 s->qscale += dquant;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4993 if(((unsigned)s->qscale) > 51){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4994 if(s->qscale<0) s->qscale+= 52;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4995 else s->qscale-= 52;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4996 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4997
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
4998 h->chroma_qp= chroma_qp= get_chroma_qp(h->pps.chroma_qp_index_offset, s->qscale);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4999 if(IS_INTRA16x16(mb_type)){
2763
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
5000 if( decode_residual(h, h->intra_gb_ptr, h->mb, LUMA_DC_BLOCK_INDEX, dc_scan, h->dequant4_coeff[s->qscale], 16) < 0){
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
5001 return -1; //FIXME continue if partitioned and other return -1 too
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5002 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5003
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5004 assert((cbp&15) == 0 || (cbp&15) == 15);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5005
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5006 if(cbp&15){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5007 for(i8x8=0; i8x8<4; i8x8++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5008 for(i4x4=0; i4x4<4; i4x4++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5009 const int index= i4x4 + 4*i8x8;
2763
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
5010 if( decode_residual(h, h->intra_gb_ptr, h->mb + 16*index, index, scan + 1, h->dequant4_coeff[s->qscale], 15) < 0 ){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5011 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5012 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5013 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5014 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5015 }else{
1636
d9d98cdcfcde intra16x16 fix
michael
parents: 1598
diff changeset
5016 fill_rectangle(&h->non_zero_count_cache[scan8[0]], 4, 4, 8, 0, 1);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5017 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5018 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5019 for(i8x8=0; i8x8<4; i8x8++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5020 if(cbp & (1<<i8x8)){
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5021 if(IS_8x8DCT(mb_type)){
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5022 DCTELEM *buf = &h->mb[64*i8x8];
2757
fa1c8955e291 remove mixed code/declarations
mru
parents: 2755
diff changeset
5023 uint8_t *nnz;
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5024 for(i4x4=0; i4x4<4; i4x4++){
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5025 if( decode_residual(h, gb, buf, i4x4+4*i8x8, zigzag_scan8x8_cavlc+16*i4x4,
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5026 h->dequant8_coeff[s->qscale], 16) <0 )
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5027 return -1;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5028 }
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5029 if(s->qscale < 12){
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5030 int i;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5031 for(i=0; i<64; i++)
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5032 buf[i] = (buf[i] + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5033 }
2757
fa1c8955e291 remove mixed code/declarations
mru
parents: 2755
diff changeset
5034 nnz= &h->non_zero_count_cache[ scan8[4*i8x8] ];
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5035 nnz[0] |= nnz[1] | nnz[8] | nnz[9];
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5036 }else{
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5037 for(i4x4=0; i4x4<4; i4x4++){
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5038 const int index= i4x4 + 4*i8x8;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5039
2763
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
5040 if( decode_residual(h, gb, h->mb + 16*index, index, scan, h->dequant4_coeff[s->qscale], 16) <0 ){
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5041 return -1;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5042 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5043 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5044 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5045 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5046 uint8_t * const nnz= &h->non_zero_count_cache[ scan8[4*i8x8] ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5047 nnz[0] = nnz[1] = nnz[8] = nnz[9] = 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5048 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5049 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5050 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5051
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5052 if(cbp&0x30){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5053 for(chroma_idx=0; chroma_idx<2; chroma_idx++)
2763
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
5054 if( decode_residual(h, gb, h->mb + 256 + 16*4*chroma_idx, CHROMA_DC_BLOCK_INDEX, chroma_dc_scan, h->dequant4_coeff[chroma_qp], 4) < 0){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5055 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5056 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5057 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5058
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5059 if(cbp&0x20){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5060 for(chroma_idx=0; chroma_idx<2; chroma_idx++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5061 for(i4x4=0; i4x4<4; i4x4++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5062 const int index= 16 + 4*chroma_idx + i4x4;
2763
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
5063 if( decode_residual(h, gb, h->mb + 16*index, index, scan + 1, h->dequant4_coeff[chroma_qp], 15) < 0){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5064 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5065 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5066 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5067 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5068 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5069 uint8_t * const nnz= &h->non_zero_count_cache[0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5070 nnz[ scan8[16]+0 ] = nnz[ scan8[16]+1 ] =nnz[ scan8[16]+8 ] =nnz[ scan8[16]+9 ] =
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5071 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
5072 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5073 }else{
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
5074 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
5075 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
5076 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
5077 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
5078 }
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5079 s->current_picture.qscale_table[mb_xy]= s->qscale;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5080 write_back_non_zero_count(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5081
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5082 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5083 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5084
2594
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
5085 static int decode_cabac_field_decoding_flag(H264Context *h) {
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
5086 MpegEncContext * const s = &h->s;
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
5087 const int mb_x = s->mb_x;
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
5088 const int mb_y = s->mb_y & ~1;
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
5089 const int mba_xy = mb_x - 1 + mb_y *s->mb_stride;
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
5090 const int mbb_xy = mb_x + (mb_y-2)*s->mb_stride;
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
5091
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
5092 unsigned int ctx = 0;
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
5093
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
5094 if( h->slice_table[mba_xy] == h->slice_num && IS_INTERLACED( s->current_picture.mb_type[mba_xy] ) ) {
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
5095 ctx += 1;
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
5096 }
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
5097 if( h->slice_table[mbb_xy] == h->slice_num && IS_INTERLACED( s->current_picture.mb_type[mbb_xy] ) ) {
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
5098 ctx += 1;
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
5099 }
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
5100
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
5101 return get_cabac( &h->cabac, &h->cabac_state[70 + ctx] );
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
5102 }
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
5103
2312
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
5104 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
5105 uint8_t *state= &h->cabac_state[ctx_base];
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
5106 int mb_type;
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
5107
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
5108 if(intra_slice){
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
5109 MpegEncContext * const s = &h->s;
2597
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5110 const int mba_xy = h->left_mb_xy[0];
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5111 const int mbb_xy = h->top_mb_xy;
2312
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
5112 int ctx=0;
2498
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
5113 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
5114 ctx++;
2498
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
5115 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
5116 ctx++;
2312
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
5117 if( get_cabac( &h->cabac, &state[ctx] ) == 0 )
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
5118 return 0; /* I4x4 */
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
5119 state += 2;
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
5120 }else{
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
5121 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
5122 return 0; /* I4x4 */
2312
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
5123 }
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
5124
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
5125 if( get_cabac_terminate( &h->cabac ) )
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
5126 return 25; /* PCM */
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
5127
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
5128 mb_type = 1; /* I16x16 */
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
5129 if( get_cabac( &h->cabac, &state[1] ) )
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
5130 mb_type += 12; /* cbp_luma != 0 */
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
5131
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
5132 if( get_cabac( &h->cabac, &state[2] ) ) {
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
5133 if( get_cabac( &h->cabac, &state[2+intra_slice] ) )
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
5134 mb_type += 4 * 2; /* cbp_chroma == 2 */
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
5135 else
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
5136 mb_type += 4 * 1; /* cbp_chroma == 1 */
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
5137 }
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
5138 if( get_cabac( &h->cabac, &state[3+intra_slice] ) )
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
5139 mb_type += 2;
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
5140 if( get_cabac( &h->cabac, &state[3+2*intra_slice] ) )
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
5141 mb_type += 1;
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
5142 return mb_type;
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
5143 }
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
5144
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
5145 static int decode_cabac_mb_type( H264Context *h ) {
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
5146 MpegEncContext * const s = &h->s;
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
5147
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
5148 if( h->slice_type == I_TYPE ) {
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
5149 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
5150 } 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
5151 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
5152 /* 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
5153 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
5154 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
5155 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
5156 else
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5157 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
5158 } else {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5159 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
5160 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
5161 else
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5162 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
5163 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5164 } else {
2312
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
5165 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
5166 }
2310
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5167 } else if( h->slice_type == B_TYPE ) {
2597
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5168 const int mba_xy = h->left_mb_xy[0];
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5169 const int mbb_xy = h->top_mb_xy;
2310
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5170 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
5171 int bits;
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5172
2498
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
5173 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
5174 && !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
5175 ctx++;
2498
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
5176 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
5177 && !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
5178 ctx++;
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5179
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5180 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
5181 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
5182
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5183 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
5184 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
5185 }
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5186
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5187 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
5188 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
5189 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
5190 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
5191 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
5192 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
5193 else if( bits == 13 ) {
2312
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
5194 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
5195 } 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
5196 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
5197 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
5198 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
5199
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5200 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
5201 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
5202 } else {
2310
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5203 /* 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
5204 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
5205 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5206 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5207
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5208 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
5209 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
5210 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
5211 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
5212 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
5213 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
5214
2498
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
5215 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
5216 ctx++;
2498
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
5217 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
5218 ctx++;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5219
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5220 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
5221 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
5222 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
5223 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
5224 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5225
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5226 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
5227 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
5228
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5229 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
5230 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
5231
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5232 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
5233 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
5234 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
5235 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
5236 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
5237 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
5238 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
5239 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
5240 else
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5241 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
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
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5244 static int decode_cabac_mb_chroma_pre_mode( H264Context *h) {
2594
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
5245 const int mba_xy = h->left_mb_xy[0];
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
5246 const int mbb_xy = h->top_mb_xy;
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5247
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5248 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
5249
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
5250 /* 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
5251 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
5252 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
5253
2498
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
5254 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
5255 ctx++;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5256
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5257 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
5258 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
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( 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
5261 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
5262 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
5263 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
5264 else
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5265 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
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 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
5269 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
5270 };
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5271 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
5272 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
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 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
5275 { 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
5276 { 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
5277 { 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
5278 { 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
5279 };
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5280
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5281 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
5282 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
5283
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5284 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
5285 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
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 for( i8x8 = 0; i8x8 < 4; i8x8++ ) {
2594
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
5288 int cbp_a = -1;
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
5289 int cbp_b = -1;
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5290 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
5291 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
5292
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5293 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
5294 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
5295
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5296 if( x > 0 )
2594
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
5297 cbp_a = cbp;
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
5298 else if( s->mb_x > 0 && (h->slice_table[h->left_mb_xy[0]] == h->slice_num)) {
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
5299 cbp_a = h->left_cbp;
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
5300 tprintf("cbp_a = left_cbp = %x\n", cbp_a);
2498
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
5301 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5302
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5303 if( y > 0 )
2594
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
5304 cbp_b = cbp;
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
5305 else if( s->mb_y > 0 && (h->slice_table[h->top_mb_xy] == h->slice_num)) {
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
5306 cbp_b = h->top_cbp;
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
5307 tprintf("cbp_b = top_cbp = %x\n", cbp_b);
2498
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
5308 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5309
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
5310 /* No need to test for skip as we put 0 for skip block */
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
5311 /* No need to test for IPCM as we put 1 for IPCM block */
2594
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
5312 if( cbp_a >= 0 ) {
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5313 int i8x8a = block_idx_xy[(x-1)&0x03][y]/4;
2594
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
5314 if( ((cbp_a >> i8x8a)&0x01) == 0 )
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5315 ctx++;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5316 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5317
2594
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
5318 if( cbp_b >= 0 ) {
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5319 int i8x8b = block_idx_xy[x][(y-1)&0x03]/4;
2594
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
5320 if( ((cbp_b >> i8x8b)&0x01) == 0 )
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5321 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
5322 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5323
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5324 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
5325 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
5326 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5327 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5328 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
5329 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5330 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
5331 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
5332 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
5333
2314
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
5334 cbp_a = (h->left_cbp>>4)&0x03;
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
5335 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
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 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
5338 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
5339 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
5340 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
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 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
5344 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
5345 if( cbp_b == 2 ) ctx += 2;
2314
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
5346 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
5347 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5348 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
5349 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
5350 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
5351 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
5352 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
5353
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5354 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
5355 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
5356 else
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5357 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
5358
2498
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
5359 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
5360 ctx++;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5361
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5362 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
5363 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
5364 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
5365 else
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5366 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
5367 val++;
2844
5f20ab245501 prevent assert failures and infinite loops with broken streams
michael
parents: 2834
diff changeset
5368 if(val > 52) //prevent infinite loop
5f20ab245501 prevent assert failures and infinite loops with broken streams
michael
parents: 2834
diff changeset
5369 return INT_MIN;
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5370 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5371
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5372 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
5373 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
5374 else
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5375 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
5376 }
2310
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5377 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
5378 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
5379 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
5380 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
5381 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
5382 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
5383 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
5384 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
5385 }
2310
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5386 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
5387 int type;
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5388 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
5389 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
5390 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
5391 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
5392 type = 3;
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5393 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
5394 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
5395 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
5396 type += 4;
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5397 }
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5398 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
5399 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
5400 return type;
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5401 }
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5402
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5403 static inline int decode_cabac_mb_transform_size( H264Context *h ) {
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5404 return get_cabac( &h->cabac, &h->cabac_state[399 + h->neighbor_transform_size] );
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5405 }
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5406
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5407 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
5408 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
5409 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
5410 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
5411 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
5412
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5413 if( h->slice_type == B_TYPE) {
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5414 if( refa > 0 && !h->direct_cache[scan8[n] - 1] )
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5415 ctx++;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5416 if( refb > 0 && !h->direct_cache[scan8[n] - 8] )
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5417 ctx += 2;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5418 } else {
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5419 if( refa > 0 )
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5420 ctx++;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5421 if( refb > 0 )
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5422 ctx += 2;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5423 }
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5424
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5425 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
5426 ref++;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5427 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
5428 ctx = 4;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5429 else
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5430 ctx = 5;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5431 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5432 return ref;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5433 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5434
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5435 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
5436 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
5437 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
5438 int ctxbase = (l == 0) ? 40 : 47;
2317
2865f759882a optimzation
michael
parents: 2316
diff changeset
5439 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
5440
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5441 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
5442 ctx = 0;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5443 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
5444 ctx = 2;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5445 else
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5446 ctx = 1;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5447
2317
2865f759882a optimzation
michael
parents: 2316
diff changeset
5448 if(!get_cabac(&h->cabac, &h->cabac_state[ctxbase+ctx]))
2865f759882a optimzation
michael
parents: 2316
diff changeset
5449 return 0;
2865f759882a optimzation
michael
parents: 2316
diff changeset
5450
2865f759882a optimzation
michael
parents: 2316
diff changeset
5451 mvd= 1;
2865f759882a optimzation
michael
parents: 2316
diff changeset
5452 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
5453 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
5454 mvd++;
2317
2865f759882a optimzation
michael
parents: 2316
diff changeset
5455 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
5456 ctx++;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5457 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5458
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5459 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
5460 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
5461 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
5462 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
5463 k++;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5464 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5465 while( k-- ) {
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5466 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
5467 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
5468 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5469 }
2317
2865f759882a optimzation
michael
parents: 2316
diff changeset
5470 if( get_cabac_bypass( &h->cabac ) ) return -mvd;
2865f759882a optimzation
michael
parents: 2316
diff changeset
5471 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
5472 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5473
2316
fe25f849a169 optimization
michael
parents: 2315
diff changeset
5474 static int inline get_cabac_cbf_ctx( H264Context *h, int cat, int idx ) {
2314
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
5475 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
5476 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
5477
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5478 if( cat == 0 ) {
2314
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
5479 nza = h->left_cbp&0x100;
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
5480 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
5481 } else if( cat == 1 || cat == 2 ) {
2314
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
5482 nza = h->non_zero_count_cache[scan8[idx] - 1];
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
5483 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
5484 } else if( cat == 3 ) {
2314
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
5485 nza = (h->left_cbp>>(6+idx))&0x01;
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
5486 nzb = (h-> top_cbp>>(6+idx))&0x01;
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
5487 } else {
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
5488 assert(cat == 4);
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
5489 nza = h->non_zero_count_cache[scan8[16+idx] - 1];
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
5490 nzb = h->non_zero_count_cache[scan8[16+idx] - 8];
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
5491 }
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
5492
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
5493 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
5494 ctx++;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5495
2314
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
5496 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
5497 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
5498
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5499 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
5500 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5501
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5502 static int inline decode_cabac_residual( H264Context *h, DCTELEM *block, int cat, int n, const uint8_t *scantable, const uint16_t *qmul, int max_coeff) {
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5503 const int mb_xy = h->s.mb_x + h->s.mb_y*h->s.mb_stride;
2594
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
5504 static const int significant_coeff_flag_field_offset[2] = { 105, 277 };
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
5505 static const int last_significant_coeff_flag_field_offset[2] = { 166, 338 };
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5506 static const int significant_coeff_flag_offset[6] = { 0, 15, 29, 44, 47, 297 };
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5507 static const int last_significant_coeff_flag_offset[6] = { 0, 15, 29, 44, 47, 251 };
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5508 static const int coeff_abs_level_m1_offset[6] = { 227+0, 227+10, 227+20, 227+30, 227+39, 426 };
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5509 static const int identity[15] = {
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5510 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5511 };
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5512 static const int significant_coeff_flag_offset_8x8[63] = {
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5513 0, 1, 2, 3, 4, 5, 5, 4, 4, 3, 3, 4, 4, 4, 5, 5,
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5514 4, 4, 4, 4, 3, 3, 6, 7, 7, 7, 8, 9,10, 9, 8, 7,
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5515 7, 6,11,12,13,11, 6, 7, 8, 9,14,10, 9, 8, 6,11,
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5516 12,13,11, 6, 9,14,10, 9,11,12,13,11,14,10,12
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5517 };
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5518 static const int last_coeff_flag_offset_8x8[63] = {
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5519 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5520 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5521 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4,
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5522 5, 5, 5, 5, 6, 6, 6, 6, 7, 7, 7, 7, 8, 8, 8
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5523 };
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5524
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5525 int index[64];
2313
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
5526
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
5527 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
5528 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
5529
2316
fe25f849a169 optimization
michael
parents: 2315
diff changeset
5530 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
5531 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
5532
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5533 const int* significant_coeff_ctx_offset;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5534 const int* last_coeff_ctx_offset;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5535 const int significant_coeff_ctx_base = significant_coeff_flag_offset[cat]
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5536 + significant_coeff_flag_field_offset[h->mb_field_decoding_flag];
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5537 const int last_coeff_ctx_base = last_significant_coeff_flag_offset[cat]
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5538 + last_significant_coeff_flag_field_offset[h->mb_field_decoding_flag];
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5539
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5540 /* 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
5541 * 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
5542 * 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
5543 * 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
5544 * 4-> AC Chroma n = 4 * iCbCr + chroma4x4idx
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5545 * 5-> Luma8x8 n = 4 * luma8x8idx
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5546 */
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5547
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5548 /* read coded block flag */
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5549 if( cat == 5 ) {
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5550 significant_coeff_ctx_offset = significant_coeff_flag_offset_8x8;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5551 last_coeff_ctx_offset = last_coeff_flag_offset_8x8;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5552 } else {
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5553 if( get_cabac( &h->cabac, &h->cabac_state[85 + get_cabac_cbf_ctx( h, cat, n ) ] ) == 0 ) {
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5554 if( cat == 1 || cat == 2 )
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5555 h->non_zero_count_cache[scan8[n]] = 0;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5556 else if( cat == 4 )
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5557 h->non_zero_count_cache[scan8[16+n]] = 0;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5558
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5559 return 0;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5560 }
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5561
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5562 significant_coeff_ctx_offset =
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5563 last_coeff_ctx_offset = identity;
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5564 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5565
2313
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
5566 for(last= 0; last < max_coeff - 1; last++) {
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5567 int sig_ctx = significant_coeff_ctx_base + significant_coeff_ctx_offset[last];
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5568 if( get_cabac( &h->cabac, &h->cabac_state[sig_ctx] )) {
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5569 int last_ctx = last_coeff_ctx_base + last_coeff_ctx_offset[last];
2313
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
5570 index[coeff_count++] = last;
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5571 if( get_cabac( &h->cabac, &h->cabac_state[last_ctx] ) ) {
2313
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
5572 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
5573 break;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5574 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5575 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5576 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5577 if( last == max_coeff -1 ) {
2313
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
5578 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
5579 }
2316
fe25f849a169 optimization
michael
parents: 2315
diff changeset
5580 assert(coeff_count > 0);
fe25f849a169 optimization
michael
parents: 2315
diff changeset
5581
fe25f849a169 optimization
michael
parents: 2315
diff changeset
5582 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
5583 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
5584 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
5585 h->non_zero_count_cache[scan8[n]] = coeff_count;
2316
fe25f849a169 optimization
michael
parents: 2315
diff changeset
5586 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
5587 h->cbp_table[mb_xy] |= 0x40 << n;
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5588 else if( cat == 4 )
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5589 h->non_zero_count_cache[scan8[16+n]] = coeff_count;
2316
fe25f849a169 optimization
michael
parents: 2315
diff changeset
5590 else {
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5591 assert( cat == 5 );
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5592 fill_rectangle(&h->non_zero_count_cache[scan8[n]], 2, 2, 8, 1, 1);
2316
fe25f849a169 optimization
michael
parents: 2315
diff changeset
5593 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5594
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5595 for( i = coeff_count - 1; i >= 0; i-- ) {
2316
fe25f849a169 optimization
michael
parents: 2315
diff changeset
5596 int ctx = (abslevelgt1 != 0 ? 0 : FFMIN( 4, abslevel1 )) + coeff_abs_level_m1_offset[cat];
fe25f849a169 optimization
michael
parents: 2315
diff changeset
5597 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
5598
2313
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
5599 if( get_cabac( &h->cabac, &h->cabac_state[ctx] ) == 0 ) {
2316
fe25f849a169 optimization
michael
parents: 2315
diff changeset
5600 if( cat == 0 || cat == 3 ) {
fe25f849a169 optimization
michael
parents: 2315
diff changeset
5601 if( get_cabac_bypass( &h->cabac ) ) block[j] = -1;
fe25f849a169 optimization
michael
parents: 2315
diff changeset
5602 else block[j] = 1;
fe25f849a169 optimization
michael
parents: 2315
diff changeset
5603 }else{
fe25f849a169 optimization
michael
parents: 2315
diff changeset
5604 if( get_cabac_bypass( &h->cabac ) ) block[j] = -qmul[j];
fe25f849a169 optimization
michael
parents: 2315
diff changeset
5605 else block[j] = qmul[j];
fe25f849a169 optimization
michael
parents: 2315
diff changeset
5606 }
2313
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
5607
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
5608 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
5609 } else {
2313
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
5610 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
5611 ctx = 5 + FFMIN( 4, abslevelgt1 ) + coeff_abs_level_m1_offset[cat];
2313
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
5612 while( coeff_abs < 15 && get_cabac( &h->cabac, &h->cabac_state[ctx] ) ) {
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
5613 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
5614 }
2313
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
5615
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
5616 if( coeff_abs >= 15 ) {
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
5617 int j = 0;
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
5618 while( get_cabac_bypass( &h->cabac ) ) {
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
5619 coeff_abs += 1 << j;
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
5620 j++;
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
5621 }
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
5622
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
5623 while( j-- ) {
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
5624 if( get_cabac_bypass( &h->cabac ) )
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
5625 coeff_abs += 1 << j ;
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
5626 }
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
5627 }
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
5628
2316
fe25f849a169 optimization
michael
parents: 2315
diff changeset
5629 if( cat == 0 || cat == 3 ) {
fe25f849a169 optimization
michael
parents: 2315
diff changeset
5630 if( get_cabac_bypass( &h->cabac ) ) block[j] = -coeff_abs;
fe25f849a169 optimization
michael
parents: 2315
diff changeset
5631 else block[j] = coeff_abs;
fe25f849a169 optimization
michael
parents: 2315
diff changeset
5632 }else{
fe25f849a169 optimization
michael
parents: 2315
diff changeset
5633 if( get_cabac_bypass( &h->cabac ) ) block[j] = -coeff_abs * qmul[j];
fe25f849a169 optimization
michael
parents: 2315
diff changeset
5634 else block[j] = coeff_abs * qmul[j];
fe25f849a169 optimization
michael
parents: 2315
diff changeset
5635 }
2313
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
5636
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
5637 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
5638 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5639 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5640 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
5641 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5642
2597
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5643 void inline compute_mb_neighboors(H264Context *h)
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5644 {
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5645 MpegEncContext * const s = &h->s;
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5646 const int mb_xy = s->mb_x + s->mb_y*s->mb_stride;
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5647 h->top_mb_xy = mb_xy - s->mb_stride;
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5648 h->left_mb_xy[0] = mb_xy - 1;
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5649 if(h->mb_aff_frame){
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5650 const int pair_xy = s->mb_x + (s->mb_y & ~1)*s->mb_stride;
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5651 const int top_pair_xy = pair_xy - s->mb_stride;
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5652 const int top_mb_frame_flag = !IS_INTERLACED(s->current_picture.mb_type[top_pair_xy]);
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5653 const int left_mb_frame_flag = !IS_INTERLACED(s->current_picture.mb_type[pair_xy-1]);
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5654 const int curr_mb_frame_flag = !h->mb_field_decoding_flag;
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5655 const int bottom = (s->mb_y & 1);
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5656 if (bottom
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5657 ? !curr_mb_frame_flag // bottom macroblock
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5658 : (!curr_mb_frame_flag && !top_mb_frame_flag) // top macroblock
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5659 ) {
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5660 h->top_mb_xy -= s->mb_stride;
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5661 }
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5662 if (left_mb_frame_flag != curr_mb_frame_flag) {
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5663 h->left_mb_xy[0] = pair_xy - 1;
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5664 }
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5665 }
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5666 return;
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5667 }
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5668
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5669 /**
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5670 * 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
5671 * @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
5672 */
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5673 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
5674 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
5675 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
5676 int mb_type, partition_count, cbp = 0;
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5677 int dct8x8_allowed= h->pps.transform_8x8_mode;
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5678
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
5679 s->dsp.clear_blocks(h->mb); //FIXME avoid if already clear (move after skip handlong?)
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5680
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
5681 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
5682 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
5683 /* 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
5684 if( decode_cabac_mb_skip( h ) ) {
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5685 decode_mb_skip(h);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5686
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5687 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
5688 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
5689 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
5690
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5691 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
5692
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5693 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5694 }
2594
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
5695 if(h->mb_aff_frame){
2628
511e3afc43e1 Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents: 2623
diff changeset
5696 if ( ((s->mb_y&1) == 0) || h->prev_mb_skipped)
2594
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
5697 h->mb_field_decoding_flag = decode_cabac_field_decoding_flag(h);
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
5698 }else
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
5699 h->mb_field_decoding_flag= (s->picture_structure!=PICT_FRAME);
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
5700
2628
511e3afc43e1 Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents: 2623
diff changeset
5701 h->prev_mb_skipped = 0;
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5702
2597
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5703 compute_mb_neighboors(h);
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5704 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
5705 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
5706 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
5707 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5708
2310
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5709 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
5710 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
5711 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
5712 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
5713 }else{
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5714 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
5715 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
5716 }
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5717 } 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
5718 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
5719 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
5720 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
5721 } else {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5722 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
5723 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
5724 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5725 } else {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5726 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
5727 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
5728 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
5729 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
5730 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
5731 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
5732 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5733 if(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
5734 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
5735
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5736 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
5737
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5738 if(IS_INTRA_PCM(mb_type)) {
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5739 const uint8_t *ptr;
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5740 unsigned int x, y;
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5741
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5742 // 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
5743 // 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
5744 // 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
5745 ptr= h->cabac.bytestream;
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5746 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
5747
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5748 // 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
5749 for(y=0; y<16; y++){
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5750 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
5751 for(x=0; x<16; x++){
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5752 tprintf("LUMA ICPM LEVEL (%3d)\n", *ptr);
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5753 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
5754 }
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5755 }
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5756 for(y=0; y<8; y++){
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5757 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
5758 for(x=0; x<8; x++){
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5759 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
5760 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
5761 }
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5762 }
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5763 for(y=0; y<8; y++){
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5764 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
5765 for(x=0; x<8; x++){
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5766 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
5767 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
5768 }
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5769 }
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5770
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5771 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
5772
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
5773 // All blocks are present
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5774 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
5775 h->chroma_pred_mode_table[mb_xy] = 0;
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
5776 // In deblocking, the quantizer is 0
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5777 s->current_picture.qscale_table[mb_xy]= 0;
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5778 h->chroma_qp = get_chroma_qp(h->pps.chroma_qp_index_offset, 0);
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
5779 // All coeffs are present
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5780 memset(h->non_zero_count[mb_xy], 16, 16);
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5781 s->current_picture.mb_type[mb_xy]= mb_type;
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5782 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
5783 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5784
2449
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
5785 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
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 if( IS_INTRA( mb_type ) ) {
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5788 int i;
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5789 if( IS_INTRA4x4( mb_type ) ) {
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5790 if( dct8x8_allowed && decode_cabac_mb_transform_size( h ) ) {
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5791 mb_type |= MB_TYPE_8x8DCT;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5792 for( i = 0; i < 16; i+=4 ) {
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5793 int pred = pred_intra_mode( h, i );
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5794 int mode = decode_cabac_mb_intra4x4_pred_mode( h, pred );
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5795 fill_rectangle( &h->intra4x4_pred_mode_cache[ scan8[i] ], 2, 2, 8, mode, 1 );
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5796 }
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5797 } else {
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5798 for( i = 0; i < 16; i++ ) {
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5799 int pred = pred_intra_mode( h, i );
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5800 h->intra4x4_pred_mode_cache[ scan8[i] ] = decode_cabac_mb_intra4x4_pred_mode( h, pred );
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5801
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5802 //av_log( s->avctx, AV_LOG_ERROR, "i4x4 pred=%d mode=%d\n", pred, h->intra4x4_pred_mode_cache[ scan8[i] ] );
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5803 }
1908
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 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
5806 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
5807 } else {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5808 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
5809 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
5810 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5811 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
5812 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
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 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
5815 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
5816 } 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
5817 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
5818
2310
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5819 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
5820 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
5821 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
5822 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
5823 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
5824 }
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5825 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
5826 || 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
5827 pred_direct_motion(h, &mb_type);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5828 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
5829 for( i = 0; i < 4; i++ )
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5830 if( IS_DIRECT(h->sub_mb_type[i]) )
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5831 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
5832 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5833 }
2310
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5834 } else {
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5835 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
5836 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
5837 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
5838 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
5839 }
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5840 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5841
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5842 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
5843 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
5844 for( i = 0; i < 4; i++ ) {
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5845 if(IS_DIRECT(h->sub_mb_type[i])) continue;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5846 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
5847 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
5848 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
5849 else
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5850 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
5851 } else {
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5852 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
5853 }
2110
michael
parents: 2099
diff changeset
5854 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
5855 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
5856 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5857 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5858 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5859
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5860 if(dct8x8_allowed)
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5861 dct8x8_allowed = get_dct8x8_allowed(h);
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5862
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5863 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
5864 for(i=0; i<4; i++){
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5865 if(IS_DIRECT(h->sub_mb_type[i])){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5866 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
5867 continue;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5868 }
2110
michael
parents: 2099
diff changeset
5869 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
5870
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5871 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
5872 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
5873 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
5874 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
5875 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
5876 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
5877 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
5878 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
5879 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
5880 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
5881
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5882 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
5883 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
5884 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
5885
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5886 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
5887 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
5888 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
5889 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
5890 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
5891
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5892 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
5893 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
5894 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
5895 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
5896 }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
5897 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
5898 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
5899
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5900 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
5901 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
5902 }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
5903 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
5904 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
5905
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5906 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
5907 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
5908 }else{
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5909 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
5910 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
5911 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
5912
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5913 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
5914 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
5915 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5916 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5917 }else{
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5918 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
5919 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
5920 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
5921 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
5922 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5923 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5924 }
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5925 } else if( IS_DIRECT(mb_type) ) {
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5926 pred_direct_motion(h, &mb_type);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5927 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
5928 fill_rectangle(h->mvd_cache[1][scan8[0]], 4, 4, 8, 0, 4);
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5929 dct8x8_allowed &= h->sps.direct_8x8_inference_flag;
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5930 } else {
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5931 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
5932 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
5933 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
5934 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
5935 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
5936 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
5937 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
5938 }
2523
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
5939 }else
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
5940 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
5941 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5942 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
5943 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
5944 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
5945
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5946 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
5947 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
5948 tprintf("final mv:%d %d\n", mx, my);
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5949
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5950 fill_rectangle(h->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
5951 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
5952 }else
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
5953 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
5954 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5955 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5956 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
5957 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
5958 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
5959 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
5960 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
5961 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
5962 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
5963 }else
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5964 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
5965 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5966 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5967 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5968 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
5969 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
5970 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
5971 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
5972 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
5973 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
5974 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
5975
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5976 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
5977 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
5978 }else{
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5979 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
5980 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
5981 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5982 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5983 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5984 }else{
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5985 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
5986 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
5987 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
5988 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
5989 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
5990 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
5991 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
5992 }else
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5993 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
5994 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5995 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5996 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5997 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
5998 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
5999 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
6000 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
6001 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
6002 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
6003
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6004 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
6005 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
6006 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
6007 }else{
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
6008 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
6009 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
6010 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6011 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6012 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6013 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6014 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6015
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
6016 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
6017 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
6018 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
6019 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6020
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6021 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
6022 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
6023 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
6024 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6025
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6026 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
6027
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
6028 if( dct8x8_allowed && (cbp&15) && !IS_INTRA( mb_type ) ) {
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
6029 if( decode_cabac_mb_transform_size( h ) )
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
6030 mb_type |= MB_TYPE_8x8DCT;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
6031 }
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
6032 s->current_picture.mb_type[mb_xy]= mb_type;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
6033
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6034 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
6035 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
6036 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
6037
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6038 if(IS_INTERLACED(mb_type)){
2763
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
6039 scan= s->qscale ? h->field_scan : h->field_scan_q0;
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6040 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
6041 }else{
2763
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
6042 scan= s->qscale ? h->zigzag_scan : h->zigzag_scan_q0;
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6043 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
6044 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6045
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6046 h->last_qscale_diff = dqp = decode_cabac_mb_dqp( h );
2883
a95e55679dfa check return value of decode_cabac_mb_dqp, it is INT_MIN on error.
reimar
parents: 2867
diff changeset
6047 if( dqp == INT_MIN ){
a95e55679dfa check return value of decode_cabac_mb_dqp, it is INT_MIN on error.
reimar
parents: 2867
diff changeset
6048 av_log(h->s.avctx, AV_LOG_ERROR, "cabac decode of qscale diff failed at %d %d\n", s->mb_x, s->mb_y);
a95e55679dfa check return value of decode_cabac_mb_dqp, it is INT_MIN on error.
reimar
parents: 2867
diff changeset
6049 return -1;
a95e55679dfa check return value of decode_cabac_mb_dqp, it is INT_MIN on error.
reimar
parents: 2867
diff changeset
6050 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6051 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
6052 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
6053 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
6054 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
6055 }
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6056 h->chroma_qp = get_chroma_qp(h->pps.chroma_qp_index_offset, s->qscale);
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6057
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6058 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
6059 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
6060 //av_log( s->avctx, AV_LOG_ERROR, "INTRA16x16 DC\n" );
2763
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
6061 if( decode_cabac_residual( h, h->mb, 0, 0, dc_scan, h->dequant4_coeff[s->qscale], 16) < 0)
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6062 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
6063 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
6064 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
6065 //av_log( s->avctx, AV_LOG_ERROR, "INTRA16x16 AC:%d\n", i );
2763
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
6066 if( decode_cabac_residual(h, h->mb + 16*i, 1, i, scan + 1, h->dequant4_coeff[s->qscale], 15) < 0 )
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6067 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
6068 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6069 } else {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6070 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
6071 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6072 } else {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6073 int 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
6074 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
6075 if( cbp & (1<<i8x8) ) {
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
6076 if( IS_8x8DCT(mb_type) ) {
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
6077 if( decode_cabac_residual(h, h->mb + 64*i8x8, 5, 4*i8x8,
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
6078 zigzag_scan8x8, h->dequant8_coeff[s->qscale], 64) < 0 )
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
6079 return -1;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
6080 if(s->qscale < 12){
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
6081 int i;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
6082 for(i=0; i<64; i++)
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
6083 h->mb[64*i8x8+i] = (h->mb[64*i8x8+i] + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
6084 }
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
6085 } 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
6086 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
6087 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
6088 //av_log( s->avctx, AV_LOG_ERROR, "Luma4x4: %d\n", index );
2763
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
6089 if( decode_cabac_residual(h, h->mb + 16*index, 2, index, scan, h->dequant4_coeff[s->qscale], 16) < 0 )
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6090 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
6091 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6092 } else {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6093 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
6094 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
6095 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6096 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6097 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6098
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6099 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
6100 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
6101 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
6102 //av_log( s->avctx, AV_LOG_ERROR, "INTRA C%d-DC\n",c );
2763
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
6103 if( decode_cabac_residual(h, h->mb + 256 + 16*4*c, 3, c, chroma_dc_scan, h->dequant4_coeff[h->chroma_qp], 4) < 0)
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6104 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
6105 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6106 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6107
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6108 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
6109 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
6110 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
6111 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
6112 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
6113 //av_log( s->avctx, AV_LOG_ERROR, "INTRA C%d-AC %d\n",c, index - 16 );
2763
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
6114 if( decode_cabac_residual(h, h->mb + 16*index, 4, index - 16, scan + 1, h->dequant4_coeff[h->chroma_qp], 15) < 0)
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6115 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
6116 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6117 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6118 } else {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6119 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
6120 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
6121 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
6122 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6123 } else {
2315
29b67549d0cc fix CABAC+LOOP missmatch
michael
parents: 2314
diff changeset
6124 uint8_t * const nnz= &h->non_zero_count_cache[0];
29b67549d0cc fix CABAC+LOOP missmatch
michael
parents: 2314
diff changeset
6125 fill_rectangle(&nnz[scan8[0]], 4, 4, 8, 0, 1);
29b67549d0cc fix CABAC+LOOP missmatch
michael
parents: 2314
diff changeset
6126 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
6127 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
6128 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6129
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6130 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
6131 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
6132
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6133 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
6134 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6135
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6136
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
6137 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
6138 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
6139 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
6140 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
6141 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
6142
2633
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
6143 if( bS[0] < 4 ) {
2707
360024d31dab H.264 deblocking optimizations (mmx for chroma_bS4 case, convert existing cases to 8-bit math)
lorenm
parents: 2683
diff changeset
6144 int8_t tc[4];
2633
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
6145 for(i=0; i<4; i++)
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
6146 tc[i] = bS[i] ? tc0_table[index_a][bS[i] - 1] : -1;
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
6147 h->s.dsp.h264_h_loop_filter_luma(pix, stride, alpha, beta, tc);
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
6148 } else {
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
6149 /* 16px edge length, because bS=4 is triggered by being at
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
6150 * the edge of an intra MB, so all 4 bS are the same */
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
6151 for( d = 0; d < 16; d++ ) {
1898
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6152 const int p0 = pix[-1];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6153 const int p1 = pix[-2];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6154 const int p2 = pix[-3];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6155
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6156 const int q0 = pix[0];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6157 const int q1 = pix[1];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6158 const int q2 = pix[2];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6159
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6160 if( ABS( p0 - q0 ) < alpha &&
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6161 ABS( p1 - p0 ) < beta &&
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6162 ABS( q1 - q0 ) < beta ) {
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6163
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6164 if(ABS( p0 - q0 ) < (( alpha >> 2 ) + 2 )){
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6165 if( ABS( p2 - p0 ) < beta)
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6166 {
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6167 const int p3 = pix[-4];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6168 /* p0', p1', p2' */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6169 pix[-1] = ( p2 + 2*p1 + 2*p0 + 2*q0 + q1 + 4 ) >> 3;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6170 pix[-2] = ( p2 + p1 + p0 + q0 + 2 ) >> 2;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6171 pix[-3] = ( 2*p3 + 3*p2 + p1 + p0 + q0 + 4 ) >> 3;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6172 } else {
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6173 /* p0' */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6174 pix[-1] = ( 2*p1 + p0 + q1 + 2 ) >> 2;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6175 }
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6176 if( ABS( q2 - q0 ) < beta)
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6177 {
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6178 const int q3 = pix[3];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6179 /* q0', q1', q2' */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6180 pix[0] = ( p1 + 2*p0 + 2*q0 + 2*q1 + q2 + 4 ) >> 3;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6181 pix[1] = ( p0 + q0 + q1 + q2 + 2 ) >> 2;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6182 pix[2] = ( 2*q3 + 3*q2 + q1 + q0 + p0 + 4 ) >> 3;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6183 } else {
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6184 /* q0' */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6185 pix[0] = ( 2*q1 + q0 + p1 + 2 ) >> 2;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6186 }
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6187 }else{
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6188 /* p0', q0' */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6189 pix[-1] = ( 2*p1 + p0 + q1 + 2 ) >> 2;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6190 pix[ 0] = ( 2*q1 + q0 + p1 + 2 ) >> 2;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6191 }
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6192 tprintf("filter_mb_edgev i:%d d:%d\n# bS:4 -> [%02x, %02x, %02x, %02x, %02x, %02x] =>[%02x, %02x, %02x, %02x]\n", i, d, p2, p1, p0, q0, q1, q2, pix[-2], pix[-1], pix[0], pix[1]);
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6193 }
1898
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6194 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
6195 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6196 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6197 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6198 static void filter_mb_edgecv( H264Context *h, uint8_t *pix, int stride, int bS[4], int qp ) {
2834
fd5d7c732c6b kill a bunch of compiler warnings
mru
parents: 2815
diff changeset
6199 int i;
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6200 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
6201 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
6202 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
6203
2633
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
6204 if( bS[0] < 4 ) {
2707
360024d31dab H.264 deblocking optimizations (mmx for chroma_bS4 case, convert existing cases to 8-bit math)
lorenm
parents: 2683
diff changeset
6205 int8_t tc[4];
2633
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
6206 for(i=0; i<4; i++)
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
6207 tc[i] = bS[i] ? tc0_table[index_a][bS[i] - 1] + 1 : 0;
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
6208 h->s.dsp.h264_h_loop_filter_chroma(pix, stride, alpha, beta, tc);
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
6209 } else {
2707
360024d31dab H.264 deblocking optimizations (mmx for chroma_bS4 case, convert existing cases to 8-bit math)
lorenm
parents: 2683
diff changeset
6210 h->s.dsp.h264_h_loop_filter_chroma_intra(pix, stride, alpha, beta);
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6211 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6212 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6213
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6214 static void filter_mb_mbaff_edgev( H264Context *h, uint8_t *pix, int stride, int bS[8], int qp[2] ) {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6215 int i;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6216 for( i = 0; i < 16; i++, pix += stride) {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6217 int index_a;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6218 int alpha;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6219 int beta;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6220
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6221 int qp_index;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6222 int bS_index = (i >> 1);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6223 if (h->mb_field_decoding_flag) {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6224 bS_index &= ~1;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6225 bS_index |= (i & 1);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6226 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6227
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6228 if( bS[bS_index] == 0 ) {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6229 continue;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6230 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6231
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6232 qp_index = h->mb_field_decoding_flag ? (i & 1) : (i >> 3);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6233 index_a = clip( qp[qp_index] + h->slice_alpha_c0_offset, 0, 51 );
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6234 alpha = alpha_table[index_a];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6235 beta = beta_table[clip( qp[qp_index] + h->slice_beta_offset, 0, 51 )];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6236
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6237
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6238 if( bS[bS_index] < 4 ) {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6239 const int tc0 = tc0_table[index_a][bS[bS_index] - 1];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6240 /* 4px edge length */
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6241 const int p0 = pix[-1];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6242 const int p1 = pix[-2];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6243 const int p2 = pix[-3];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6244 const int q0 = pix[0];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6245 const int q1 = pix[1];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6246 const int q2 = pix[2];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6247
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6248 if( ABS( p0 - q0 ) < alpha &&
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6249 ABS( p1 - p0 ) < beta &&
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6250 ABS( q1 - q0 ) < beta ) {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6251 int tc = tc0;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6252 int i_delta;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6253
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6254 if( ABS( p2 - p0 ) < beta ) {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6255 pix[-2] = p1 + clip( ( p2 + ( ( p0 + q0 + 1 ) >> 1 ) - ( p1 << 1 ) ) >> 1, -tc0, tc0 );
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6256 tc++;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6257 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6258 if( ABS( q2 - q0 ) < beta ) {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6259 pix[1] = q1 + clip( ( q2 + ( ( p0 + q0 + 1 ) >> 1 ) - ( q1 << 1 ) ) >> 1, -tc0, tc0 );
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6260 tc++;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6261 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6262
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6263 i_delta = clip( (((q0 - p0 ) << 2) + (p1 - q1) + 4) >> 3, -tc, tc );
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6264 pix[-1] = clip_uint8( p0 + i_delta ); /* p0' */
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6265 pix[0] = clip_uint8( q0 - i_delta ); /* q0' */
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6266 tprintf("filter_mb_mbaff_edgev i:%d, qp:%d, indexA:%d, alpha:%d, beta:%d, tc:%d\n# bS:%d -> [%02x, %02x, %02x, %02x, %02x, %02x] =>[%02x, %02x, %02x, %02x]\n", i, qp[qp_index], index_a, alpha, beta, tc, bS[bS_index], pix[-3], p1, p0, q0, q1, pix[2], p1, pix[-1], pix[0], q1);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6267 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6268 }else{
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6269 /* 4px edge length */
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6270 const int p0 = pix[-1];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6271 const int p1 = pix[-2];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6272 const int p2 = pix[-3];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6273
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6274 const int q0 = pix[0];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6275 const int q1 = pix[1];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6276 const int q2 = pix[2];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6277
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6278 if( ABS( p0 - q0 ) < alpha &&
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6279 ABS( p1 - p0 ) < beta &&
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6280 ABS( q1 - q0 ) < beta ) {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6281
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6282 if(ABS( p0 - q0 ) < (( alpha >> 2 ) + 2 )){
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6283 if( ABS( p2 - p0 ) < beta)
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6284 {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6285 const int p3 = pix[-4];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6286 /* p0', p1', p2' */
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6287 pix[-1] = ( p2 + 2*p1 + 2*p0 + 2*q0 + q1 + 4 ) >> 3;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6288 pix[-2] = ( p2 + p1 + p0 + q0 + 2 ) >> 2;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6289 pix[-3] = ( 2*p3 + 3*p2 + p1 + p0 + q0 + 4 ) >> 3;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6290 } else {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6291 /* p0' */
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6292 pix[-1] = ( 2*p1 + p0 + q1 + 2 ) >> 2;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6293 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6294 if( ABS( q2 - q0 ) < beta)
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6295 {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6296 const int q3 = pix[3];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6297 /* q0', q1', q2' */
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6298 pix[0] = ( p1 + 2*p0 + 2*q0 + 2*q1 + q2 + 4 ) >> 3;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6299 pix[1] = ( p0 + q0 + q1 + q2 + 2 ) >> 2;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6300 pix[2] = ( 2*q3 + 3*q2 + q1 + q0 + p0 + 4 ) >> 3;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6301 } else {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6302 /* q0' */
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6303 pix[0] = ( 2*q1 + q0 + p1 + 2 ) >> 2;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6304 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6305 }else{
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6306 /* p0', q0' */
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6307 pix[-1] = ( 2*p1 + p0 + q1 + 2 ) >> 2;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6308 pix[ 0] = ( 2*q1 + q0 + p1 + 2 ) >> 2;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6309 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6310 tprintf("filter_mb_mbaff_edgev i:%d, qp:%d, indexA:%d, alpha:%d, beta:%d\n# bS:4 -> [%02x, %02x, %02x, %02x, %02x, %02x] =>[%02x, %02x, %02x, %02x, %02x, %02x]\n", i, qp[qp_index], index_a, alpha, beta, p2, p1, p0, q0, q1, q2, pix[-3], pix[-2], pix[-1], pix[0], pix[1], pix[2]);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6311 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6312 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6313 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6314 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6315 static void filter_mb_mbaff_edgecv( H264Context *h, uint8_t *pix, int stride, int bS[4], int qp[2] ) {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6316 int i;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6317 for( i = 0; i < 8; i++, pix += stride) {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6318 int index_a;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6319 int alpha;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6320 int beta;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6321
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6322 int qp_index;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6323 int bS_index = i;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6324
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6325 if( bS[bS_index] == 0 ) {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6326 continue;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6327 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6328
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6329 qp_index = h->mb_field_decoding_flag ? (i & 1) : (i >> 3);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6330 index_a = clip( qp[qp_index] + h->slice_alpha_c0_offset, 0, 51 );
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6331 alpha = alpha_table[index_a];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6332 beta = beta_table[clip( qp[qp_index] + h->slice_beta_offset, 0, 51 )];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6333 if( bS[bS_index] < 4 ) {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6334 const int tc = tc0_table[index_a][bS[bS_index] - 1] + 1;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6335 /* 2px edge length (because we use same bS than the one for luma) */
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6336 const int p0 = pix[-1];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6337 const int p1 = pix[-2];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6338 const int q0 = pix[0];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6339 const int q1 = pix[1];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6340
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6341 if( ABS( p0 - q0 ) < alpha &&
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6342 ABS( p1 - p0 ) < beta &&
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6343 ABS( q1 - q0 ) < beta ) {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6344 const int i_delta = clip( (((q0 - p0 ) << 2) + (p1 - q1) + 4) >> 3, -tc, tc );
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6345
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6346 pix[-1] = clip_uint8( p0 + i_delta ); /* p0' */
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6347 pix[0] = clip_uint8( q0 - i_delta ); /* q0' */
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6348 tprintf("filter_mb_mbaff_edgecv i:%d, qp:%d, indexA:%d, alpha:%d, beta:%d, tc:%d\n# bS:%d -> [%02x, %02x, %02x, %02x, %02x, %02x] =>[%02x, %02x, %02x, %02x]\n", i, qp[qp_index], index_a, alpha, beta, tc, bS[bS_index], pix[-3], p1, p0, q0, q1, pix[2], p1, pix[-1], pix[0], q1);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6349 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6350 }else{
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6351 const int p0 = pix[-1];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6352 const int p1 = pix[-2];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6353 const int q0 = pix[0];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6354 const int q1 = pix[1];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6355
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6356 if( ABS( p0 - q0 ) < alpha &&
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6357 ABS( p1 - p0 ) < beta &&
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6358 ABS( q1 - q0 ) < beta ) {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6359
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6360 pix[-1] = ( 2*p1 + p0 + q1 + 2 ) >> 2; /* p0' */
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6361 pix[0] = ( 2*q1 + q0 + p1 + 2 ) >> 2; /* q0' */
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6362 tprintf("filter_mb_mbaff_edgecv i:%d\n# bS:4 -> [%02x, %02x, %02x, %02x, %02x, %02x] =>[%02x, %02x, %02x, %02x, %02x, %02x]\n", i, pix[-3], p1, p0, q0, q1, pix[2], pix[-3], pix[-2], pix[-1], pix[0], pix[1], pix[2]);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6363 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6364 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6365 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6366 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6367
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
6368 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
6369 int i, d;
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6370 const int index_a = clip( qp + h->slice_alpha_c0_offset, 0, 51 );
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6371 const int alpha = alpha_table[index_a];
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6372 const int beta = beta_table[clip( qp + h->slice_beta_offset, 0, 51 )];
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6373 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
6374
2633
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
6375 if( bS[0] < 4 ) {
2707
360024d31dab H.264 deblocking optimizations (mmx for chroma_bS4 case, convert existing cases to 8-bit math)
lorenm
parents: 2683
diff changeset
6376 int8_t tc[4];
2633
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
6377 for(i=0; i<4; i++)
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
6378 tc[i] = bS[i] ? tc0_table[index_a][bS[i] - 1] : -1;
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
6379 h->s.dsp.h264_v_loop_filter_luma(pix, stride, alpha, beta, tc);
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
6380 } else {
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
6381 /* 16px edge length, see filter_mb_edgev */
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
6382 for( d = 0; d < 16; d++ ) {
1898
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6383 const int p0 = pix[-1*pix_next];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6384 const int p1 = pix[-2*pix_next];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6385 const int p2 = pix[-3*pix_next];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6386 const int q0 = pix[0];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6387 const int q1 = pix[1*pix_next];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6388 const int q2 = pix[2*pix_next];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6389
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6390 if( ABS( p0 - q0 ) < alpha &&
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6391 ABS( p1 - p0 ) < beta &&
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6392 ABS( q1 - q0 ) < beta ) {
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6393
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6394 const int p3 = pix[-4*pix_next];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6395 const int q3 = pix[ 3*pix_next];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6396
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6397 if(ABS( p0 - q0 ) < (( alpha >> 2 ) + 2 )){
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6398 if( ABS( p2 - p0 ) < beta) {
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6399 /* p0', p1', p2' */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6400 pix[-1*pix_next] = ( p2 + 2*p1 + 2*p0 + 2*q0 + q1 + 4 ) >> 3;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6401 pix[-2*pix_next] = ( p2 + p1 + p0 + q0 + 2 ) >> 2;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6402 pix[-3*pix_next] = ( 2*p3 + 3*p2 + p1 + p0 + q0 + 4 ) >> 3;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6403 } else {
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6404 /* p0' */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6405 pix[-1*pix_next] = ( 2*p1 + p0 + q1 + 2 ) >> 2;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6406 }
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6407 if( ABS( q2 - q0 ) < beta) {
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6408 /* q0', q1', q2' */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6409 pix[0*pix_next] = ( p1 + 2*p0 + 2*q0 + 2*q1 + q2 + 4 ) >> 3;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6410 pix[1*pix_next] = ( p0 + q0 + q1 + q2 + 2 ) >> 2;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6411 pix[2*pix_next] = ( 2*q3 + 3*q2 + q1 + q0 + p0 + 4 ) >> 3;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6412 } else {
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6413 /* q0' */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6414 pix[0*pix_next] = ( 2*q1 + q0 + p1 + 2 ) >> 2;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6415 }
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6416 }else{
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6417 /* p0', q0' */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6418 pix[-1*pix_next] = ( 2*p1 + p0 + q1 + 2 ) >> 2;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6419 pix[ 0*pix_next] = ( 2*q1 + q0 + p1 + 2 ) >> 2;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6420 }
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6421 tprintf("filter_mb_edgeh i:%d d:%d, qp:%d, indexA:%d, alpha:%d, beta:%d\n# bS:%d -> [%02x, %02x, %02x, %02x, %02x, %02x] =>[%02x, %02x, %02x, %02x]\n", i, d, qp, index_a, alpha, beta, bS[i], p2, p1, p0, q0, q1, q2, pix[-2*pix_next], pix[-pix_next], pix[0], pix[pix_next]);
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6422 }
1898
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6423 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
6424 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6425 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6426 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6427
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6428 static void filter_mb_edgech( H264Context *h, uint8_t *pix, int stride, int bS[4], int qp ) {
2834
fd5d7c732c6b kill a bunch of compiler warnings
mru
parents: 2815
diff changeset
6429 int i;
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6430 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
6431 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
6432 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
6433
2633
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
6434 if( bS[0] < 4 ) {
2707
360024d31dab H.264 deblocking optimizations (mmx for chroma_bS4 case, convert existing cases to 8-bit math)
lorenm
parents: 2683
diff changeset
6435 int8_t tc[4];
2633
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
6436 for(i=0; i<4; i++)
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
6437 tc[i] = bS[i] ? tc0_table[index_a][bS[i] - 1] + 1 : 0;
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
6438 h->s.dsp.h264_v_loop_filter_chroma(pix, stride, alpha, beta, tc);
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
6439 } else {
2707
360024d31dab H.264 deblocking optimizations (mmx for chroma_bS4 case, convert existing cases to 8-bit math)
lorenm
parents: 2683
diff changeset
6440 h->s.dsp.h264_v_loop_filter_chroma_intra(pix, stride, alpha, beta);
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6441 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6442 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6443
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6444 static void filter_mb( H264Context *h, int mb_x, int mb_y, uint8_t *img_y, uint8_t *img_cb, uint8_t *img_cr, unsigned int linesize, unsigned int uvlinesize) {
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6445 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
6446 const int mb_xy= mb_x + mb_y*s->mb_stride;
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6447 int first_vertical_edge_done = 0;
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6448 int dir;
2629
202cd69d8d2e fix ref comparison in B-frame deblocker ('unused' and 'unavailable' were treated as different)
lorenm
parents: 2628
diff changeset
6449 /* FIXME: A given frame may occupy more than one position in
202cd69d8d2e fix ref comparison in B-frame deblocker ('unused' and 'unavailable' were treated as different)
lorenm
parents: 2628
diff changeset
6450 * the reference list. So ref2frm should be populated with
202cd69d8d2e fix ref comparison in B-frame deblocker ('unused' and 'unavailable' were treated as different)
lorenm
parents: 2628
diff changeset
6451 * frame numbers, not indices. */
202cd69d8d2e fix ref comparison in B-frame deblocker ('unused' and 'unavailable' were treated as different)
lorenm
parents: 2628
diff changeset
6452 static const int ref2frm[18] = {-1,-1,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15};
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6453
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6454 if (h->mb_aff_frame
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6455 // left mb is in picture
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6456 && h->slice_table[mb_xy-1] != 255
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6457 // and current and left pair do not have the same interlaced type
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6458 && (IS_INTERLACED(s->current_picture.mb_type[mb_xy]) != IS_INTERLACED(s->current_picture.mb_type[mb_xy-1]))
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6459 // and left mb is in the same slice if deblocking_filter == 2
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6460 && (h->deblocking_filter!=2 || h->slice_table[mb_xy-1] == h->slice_table[mb_xy])) {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6461 /* First vertical edge is different in MBAFF frames
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
6462 * There are 8 different bS to compute and 2 different Qp
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6463 */
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6464 int bS[8];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6465 int qp[2];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6466 int chroma_qp[2];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6467
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6468 int i;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6469 first_vertical_edge_done = 1;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6470 for( i = 0; i < 8; i++ ) {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6471 int y = i>>1;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6472 int b_idx= 8 + 4 + 8*y;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6473 int bn_idx= b_idx - 1;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6474
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6475 int mbn_xy = h->mb_field_decoding_flag ? h->left_mb_xy[i>>2] : h->left_mb_xy[i&1];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6476
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6477 if( IS_INTRA( s->current_picture.mb_type[mb_xy] ) ||
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6478 IS_INTRA( s->current_picture.mb_type[mbn_xy] ) ) {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6479 bS[i] = 4;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6480 } else if( h->non_zero_count_cache[b_idx] != 0 ||
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
6481 /* FIXME: with 8x8dct + cavlc, should check cbp instead of nnz */
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6482 h->non_zero_count_cache[bn_idx] != 0 ) {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6483 bS[i] = 2;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6484 } else {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6485 int l;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6486 bS[i] = 0;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6487 for( l = 0; l < 1 + (h->slice_type == B_TYPE); l++ ) {
2629
202cd69d8d2e fix ref comparison in B-frame deblocker ('unused' and 'unavailable' were treated as different)
lorenm
parents: 2628
diff changeset
6488 if( ref2frm[h->ref_cache[l][b_idx]+2] != ref2frm[h->ref_cache[l][bn_idx]+2] ||
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6489 ABS( h->mv_cache[l][b_idx][0] - h->mv_cache[l][bn_idx][0] ) >= 4 ||
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6490 ABS( h->mv_cache[l][b_idx][1] - h->mv_cache[l][bn_idx][1] ) >= 4 ) {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6491 bS[i] = 1;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6492 break;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6493 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6494 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6495 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6496 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6497 if(bS[0]+bS[1]+bS[2]+bS[3] != 0) {
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
6498 // Do not use s->qscale as luma quantizer because it has not the same
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6499 // value in IPCM macroblocks.
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6500 qp[0] = ( s->current_picture.qscale_table[mb_xy] + s->current_picture.qscale_table[h->left_mb_xy[0]] + 1 ) >> 1;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6501 chroma_qp[0] = ( get_chroma_qp( h->pps.chroma_qp_index_offset, s->current_picture.qscale_table[mb_xy] ) +
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6502 get_chroma_qp( h->pps.chroma_qp_index_offset, s->current_picture.qscale_table[h->left_mb_xy[0]] ) + 1 ) >> 1;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6503 qp[1] = ( s->current_picture.qscale_table[mb_xy] + s->current_picture.qscale_table[h->left_mb_xy[1]] + 1 ) >> 1;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6504 chroma_qp[1] = ( get_chroma_qp( h->pps.chroma_qp_index_offset, s->current_picture.qscale_table[mb_xy] ) +
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6505 get_chroma_qp( h->pps.chroma_qp_index_offset, s->current_picture.qscale_table[h->left_mb_xy[1]] ) + 1 ) >> 1;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6506
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6507 /* Filter edge */
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6508 tprintf("filter mb:%d/%d MBAFF, QPy:%d/%d, QPc:%d/%d ls:%d uvls:%d", mb_x, mb_y, qp[0], qp[1], chroma_qp[0], chroma_qp[1], linesize, uvlinesize);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6509 { int i; for (i = 0; i < 8; i++) tprintf(" bS[%d]:%d", i, bS[i]); tprintf("\n"); }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6510 filter_mb_mbaff_edgev ( h, &img_y [0], linesize, bS, qp );
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6511 filter_mb_mbaff_edgecv( h, &img_cb[0], uvlinesize, bS, chroma_qp );
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6512 filter_mb_mbaff_edgecv( h, &img_cr[0], uvlinesize, bS, chroma_qp );
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6513 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6514 }
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
6515 /* 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
6516 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
6517 {
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6518 int edge;
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6519 const int mbm_xy = dir == 0 ? mb_xy -1 : h->top_mb_xy;
2454
300f1207768d simplify
michael
parents: 2453
diff changeset
6520 int start = h->slice_table[mbm_xy] == 255 ? 1 : 0;
300f1207768d simplify
michael
parents: 2453
diff changeset
6521
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6522 if (first_vertical_edge_done) {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6523 start = 1;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6524 first_vertical_edge_done = 0;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6525 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6526
2454
300f1207768d simplify
michael
parents: 2453
diff changeset
6527 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
6528 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
6529
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6530 /* 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
6531 for( edge = start; edge < 4; edge++ ) {
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
6532 /* mbn_xy: neighbor macroblock */
2454
300f1207768d simplify
michael
parents: 2453
diff changeset
6533 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
6534 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
6535 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
6536
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
6537 if( (edge&1) && IS_8x8DCT(s->current_picture.mb_type[mb_xy]) )
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
6538 continue;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
6539
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6540 if (h->mb_aff_frame && (dir == 1) && (edge == 0) && ((mb_y & 1) == 0)
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6541 && !IS_INTERLACED(s->current_picture.mb_type[mb_xy])
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6542 && IS_INTERLACED(s->current_picture.mb_type[mbn_xy])
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6543 ) {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6544 // This is a special case in the norm where the filtering must
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6545 // be done twice (one each of the field) even if we are in a
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6546 // frame macroblock.
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6547 //
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6548 unsigned int tmp_linesize = 2 * linesize;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6549 unsigned int tmp_uvlinesize = 2 * uvlinesize;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6550 int mbn_xy = mb_xy - 2 * s->mb_stride;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6551 int qp, chroma_qp;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6552
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6553 // first filtering
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6554 if( IS_INTRA( s->current_picture.mb_type[mb_xy] ) ||
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6555 IS_INTRA( s->current_picture.mb_type[mbn_xy] ) ) {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6556 bS[0] = bS[1] = bS[2] = bS[3] = 3;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6557 } else {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6558 // TODO
2844
5f20ab245501 prevent assert failures and infinite loops with broken streams
michael
parents: 2834
diff changeset
6559 av_log(h->s.avctx, AV_LOG_ERROR, "both non intra (TODO)\n");
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6560 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6561 /* Filter edge */
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
6562 // Do not use s->qscale as luma quantizer because it has not the same
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6563 // value in IPCM macroblocks.
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6564 qp = ( s->current_picture.qscale_table[mb_xy] + s->current_picture.qscale_table[mbn_xy] + 1 ) >> 1;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6565 tprintf("filter mb:%d/%d dir:%d edge:%d, QPy:%d ls:%d uvls:%d", mb_x, mb_y, dir, edge, qp, tmp_linesize, tmp_uvlinesize);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6566 { int i; for (i = 0; i < 4; i++) tprintf(" bS[%d]:%d", i, bS[i]); tprintf("\n"); }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6567 filter_mb_edgeh( h, &img_y[0], tmp_linesize, bS, qp );
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6568 chroma_qp = ( h->chroma_qp +
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6569 get_chroma_qp( h->pps.chroma_qp_index_offset, s->current_picture.qscale_table[mbn_xy] ) + 1 ) >> 1;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6570 filter_mb_edgech( h, &img_cb[0], tmp_uvlinesize, bS, chroma_qp );
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6571 filter_mb_edgech( h, &img_cr[0], tmp_uvlinesize, bS, chroma_qp );
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6572
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6573 // second filtering
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6574 mbn_xy += s->mb_stride;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6575 if( IS_INTRA( s->current_picture.mb_type[mb_xy] ) ||
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6576 IS_INTRA( s->current_picture.mb_type[mbn_xy] ) ) {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6577 bS[0] = bS[1] = bS[2] = bS[3] = 3;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6578 } else {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6579 // TODO
2844
5f20ab245501 prevent assert failures and infinite loops with broken streams
michael
parents: 2834
diff changeset
6580 av_log(h->s.avctx, AV_LOG_ERROR, "both non intra (TODO)\n");
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6581 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6582 /* Filter edge */
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
6583 // Do not use s->qscale as luma quantizer because it has not the same
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6584 // value in IPCM macroblocks.
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6585 qp = ( s->current_picture.qscale_table[mb_xy] + s->current_picture.qscale_table[mbn_xy] + 1 ) >> 1;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6586 tprintf("filter mb:%d/%d dir:%d edge:%d, QPy:%d ls:%d uvls:%d", mb_x, mb_y, dir, edge, qp, tmp_linesize, tmp_uvlinesize);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6587 { int i; for (i = 0; i < 4; i++) tprintf(" bS[%d]:%d", i, bS[i]); tprintf("\n"); }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6588 filter_mb_edgeh( h, &img_y[linesize], tmp_linesize, bS, qp );
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6589 chroma_qp = ( h->chroma_qp +
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6590 get_chroma_qp( h->pps.chroma_qp_index_offset, s->current_picture.qscale_table[mbn_xy] ) + 1 ) >> 1;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6591 filter_mb_edgech( h, &img_cb[uvlinesize], tmp_uvlinesize, bS, chroma_qp );
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6592 filter_mb_edgech( h, &img_cr[uvlinesize], tmp_uvlinesize, bS, chroma_qp );
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6593 continue;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6594 }
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
6595 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
6596 IS_INTRA( s->current_picture.mb_type[mbn_xy] ) ) {
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6597 int value;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6598 if (edge == 0) {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6599 if ( (!IS_INTERLACED(s->current_picture.mb_type[mb_xy]) && !IS_INTERLACED(s->current_picture.mb_type[mbm_xy]))
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6600 || ((h->mb_aff_frame || (s->picture_structure != PICT_FRAME)) && (dir == 0))
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6601 ) {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6602 value = 4;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6603 } else {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6604 value = 3;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6605 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6606 } else {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6607 value = 3;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6608 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6609 bS[0] = bS[1] = bS[2] = bS[3] = value;
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6610 } 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
6611 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
6612 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
6613 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
6614 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
6615 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
6616 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
6617
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
6618 if( h->non_zero_count_cache[b_idx] != 0 ||
2449
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
6619 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
6620 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
6621 }
2523
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
6622 else
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
6623 {
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
6624 int l;
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
6625 bS[i] = 0;
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
6626 for( l = 0; l < 1 + (h->slice_type == B_TYPE); l++ ) {
2629
202cd69d8d2e fix ref comparison in B-frame deblocker ('unused' and 'unavailable' were treated as different)
lorenm
parents: 2628
diff changeset
6627 if( ref2frm[h->ref_cache[l][b_idx]+2] != ref2frm[h->ref_cache[l][bn_idx]+2] ||
2523
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
6628 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
6629 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
6630 bS[i] = 1;
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
6631 break;
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
6632 }
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
6633 }
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
6634 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6635 }
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
6636
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
6637 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
6638 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
6639 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6640
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6641 /* Filter edge */
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
6642 // Do not use s->qscale as luma quantizer because it has not the same
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
6643 // value in IPCM macroblocks.
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
6644 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
6645 //tprintf("filter mb:%d/%d dir:%d edge:%d, QPy:%d, QPc:%d, QPcn:%d\n", mb_x, mb_y, dir, edge, qp, h->chroma_qp, s->current_picture.qscale_table[mbn_xy]);
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6646 tprintf("filter mb:%d/%d dir:%d edge:%d, QPy:%d ls:%d uvls:%d", mb_x, mb_y, dir, edge, qp, linesize, uvlinesize);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6647 { int i; for (i = 0; i < 4; i++) tprintf(" bS[%d]:%d", i, bS[i]); tprintf("\n"); }
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6648 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
6649 filter_mb_edgev( h, &img_y[4*edge], linesize, bS, qp );
1898
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6650 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
6651 int chroma_qp = ( h->chroma_qp +
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6652 get_chroma_qp( h->pps.chroma_qp_index_offset, s->current_picture.qscale_table[mbn_xy] ) + 1 ) >> 1;
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6653 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
6654 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
6655 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6656 } 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
6657 filter_mb_edgeh( h, &img_y[4*edge*linesize], linesize, bS, qp );
1898
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6658 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
6659 int chroma_qp = ( h->chroma_qp +
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6660 get_chroma_qp( h->pps.chroma_qp_index_offset, s->current_picture.qscale_table[mbn_xy] ) + 1 ) >> 1;
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6661 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
6662 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
6663 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6664 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6665 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6666 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6667 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6668
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6669 static int decode_slice(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6670 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6671 const int part_mask= s->partitioned_frame ? (AC_END|AC_ERROR) : 0x7F;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6672
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6673 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
6674
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6675 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
6676 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
6677
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6678 /* realign */
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6679 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
6680
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6681 /* 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
6682 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
6683 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
6684 s->gb.buffer + get_bits_count(&s->gb)/8,
2116
48d9f86fb047 overread fix
michael
parents: 2110
diff changeset
6685 ( 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
6686 /* calculate pre-state */
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
6687 for( i= 0; i < 460; i++ ) {
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6688 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
6689 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
6690 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
6691 else
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6692 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
6693
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6694 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
6695 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
6696 else
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6697 h->cabac_state[i] = 2 * ( pre - 64 ) + 1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6698 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6699
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6700 for(;;){
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6701 int ret = decode_mb_cabac(h);
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
6702 int eos;
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6703
2163
b25df257eab0 segfault fix
michael
parents: 2116
diff changeset
6704 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
6705
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6706 /* XXX: useless as decode_mb_cabac it doesn't support that ... */
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6707 if( ret >= 0 && h->mb_aff_frame ) { //FIXME optimal? or let mb_decode decode 16x32 ?
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6708 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
6709
2163
b25df257eab0 segfault fix
michael
parents: 2116
diff changeset
6710 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
6711
2844
5f20ab245501 prevent assert failures and infinite loops with broken streams
michael
parents: 2834
diff changeset
6712 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
6713 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
6714 }
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
6715 eos = get_cabac_terminate( &h->cabac );
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6716
2116
48d9f86fb047 overread fix
michael
parents: 2110
diff changeset
6717 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
6718 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
6719 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
6720 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
6721 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6722
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6723 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
6724 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
6725 ff_draw_horiz_band(s, 16*s->mb_y, 16);
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
6726 ++s->mb_y;
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6727 if(h->mb_aff_frame) {
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
6728 ++s->mb_y;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
6729 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6730 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6731
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6732 if( eos || s->mb_y >= s->mb_height ) {
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
6733 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
6734 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
6735 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
6736 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6737 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6738
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6739 } else {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6740 for(;;){
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6741 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
6742
2163
b25df257eab0 segfault fix
michael
parents: 2116
diff changeset
6743 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
6744
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6745 if(ret>=0 && h->mb_aff_frame){ //FIXME optimal? or let mb_decode decode 16x32 ?
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6746 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
6747 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
6748
2163
b25df257eab0 segfault fix
michael
parents: 2116
diff changeset
6749 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
6750 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
6751 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6752
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6753 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
6754 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
6755 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
6756
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6757 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
6758 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6759
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6760 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
6761 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
6762 ff_draw_horiz_band(s, 16*s->mb_y, 16);
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
6763 ++s->mb_y;
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6764 if(h->mb_aff_frame) {
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
6765 ++s->mb_y;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
6766 }
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
6767 if(s->mb_y >= s->mb_height){
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6768 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
6769
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6770 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
6771 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
6772
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6773 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
6774 }else{
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6775 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
6776
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6777 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
6778 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6779 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6780 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6781
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6782 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
6783 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
6784 if(get_bits_count(&s->gb) == s->gb.size_in_bits ){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6785 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
6786
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6787 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6788 }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
6789 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
6790
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6791 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6792 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6793 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6794 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6795 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6796
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6797 #if 0
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6798 for(;s->mb_y < s->mb_height; s->mb_y++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6799 for(;s->mb_x < s->mb_width; s->mb_x++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6800 int ret= decode_mb(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6801
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6802 hl_decode_mb(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6803
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6804 if(ret<0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6805 fprintf(stderr, "error while decoding MB %d %d\n", s->mb_x, s->mb_y);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6806 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
6807
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6808 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6809 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6810
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6811 if(++s->mb_x >= s->mb_width){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6812 s->mb_x=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6813 if(++s->mb_y >= s->mb_height){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6814 if(get_bits_count(s->gb) == s->gb.size_in_bits){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6815 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
6816
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6817 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6818 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6819 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
6820
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6821 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6822 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6823 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6824 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6825
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6826 if(get_bits_count(s->?gb) >= s->gb?.size_in_bits){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6827 if(get_bits_count(s->gb) == s->gb.size_in_bits){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6828 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
6829
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6830 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6831 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6832 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
6833
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6834 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6835 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6836 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6837 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6838 s->mb_x=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6839 ff_draw_horiz_band(s, 16*s->mb_y, 16);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6840 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6841 #endif
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6842 return -1; //not reached
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6843 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6844
2815
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6845 static int decode_unregistered_user_data(H264Context *h, int size){
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6846 MpegEncContext * const s = &h->s;
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6847 uint8_t user_data[16+256];
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6848 int e, build, i;
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6849
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6850 if(size<16)
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6851 return -1;
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6852
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6853 for(i=0; i<sizeof(user_data)-1 && i<size; i++){
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6854 user_data[i]= get_bits(&s->gb, 8);
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6855 }
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6856
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6857 user_data[i]= 0;
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6858 e= sscanf(user_data+16, "x264 - core %d"/*%s - H.264/MPEG-4 AVC codec - Copyleft 2005 - http://www.videolan.org/x264.html*/, &build);
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6859 if(e==1 && build>=0)
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6860 h->x264_build= build;
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6861
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6862 if(s->avctx->debug & FF_DEBUG_BUGS)
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6863 av_log(s->avctx, AV_LOG_DEBUG, "user data:\"%s\"\n", user_data+16);
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6864
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6865 for(; i<size; i++)
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6866 skip_bits(&s->gb, 8);
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6867
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6868 return 0;
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6869 }
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6870
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6871 static int decode_sei(H264Context *h){
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6872 MpegEncContext * const s = &h->s;
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6873
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6874 while(get_bits_count(&s->gb) + 16 < s->gb.size_in_bits){
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6875 int size, type;
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6876
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6877 type=0;
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6878 do{
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6879 type+= show_bits(&s->gb, 8);
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6880 }while(get_bits(&s->gb, 8) == 255);
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6881
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6882 size=0;
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6883 do{
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6884 size+= show_bits(&s->gb, 8);
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6885 }while(get_bits(&s->gb, 8) == 255);
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6886
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6887 switch(type){
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6888 case 5:
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6889 if(decode_unregistered_user_data(h, size) < 0);
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6890 return -1;
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6891 break;
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6892 default:
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6893 skip_bits(&s->gb, 8*size);
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6894 }
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6895
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6896 //FIXME check bits here
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6897 align_get_bits(&s->gb);
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6898 }
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6899
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6900 return 0;
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6901 }
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
6902
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
6903 static inline void decode_hrd_parameters(H264Context *h, SPS *sps){
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
6904 MpegEncContext * const s = &h->s;
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
6905 int cpb_count, i;
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
6906 cpb_count = get_ue_golomb(&s->gb) + 1;
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
6907 get_bits(&s->gb, 4); /* bit_rate_scale */
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
6908 get_bits(&s->gb, 4); /* cpb_size_scale */
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
6909 for(i=0; i<cpb_count; i++){
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
6910 get_ue_golomb(&s->gb); /* bit_rate_value_minus1 */
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
6911 get_ue_golomb(&s->gb); /* cpb_size_value_minus1 */
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
6912 get_bits1(&s->gb); /* cbr_flag */
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
6913 }
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
6914 get_bits(&s->gb, 5); /* initial_cpb_removal_delay_length_minus1 */
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
6915 get_bits(&s->gb, 5); /* cpb_removal_delay_length_minus1 */
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
6916 get_bits(&s->gb, 5); /* dpb_output_delay_length_minus1 */
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
6917 get_bits(&s->gb, 5); /* time_offset_length */
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
6918 }
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
6919
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6920 static inline int decode_vui_parameters(H264Context *h, SPS *sps){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6921 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6922 int aspect_ratio_info_present_flag, aspect_ratio_idc;
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
6923 int nal_hrd_parameters_present_flag, vcl_hrd_parameters_present_flag;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6924
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6925 aspect_ratio_info_present_flag= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6926
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6927 if( aspect_ratio_info_present_flag ) {
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6928 aspect_ratio_idc= get_bits(&s->gb, 8);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6929 if( aspect_ratio_idc == EXTENDED_SAR ) {
1548
dd544554ed42 AVRational
michael
parents: 1524
diff changeset
6930 sps->sar.num= get_bits(&s->gb, 16);
dd544554ed42 AVRational
michael
parents: 1524
diff changeset
6931 sps->sar.den= get_bits(&s->gb, 16);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6932 }else if(aspect_ratio_idc < 16){
1548
dd544554ed42 AVRational
michael
parents: 1524
diff changeset
6933 sps->sar= pixel_aspect[aspect_ratio_idc];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6934 }else{
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
6935 av_log(h->s.avctx, AV_LOG_ERROR, "illegal aspect ratio\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6936 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6937 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6938 }else{
1548
dd544554ed42 AVRational
michael
parents: 1524
diff changeset
6939 sps->sar.num=
dd544554ed42 AVRational
michael
parents: 1524
diff changeset
6940 sps->sar.den= 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6941 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6942 // 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
6943
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents: 2163
diff changeset
6944 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
6945 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
6946 }
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents: 2163
diff changeset
6947
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents: 2163
diff changeset
6948 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
6949 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
6950 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
6951 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
6952 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
6953 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
6954 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
6955 }
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents: 2163
diff changeset
6956 }
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents: 2163
diff changeset
6957
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents: 2163
diff changeset
6958 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
6959 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
6960 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
6961 }
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents: 2163
diff changeset
6962
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents: 2163
diff changeset
6963 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
6964 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
6965 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
6966 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
6967 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
6968 }
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents: 2163
diff changeset
6969
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
6970 nal_hrd_parameters_present_flag = get_bits1(&s->gb);
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
6971 if(nal_hrd_parameters_present_flag)
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
6972 decode_hrd_parameters(h, sps);
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
6973 vcl_hrd_parameters_present_flag = get_bits1(&s->gb);
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
6974 if(vcl_hrd_parameters_present_flag)
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
6975 decode_hrd_parameters(h, sps);
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
6976 if(nal_hrd_parameters_present_flag || vcl_hrd_parameters_present_flag)
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
6977 get_bits1(&s->gb); /* low_delay_hrd_flag */
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
6978 get_bits1(&s->gb); /* pic_struct_present_flag */
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
6979
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
6980 sps->bitstream_restriction_flag = get_bits1(&s->gb);
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
6981 if(sps->bitstream_restriction_flag){
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
6982 get_bits1(&s->gb); /* motion_vectors_over_pic_boundaries_flag */
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
6983 get_ue_golomb(&s->gb); /* max_bytes_per_pic_denom */
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
6984 get_ue_golomb(&s->gb); /* max_bits_per_mb_denom */
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
6985 get_ue_golomb(&s->gb); /* log2_max_mv_length_horizontal */
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
6986 get_ue_golomb(&s->gb); /* log2_max_mv_length_vertical */
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
6987 sps->num_reorder_frames = get_ue_golomb(&s->gb);
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
6988 get_ue_golomb(&s->gb); /* max_dec_frame_buffering */
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
6989 }
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
6990
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6991 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6992 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6993
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6994 static inline int decode_seq_parameter_set(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6995 MpegEncContext * const s = &h->s;
1371
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
6996 int profile_idc, level_idc;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6997 int sps_id, i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6998 SPS *sps;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6999
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7000 profile_idc= get_bits(&s->gb, 8);
1371
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
7001 get_bits1(&s->gb); //constraint_set0_flag
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
7002 get_bits1(&s->gb); //constraint_set1_flag
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
7003 get_bits1(&s->gb); //constraint_set2_flag
2312
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
7004 get_bits1(&s->gb); //constraint_set3_flag
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
7005 get_bits(&s->gb, 4); // reserved
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7006 level_idc= get_bits(&s->gb, 8);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7007 sps_id= get_ue_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7008
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7009 sps= &h->sps_buffer[ sps_id ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7010 sps->profile_idc= profile_idc;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7011 sps->level_idc= level_idc;
2312
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
7012
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
7013 if(sps->profile_idc >= 100){ //high profile
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
7014 if(get_ue_golomb(&s->gb) == 3) //chroma_format_idc
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
7015 get_bits1(&s->gb); //residual_color_transform_flag
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
7016 get_ue_golomb(&s->gb); //bit_depth_luma_minus8
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
7017 get_ue_golomb(&s->gb); //bit_depth_chroma_minus8
2763
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
7018 sps->transform_bypass = get_bits1(&s->gb);
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
7019 if(get_bits1(&s->gb)){ //seq_scaling_matrix_present_flag
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
7020 av_log(h->s.avctx, AV_LOG_ERROR, "custom scaling matrix not implemented\n");
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
7021 return -1;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
7022 }
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
7023 }
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
7024
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7025 sps->log2_max_frame_num= get_ue_golomb(&s->gb) + 4;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7026 sps->poc_type= get_ue_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7027
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7028 if(sps->poc_type == 0){ //FIXME #define
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7029 sps->log2_max_poc_lsb= get_ue_golomb(&s->gb) + 4;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7030 } else if(sps->poc_type == 1){//FIXME #define
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7031 sps->delta_pic_order_always_zero_flag= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7032 sps->offset_for_non_ref_pic= get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7033 sps->offset_for_top_to_bottom_field= get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7034 sps->poc_cycle_length= get_ue_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7035
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7036 for(i=0; i<sps->poc_cycle_length; i++)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7037 sps->offset_for_ref_frame[i]= get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7038 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7039 if(sps->poc_type > 2){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
7040 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
7041 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7042 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7043
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7044 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
7045 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
7046 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
7047 }
1371
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
7048 sps->gaps_in_frame_num_allowed_flag= get_bits1(&s->gb);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7049 sps->mb_width= get_ue_golomb(&s->gb) + 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7050 sps->mb_height= get_ue_golomb(&s->gb) + 1;
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2417
diff changeset
7051 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
7052 avcodec_check_dimensions(NULL, 16*sps->mb_width, 16*sps->mb_height))
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2417
diff changeset
7053 return -1;
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2417
diff changeset
7054
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7055 sps->frame_mbs_only_flag= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7056 if(!sps->frame_mbs_only_flag)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7057 sps->mb_aff= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7058 else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7059 sps->mb_aff= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7060
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7061 sps->direct_8x8_inference_flag= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7062
1371
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
7063 sps->crop= get_bits1(&s->gb);
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
7064 if(sps->crop){
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
7065 sps->crop_left = get_ue_golomb(&s->gb);
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
7066 sps->crop_right = get_ue_golomb(&s->gb);
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
7067 sps->crop_top = get_ue_golomb(&s->gb);
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
7068 sps->crop_bottom= get_ue_golomb(&s->gb);
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
7069 if(sps->crop_left || sps->crop_top){
2628
511e3afc43e1 Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents: 2623
diff changeset
7070 av_log(h->s.avctx, AV_LOG_ERROR, "insane cropping not completely supported, this could look slightly wrong ...\n");
1371
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
7071 }
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
7072 }else{
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
7073 sps->crop_left =
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
7074 sps->crop_right =
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
7075 sps->crop_top =
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
7076 sps->crop_bottom= 0;
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
7077 }
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
7078
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7079 sps->vui_parameters_present_flag= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7080 if( sps->vui_parameters_present_flag )
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7081 decode_vui_parameters(h, sps);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7082
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7083 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
7084 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
7085 sps_id, sps->profile_idc, sps->level_idc,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7086 sps->poc_type,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7087 sps->ref_frame_count,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7088 sps->mb_width, sps->mb_height,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7089 sps->frame_mbs_only_flag ? "FRM" : (sps->mb_aff ? "MB-AFF" : "PIC-AFF"),
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7090 sps->direct_8x8_inference_flag ? "8B8" : "",
1371
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
7091 sps->crop_left, sps->crop_right,
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
7092 sps->crop_top, sps->crop_bottom,
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7093 sps->vui_parameters_present_flag ? "VUI" : ""
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7094 );
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7095 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7096 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7097 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7098
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
7099 static inline int decode_picture_parameter_set(H264Context *h, int bit_length){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7100 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7101 int pps_id= get_ue_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7102 PPS *pps= &h->pps_buffer[pps_id];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7103
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7104 pps->sps_id= get_ue_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7105 pps->cabac= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7106 pps->pic_order_present= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7107 pps->slice_group_count= get_ue_golomb(&s->gb) + 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7108 if(pps->slice_group_count > 1 ){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7109 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
7110 av_log(h->s.avctx, AV_LOG_ERROR, "FMO not supported\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7111 switch(pps->mb_slice_group_map_type){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7112 case 0:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7113 #if 0
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7114 | for( i = 0; i <= num_slice_groups_minus1; i++ ) | | |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7115 | run_length[ i ] |1 |ue(v) |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7116 #endif
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7117 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7118 case 2:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7119 #if 0
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7120 | for( i = 0; i < num_slice_groups_minus1; i++ ) | | |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7121 |{ | | |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7122 | top_left_mb[ i ] |1 |ue(v) |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7123 | bottom_right_mb[ i ] |1 |ue(v) |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7124 | } | | |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7125 #endif
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7126 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7127 case 3:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7128 case 4:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7129 case 5:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7130 #if 0
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7131 | slice_group_change_direction_flag |1 |u(1) |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7132 | slice_group_change_rate_minus1 |1 |ue(v) |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7133 #endif
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7134 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7135 case 6:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7136 #if 0
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7137 | slice_group_id_cnt_minus1 |1 |ue(v) |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7138 | for( i = 0; i <= slice_group_id_cnt_minus1; i++ | | |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7139 |) | | |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7140 | slice_group_id[ i ] |1 |u(v) |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7141 #endif
1214
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1187
diff changeset
7142 break;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7143 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7144 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7145 pps->ref_count[0]= get_ue_golomb(&s->gb) + 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7146 pps->ref_count[1]= get_ue_golomb(&s->gb) + 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7147 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
7148 av_log(h->s.avctx, AV_LOG_ERROR, "reference overflow (pps)\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7149 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7150 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7151
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7152 pps->weighted_pred= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7153 pps->weighted_bipred_idc= get_bits(&s->gb, 2);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7154 pps->init_qp= get_se_golomb(&s->gb) + 26;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7155 pps->init_qs= get_se_golomb(&s->gb) + 26;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7156 pps->chroma_qp_index_offset= get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7157 pps->deblocking_filter_parameters_present= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7158 pps->constrained_intra_pred= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7159 pps->redundant_pic_cnt_present = get_bits1(&s->gb);
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
7160
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
7161 if(get_bits_count(&s->gb) < bit_length){
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
7162 pps->transform_8x8_mode= get_bits1(&s->gb);
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
7163 if(get_bits1(&s->gb)){ //pic_scaling_matrix_present_flag
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
7164 av_log(h->s.avctx, AV_LOG_ERROR, "custom scaling matrix not implemented\n");
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
7165 return -1;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
7166 }
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
7167 get_se_golomb(&s->gb); //second_chroma_qp_index_offset
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
7168 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7169
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7170 if(s->avctx->debug&FF_DEBUG_PICT_INFO){
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
7171 av_log(h->s.avctx, AV_LOG_DEBUG, "pps:%d sps:%d %s slice_groups:%d ref:%d/%d %s qp:%d/%d/%d %s %s %s %s\n",
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7172 pps_id, pps->sps_id,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7173 pps->cabac ? "CABAC" : "CAVLC",
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7174 pps->slice_group_count,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7175 pps->ref_count[0], pps->ref_count[1],
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7176 pps->weighted_pred ? "weighted" : "",
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7177 pps->init_qp, pps->init_qs, pps->chroma_qp_index_offset,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7178 pps->deblocking_filter_parameters_present ? "LPAR" : "",
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7179 pps->constrained_intra_pred ? "CONSTR" : "",
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
7180 pps->redundant_pic_cnt_present ? "REDU" : "",
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
7181 pps->transform_8x8_mode ? "8x8DCT" : ""
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7182 );
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7183 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7184
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7185 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7186 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7187
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7188 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7189 * finds the end of the current frame in the bitstream.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7190 * @return the position of the first byte of the next frame, or -1
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7191 */
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
7192 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
7193 int i;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7194 uint32_t state;
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
7195 ParseContext *pc = &(h->s.parse_context);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7196 //printf("first %02X%02X%02X%02X\n", buf[0], buf[1],buf[2],buf[3]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7197 // mb_addr= pc->mb_addr - 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7198 state= pc->state;
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
7199 for(i=0; i<=buf_size; i++){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7200 if((state&0xFFFFFF1F) == 0x101 || (state&0xFFFFFF1F) == 0x102 || (state&0xFFFFFF1F) == 0x105){
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
7201 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
7202 if(pc->frame_start_found){
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
7203 // If there isn't one more byte in the buffer
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
7204 // the test on first_mb_in_slice cannot be done yet
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
7205 // do it at next call.
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
7206 if (i >= buf_size) break;
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
7207 if (buf[i] & 0x80) {
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
7208 // first_mb_in_slice is 0, probably the first nal of a new
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
7209 // slice
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
7210 tprintf("find_frame_end frame_end_found, state = %08x, pos = %d\n", state, i);
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
7211 pc->state=-1;
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
7212 pc->frame_start_found= 0;
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
7213 return i-4;
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
7214 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7215 }
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
7216 pc->frame_start_found = 1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7217 }
2774
3eddfe241bb9 support extracting sps/pps from bitstream and putting it in extradata
michael
parents: 2773
diff changeset
7218 if((state&0xFFFFFF1F) == 0x107 || (state&0xFFFFFF1F) == 0x108 || (state&0xFFFFFF1F) == 0x109){
3eddfe241bb9 support extracting sps/pps from bitstream and putting it in extradata
michael
parents: 2773
diff changeset
7219 if(pc->frame_start_found){
3eddfe241bb9 support extracting sps/pps from bitstream and putting it in extradata
michael
parents: 2773
diff changeset
7220 pc->state=-1;
3eddfe241bb9 support extracting sps/pps from bitstream and putting it in extradata
michael
parents: 2773
diff changeset
7221 pc->frame_start_found= 0;
3eddfe241bb9 support extracting sps/pps from bitstream and putting it in extradata
michael
parents: 2773
diff changeset
7222 return i-4;
3eddfe241bb9 support extracting sps/pps from bitstream and putting it in extradata
michael
parents: 2773
diff changeset
7223 }
3eddfe241bb9 support extracting sps/pps from bitstream and putting it in extradata
michael
parents: 2773
diff changeset
7224 }
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
7225 if (i<buf_size)
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
7226 state= (state<<8) | buf[i];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7227 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7228
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7229 pc->state= state;
1219
michaelni
parents: 1214
diff changeset
7230 return END_NOT_FOUND;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7231 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7232
1988
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
7233 static int h264_parse(AVCodecParserContext *s,
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
7234 AVCodecContext *avctx,
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
7235 uint8_t **poutbuf, int *poutbuf_size,
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
7236 const uint8_t *buf, int buf_size)
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
7237 {
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
7238 H264Context *h = s->priv_data;
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
7239 ParseContext *pc = &h->s.parse_context;
1988
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
7240 int next;
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
7241
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
7242 next= find_frame_end(h, buf, buf_size);
1988
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
7243
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
7244 if (ff_combine_frame(pc, next, (uint8_t **)&buf, &buf_size) < 0) {
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
7245 *poutbuf = NULL;
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
7246 *poutbuf_size = 0;
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
7247 return buf_size;
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
7248 }
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
7249
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
7250 *poutbuf = (uint8_t *)buf;
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
7251 *poutbuf_size = buf_size;
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
7252 return next;
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
7253 }
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
7254
2774
3eddfe241bb9 support extracting sps/pps from bitstream and putting it in extradata
michael
parents: 2773
diff changeset
7255 static int h264_split(AVCodecContext *avctx,
3eddfe241bb9 support extracting sps/pps from bitstream and putting it in extradata
michael
parents: 2773
diff changeset
7256 const uint8_t *buf, int buf_size)
3eddfe241bb9 support extracting sps/pps from bitstream and putting it in extradata
michael
parents: 2773
diff changeset
7257 {
3eddfe241bb9 support extracting sps/pps from bitstream and putting it in extradata
michael
parents: 2773
diff changeset
7258 int i;
3eddfe241bb9 support extracting sps/pps from bitstream and putting it in extradata
michael
parents: 2773
diff changeset
7259 uint32_t state = -1;
3eddfe241bb9 support extracting sps/pps from bitstream and putting it in extradata
michael
parents: 2773
diff changeset
7260 int has_sps= 0;
3eddfe241bb9 support extracting sps/pps from bitstream and putting it in extradata
michael
parents: 2773
diff changeset
7261
3eddfe241bb9 support extracting sps/pps from bitstream and putting it in extradata
michael
parents: 2773
diff changeset
7262 for(i=0; i<=buf_size; i++){
3eddfe241bb9 support extracting sps/pps from bitstream and putting it in extradata
michael
parents: 2773
diff changeset
7263 if((state&0xFFFFFF1F) == 0x107)
3eddfe241bb9 support extracting sps/pps from bitstream and putting it in extradata
michael
parents: 2773
diff changeset
7264 has_sps=1;
3eddfe241bb9 support extracting sps/pps from bitstream and putting it in extradata
michael
parents: 2773
diff changeset
7265 /* if((state&0xFFFFFF1F) == 0x101 || (state&0xFFFFFF1F) == 0x102 || (state&0xFFFFFF1F) == 0x105){
3eddfe241bb9 support extracting sps/pps from bitstream and putting it in extradata
michael
parents: 2773
diff changeset
7266 }*/
3eddfe241bb9 support extracting sps/pps from bitstream and putting it in extradata
michael
parents: 2773
diff changeset
7267 if((state&0xFFFFFF00) == 0x100 && (state&0xFFFFFF1F) != 0x107 && (state&0xFFFFFF1F) != 0x108 && (state&0xFFFFFF1F) != 0x109){
3eddfe241bb9 support extracting sps/pps from bitstream and putting it in extradata
michael
parents: 2773
diff changeset
7268 if(has_sps){
3eddfe241bb9 support extracting sps/pps from bitstream and putting it in extradata
michael
parents: 2773
diff changeset
7269 while(i>4 && buf[i-5]==0) i--;
3eddfe241bb9 support extracting sps/pps from bitstream and putting it in extradata
michael
parents: 2773
diff changeset
7270 return i-4;
3eddfe241bb9 support extracting sps/pps from bitstream and putting it in extradata
michael
parents: 2773
diff changeset
7271 }
3eddfe241bb9 support extracting sps/pps from bitstream and putting it in extradata
michael
parents: 2773
diff changeset
7272 }
3eddfe241bb9 support extracting sps/pps from bitstream and putting it in extradata
michael
parents: 2773
diff changeset
7273 if (i<buf_size)
3eddfe241bb9 support extracting sps/pps from bitstream and putting it in extradata
michael
parents: 2773
diff changeset
7274 state= (state<<8) | buf[i];
3eddfe241bb9 support extracting sps/pps from bitstream and putting it in extradata
michael
parents: 2773
diff changeset
7275 }
3eddfe241bb9 support extracting sps/pps from bitstream and putting it in extradata
michael
parents: 2773
diff changeset
7276 return 0;
3eddfe241bb9 support extracting sps/pps from bitstream and putting it in extradata
michael
parents: 2773
diff changeset
7277 }
3eddfe241bb9 support extracting sps/pps from bitstream and putting it in extradata
michael
parents: 2773
diff changeset
7278
3eddfe241bb9 support extracting sps/pps from bitstream and putting it in extradata
michael
parents: 2773
diff changeset
7279
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7280 static int decode_nal_units(H264Context *h, uint8_t *buf, int buf_size){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7281 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7282 AVCodecContext * const avctx= s->avctx;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7283 int buf_index=0;
1322
f78341ab5fba some warning fixes
al3x
parents: 1319
diff changeset
7284 #if 0
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7285 int i;
2867
7c7edddaa835 dont be so picky with .mp4 ... fixes Mr&MrsSmith.mp4
michael
parents: 2861
diff changeset
7286 for(i=0; i<50; i++){
7c7edddaa835 dont be so picky with .mp4 ... fixes Mr&MrsSmith.mp4
michael
parents: 2861
diff changeset
7287 av_log(NULL, AV_LOG_ERROR,"%02X ", buf[i]);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7288 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7289 #endif
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
7290 h->slice_num = 0;
2766
0609f405e000 make decoder a little bit more tolerant to missing NAL units
michael
parents: 2763
diff changeset
7291 s->current_picture_ptr= NULL;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7292 for(;;){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7293 int consumed;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7294 int dst_length;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7295 int bit_length;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7296 uint8_t *ptr;
2227
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7297 int i, nalsize = 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7298
2227
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7299 if(h->is_avc) {
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7300 if(buf_index >= buf_size) break;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7301 nalsize = 0;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7302 for(i = 0; i < h->nal_length_size; i++)
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7303 nalsize = (nalsize << 8) | buf[buf_index++];
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7304 } else {
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7305 // start code prefix search
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7306 for(; buf_index + 3 < buf_size; buf_index++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7307 // this should allways succeed in the first iteration
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7308 if(buf[buf_index] == 0 && buf[buf_index+1] == 0 && buf[buf_index+2] == 1)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7309 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7310 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7311
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7312 if(buf_index+3 >= buf_size) break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7313
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7314 buf_index+=3;
2227
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7315 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7316
2401
46898a9fd6dc Fix avc1 if there is nore than one nal per mov frame
rtognimp
parents: 2396
diff changeset
7317 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
7318 if(ptr[dst_length - 1] == 0) dst_length--;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7319 bit_length= 8*dst_length - decode_rbsp_trailing(ptr + dst_length - 1);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7320
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7321 if(s->avctx->debug&FF_DEBUG_STARTCODE){
2402
f9d4e1eddbc5 - correct several errors on the deblocking accross slice boundaries.
michael
parents: 2401
diff changeset
7322 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
7323 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7324
2227
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7325 if (h->is_avc && (nalsize != consumed))
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7326 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
7327
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7328 buf_index += consumed;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7329
2815
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
7330 if( (s->hurry_up == 1 && h->nal_ref_idc == 0) //FIXME dont discard SEI id
2792
0a8c847ad5e7 skip_idct
michael
parents: 2781
diff changeset
7331 ||(avctx->skip_frame >= AVDISCARD_NONREF && h->nal_ref_idc == 0))
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7332 continue;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7333
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7334 switch(h->nal_unit_type){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7335 case NAL_IDR_SLICE:
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
7336 idr(h); //FIXME ensure we don't loose some frames if there is reordering
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7337 case NAL_SLICE:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7338 init_get_bits(&s->gb, ptr, bit_length);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7339 h->intra_gb_ptr=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7340 h->inter_gb_ptr= &s->gb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7341 s->data_partitioning = 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7342
2771
7da100c7403c keep decoding nal units after an error
michael
parents: 2766
diff changeset
7343 if(decode_slice_header(h) < 0){
7da100c7403c keep decoding nal units after an error
michael
parents: 2766
diff changeset
7344 av_log(h->s.avctx, AV_LOG_ERROR, "decode_slice_header error\n");
7da100c7403c keep decoding nal units after an error
michael
parents: 2766
diff changeset
7345 break;
7da100c7403c keep decoding nal units after an error
michael
parents: 2766
diff changeset
7346 }
2793
ae85da6c5c2f more fine grained skip_frame
michael
parents: 2792
diff changeset
7347 if(h->redundant_pic_count==0 && s->hurry_up < 5
ae85da6c5c2f more fine grained skip_frame
michael
parents: 2792
diff changeset
7348 && (avctx->skip_frame < AVDISCARD_NONREF || h->nal_ref_idc)
ae85da6c5c2f more fine grained skip_frame
michael
parents: 2792
diff changeset
7349 && (avctx->skip_frame < AVDISCARD_BIDIR || h->slice_type!=B_TYPE)
ae85da6c5c2f more fine grained skip_frame
michael
parents: 2792
diff changeset
7350 && (avctx->skip_frame < AVDISCARD_NONKEY || h->slice_type==I_TYPE)
ae85da6c5c2f more fine grained skip_frame
michael
parents: 2792
diff changeset
7351 && avctx->skip_frame < AVDISCARD_ALL)
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7352 decode_slice(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7353 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7354 case NAL_DPA:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7355 init_get_bits(&s->gb, ptr, bit_length);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7356 h->intra_gb_ptr=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7357 h->inter_gb_ptr= NULL;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7358 s->data_partitioning = 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7359
2771
7da100c7403c keep decoding nal units after an error
michael
parents: 2766
diff changeset
7360 if(decode_slice_header(h) < 0){
7da100c7403c keep decoding nal units after an error
michael
parents: 2766
diff changeset
7361 av_log(h->s.avctx, AV_LOG_ERROR, "decode_slice_header error\n");
7da100c7403c keep decoding nal units after an error
michael
parents: 2766
diff changeset
7362 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7363 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7364 case NAL_DPB:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7365 init_get_bits(&h->intra_gb, ptr, bit_length);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7366 h->intra_gb_ptr= &h->intra_gb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7367 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7368 case NAL_DPC:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7369 init_get_bits(&h->inter_gb, ptr, bit_length);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7370 h->inter_gb_ptr= &h->inter_gb;
1174
2de2a847af67 some checks to avoid segfault
michaelni
parents: 1170
diff changeset
7371
2792
0a8c847ad5e7 skip_idct
michael
parents: 2781
diff changeset
7372 if(h->redundant_pic_count==0 && h->intra_gb_ptr && s->data_partitioning
2793
ae85da6c5c2f more fine grained skip_frame
michael
parents: 2792
diff changeset
7373 && s->hurry_up < 5
ae85da6c5c2f more fine grained skip_frame
michael
parents: 2792
diff changeset
7374 && (avctx->skip_frame < AVDISCARD_NONREF || h->nal_ref_idc)
ae85da6c5c2f more fine grained skip_frame
michael
parents: 2792
diff changeset
7375 && (avctx->skip_frame < AVDISCARD_BIDIR || h->slice_type!=B_TYPE)
ae85da6c5c2f more fine grained skip_frame
michael
parents: 2792
diff changeset
7376 && (avctx->skip_frame < AVDISCARD_NONKEY || h->slice_type==I_TYPE)
ae85da6c5c2f more fine grained skip_frame
michael
parents: 2792
diff changeset
7377 && avctx->skip_frame < AVDISCARD_ALL)
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7378 decode_slice(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7379 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7380 case NAL_SEI:
2815
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
7381 init_get_bits(&s->gb, ptr, bit_length);
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
7382 decode_sei(h);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7383 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7384 case NAL_SPS:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7385 init_get_bits(&s->gb, ptr, bit_length);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7386 decode_seq_parameter_set(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7387
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7388 if(s->flags& CODEC_FLAG_LOW_DELAY)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7389 s->low_delay=1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7390
2538
34b0996cc10d 10l (fix reordering when B-frames are not present)
lorenm
parents: 2537
diff changeset
7391 if(avctx->has_b_frames < 2)
34b0996cc10d 10l (fix reordering when B-frames are not present)
lorenm
parents: 2537
diff changeset
7392 avctx->has_b_frames= !s->low_delay;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7393 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7394 case NAL_PPS:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7395 init_get_bits(&s->gb, ptr, bit_length);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7396
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
7397 decode_picture_parameter_set(h, bit_length);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7398
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7399 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7400 case NAL_PICTURE_DELIMITER:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7401 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7402 case NAL_FILTER_DATA:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7403 break;
2099
acc845e25a68 some debug
alex
parents: 2028
diff changeset
7404 default:
acc845e25a68 some debug
alex
parents: 2028
diff changeset
7405 av_log(avctx, AV_LOG_ERROR, "Unknown NAL code: %d\n", h->nal_unit_type);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7406 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7407 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7408
1174
2de2a847af67 some checks to avoid segfault
michaelni
parents: 1170
diff changeset
7409 if(!s->current_picture_ptr) return buf_index; //no frame
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7410
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7411 s->current_picture_ptr->pict_type= s->pict_type;
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7412 s->current_picture_ptr->key_frame= s->pict_type == I_TYPE && h->nal_unit_type == NAL_IDR_SLICE;
1174
2de2a847af67 some checks to avoid segfault
michaelni
parents: 1170
diff changeset
7413
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7414 h->prev_frame_num_offset= h->frame_num_offset;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7415 h->prev_frame_num= h->frame_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7416 if(s->current_picture_ptr->reference){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7417 h->prev_poc_msb= h->poc_msb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7418 h->prev_poc_lsb= h->poc_lsb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7419 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7420 if(s->current_picture_ptr->reference)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7421 execute_ref_pic_marking(h, h->mmco, h->mmco_index);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7422
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7423 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
7424
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7425 MPV_frame_end(s);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7426
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7427 return buf_index;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7428 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7429
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7430 /**
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
7431 * returns the number of bytes consumed for building the current frame
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7432 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7433 static int get_consumed_bytes(MpegEncContext *s, int pos, int buf_size){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7434 if(s->flags&CODEC_FLAG_TRUNCATED){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7435 pos -= s->parse_context.last_index;
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
7436 if(pos<0) pos=0; // FIXME remove (unneeded?)
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7437
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7438 return pos;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7439 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7440 if(pos==0) pos=1; //avoid infinite loops (i doubt thats needed but ...)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7441 if(pos+10>buf_size) pos=buf_size; // oops ;)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7442
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7443 return pos;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7444 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7445 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7446
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7447 static int decode_frame(AVCodecContext *avctx,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7448 void *data, int *data_size,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7449 uint8_t *buf, int buf_size)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7450 {
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7451 H264Context *h = avctx->priv_data;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7452 MpegEncContext *s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7453 AVFrame *pict = data;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7454 int buf_index;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7455
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7456 s->flags= avctx->flags;
1754
bdf3927bf8c5 closed gop support & flags2 as all bits in flags are used
michael
parents: 1706
diff changeset
7457 s->flags2= avctx->flags2;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7458
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7459 /* no supplementary picture */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7460 if (buf_size == 0) {
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7461 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7462 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7463
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7464 if(s->flags&CODEC_FLAG_TRUNCATED){
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
7465 int next= find_frame_end(h, buf, buf_size);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7466
1988
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
7467 if( ff_combine_frame(&s->parse_context, next, &buf, &buf_size) < 0 )
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7468 return buf_size;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7469 //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
7470 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7471
2227
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7472 if(h->is_avc && !h->got_avcC) {
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7473 int i, cnt, nalsize;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7474 unsigned char *p = avctx->extradata;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7475 if(avctx->extradata_size < 7) {
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7476 av_log(avctx, AV_LOG_ERROR, "avcC too short\n");
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7477 return -1;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7478 }
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7479 if(*p != 1) {
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7480 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
7481 return -1;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7482 }
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7483 /* 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
7484 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
7485 h->nal_length_size = 2;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7486 // Decode sps from avcC
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7487 cnt = *(p+5) & 0x1f; // Number of sps
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7488 p += 6;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7489 for (i = 0; i < cnt; i++) {
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7490 nalsize = BE_16(p) + 2;
2867
7c7edddaa835 dont be so picky with .mp4 ... fixes Mr&MrsSmith.mp4
michael
parents: 2861
diff changeset
7491 if(decode_nal_units(h, p, nalsize) < 0) {
2227
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7492 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
7493 return -1;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7494 }
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7495 p += nalsize;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7496 }
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7497 // Decode pps from avcC
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7498 cnt = *(p++); // Number of pps
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7499 for (i = 0; i < cnt; i++) {
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7500 nalsize = BE_16(p) + 2;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7501 if(decode_nal_units(h, p, nalsize) != nalsize) {
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7502 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
7503 return -1;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7504 }
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7505 p += nalsize;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7506 }
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7507 // 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
7508 h->nal_length_size = ((*(((char*)(avctx->extradata))+4))&0x03)+1;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7509 // Do not reparse avcC
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7510 h->got_avcC = 1;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7511 }
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7512
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
7513 if(!h->is_avc && s->avctx->extradata_size && s->picture_number==0){
2762
64333ef1ca21 non-avc h264 stream problems patch by ("Ronald S. Bultje" rbultje, ronald bitfreak net)
michael
parents: 2758
diff changeset
7514 if(decode_nal_units(h, s->avctx->extradata, s->avctx->extradata_size) < 0)
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7515 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7516 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7517
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7518 buf_index=decode_nal_units(h, buf, buf_size);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7519 if(buf_index < 0)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7520 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7521
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7522 //FIXME do something with unavailable reference frames
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7523
2628
511e3afc43e1 Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents: 2623
diff changeset
7524 // if(ret==FRAME_SKIPPED) return get_consumed_bytes(s, buf_index, buf_size);
1174
2de2a847af67 some checks to avoid segfault
michaelni
parents: 1170
diff changeset
7525 if(!s->current_picture_ptr){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
7526 av_log(h->s.avctx, AV_LOG_DEBUG, "error, NO frame\n");
1174
2de2a847af67 some checks to avoid segfault
michaelni
parents: 1170
diff changeset
7527 return -1;
2de2a847af67 some checks to avoid segfault
michaelni
parents: 1170
diff changeset
7528 }
2de2a847af67 some checks to avoid segfault
michaelni
parents: 1170
diff changeset
7529
2409
26778a857b5b Sort B-frames into display order.
lorenm
parents: 2404
diff changeset
7530 {
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
7531 Picture *out = s->current_picture_ptr;
2561
eb72c01df6ed 10l (compile fix)
lorenm
parents: 2560
diff changeset
7532 #if 0 //decode order
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7533 *data_size = sizeof(AVFrame);
2561
eb72c01df6ed 10l (compile fix)
lorenm
parents: 2560
diff changeset
7534 #else
2537
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
7535 /* Sort B-frames into display order */
2409
26778a857b5b Sort B-frames into display order.
lorenm
parents: 2404
diff changeset
7536 Picture *cur = s->current_picture_ptr;
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7537 Picture *prev = h->delayed_output_pic;
2537
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
7538 int out_idx = 0;
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
7539 int pics = 0;
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7540 int out_of_order;
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7541 int cross_idr = 0;
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7542 int dropped_frame = 0;
2537
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
7543 int i;
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7544
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7545 if(h->sps.bitstream_restriction_flag
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7546 && s->avctx->has_b_frames < h->sps.num_reorder_frames){
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7547 s->avctx->has_b_frames = h->sps.num_reorder_frames;
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7548 s->low_delay = 0;
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7549 }
2537
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
7550
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
7551 while(h->delayed_pic[pics]) pics++;
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
7552 h->delayed_pic[pics++] = cur;
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7553 if(cur->reference == 0)
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7554 cur->reference = 1;
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7555
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7556 for(i=0; h->delayed_pic[i]; i++)
2649
b2e6c5e9240b fix decoding of conformace streams AUD_MW_E.264 and BA1_FT_C.264 again (there where last correctly decoded with h264.c rev 1.96)
michael
parents: 2648
diff changeset
7557 if(h->delayed_pic[i]->key_frame || h->delayed_pic[i]->poc==0)
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7558 cross_idr = 1;
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7559
2537
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
7560 out = h->delayed_pic[0];
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7561 for(i=1; h->delayed_pic[i] && !h->delayed_pic[i]->key_frame; i++)
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7562 if(h->delayed_pic[i]->poc < out->poc){
2537
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
7563 out = h->delayed_pic[i];
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
7564 out_idx = i;
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
7565 }
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7566
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7567 out_of_order = !cross_idr && prev && out->poc < prev->poc;
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7568 if(prev && pics <= s->avctx->has_b_frames)
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7569 out = prev;
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7570 else if((out_of_order && pics-1 == s->avctx->has_b_frames)
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7571 || (s->low_delay &&
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7572 ((!cross_idr && prev && out->poc > prev->poc + 2)
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7573 || cur->pict_type == B_TYPE)))
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7574 {
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7575 s->low_delay = 0;
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7576 s->avctx->has_b_frames++;
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7577 out = prev;
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7578 }
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7579 else if(out_of_order)
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7580 out = prev;
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7581
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7582 if(out_of_order || pics > s->avctx->has_b_frames){
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7583 dropped_frame = (out != h->delayed_pic[out_idx]);
2537
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
7584 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
7585 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
7586 }
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
7587
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7588 if(prev == out && !dropped_frame)
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7589 *data_size = 0;
2561
eb72c01df6ed 10l (compile fix)
lorenm
parents: 2560
diff changeset
7590 else
eb72c01df6ed 10l (compile fix)
lorenm
parents: 2560
diff changeset
7591 *data_size = sizeof(AVFrame);
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7592 if(prev && prev != out && prev->reference == 1)
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7593 prev->reference = 0;
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7594 h->delayed_output_pic = out;
2441
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
7595 #endif
2409
26778a857b5b Sort B-frames into display order.
lorenm
parents: 2404
diff changeset
7596
26778a857b5b Sort B-frames into display order.
lorenm
parents: 2404
diff changeset
7597 *pict= *(AVFrame*)out;
26778a857b5b Sort B-frames into display order.
lorenm
parents: 2404
diff changeset
7598 }
26778a857b5b Sort B-frames into display order.
lorenm
parents: 2404
diff changeset
7599
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7600 assert(pict->data[0]);
1706
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1698
diff changeset
7601 ff_print_debug_info(s, pict);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7602 //printf("out %d\n", (int)pict->data[0]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7603 #if 0 //?
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7604
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7605 /* Return the Picture timestamp as the frame number */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7606 /* we substract 1 because it is added on utils.c */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7607 avctx->frame_number = s->picture_number - 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7608 #endif
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7609 return get_consumed_bytes(s, buf_index, buf_size);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7610 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7611 #if 0
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7612 static inline void fill_mb_avail(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7613 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
7614 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7615
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7616 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
7617 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
7618 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
7619 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
7620 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7621 h->mb_avail[0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7622 h->mb_avail[1]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7623 h->mb_avail[2]= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7624 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7625 h->mb_avail[3]= s->mb_x && h->slice_table[mb_xy - 1] == h->slice_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7626 h->mb_avail[4]= 1; //FIXME move out
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7627 h->mb_avail[5]= 0; //FIXME move out
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7628 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7629 #endif
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7630
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7631 #if 0 //selftest
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7632 #define COUNT 8000
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7633 #define SIZE (COUNT*40)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7634 int main(){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7635 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7636 uint8_t temp[SIZE];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7637 PutBitContext pb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7638 GetBitContext gb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7639 // int int_temp[10000];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7640 DSPContext dsp;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7641 AVCodecContext avctx;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7642
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7643 dsputil_init(&dsp, &avctx);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7644
1522
79dddc5cd990 removed the obsolete and unused parameters of init_put_bits
alex
parents: 1453
diff changeset
7645 init_put_bits(&pb, temp, SIZE);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7646 printf("testing unsigned exp golomb\n");
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7647 for(i=0; i<COUNT; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7648 START_TIMER
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7649 set_ue_golomb(&pb, i);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7650 STOP_TIMER("set_ue_golomb");
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7651 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7652 flush_put_bits(&pb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7653
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7654 init_get_bits(&gb, temp, 8*SIZE);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7655 for(i=0; i<COUNT; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7656 int j, s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7657
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7658 s= show_bits(&gb, 24);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7659
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7660 START_TIMER
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7661 j= get_ue_golomb(&gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7662 if(j != i){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7663 printf("missmatch! at %d (%d should be %d) bits:%6X\n", i, j, i, s);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7664 // return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7665 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7666 STOP_TIMER("get_ue_golomb");
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7667 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7668
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7669
1524
alex
parents: 1522
diff changeset
7670 init_put_bits(&pb, temp, SIZE);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7671 printf("testing signed exp golomb\n");
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7672 for(i=0; i<COUNT; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7673 START_TIMER
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7674 set_se_golomb(&pb, i - COUNT/2);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7675 STOP_TIMER("set_se_golomb");
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7676 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7677 flush_put_bits(&pb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7678
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7679 init_get_bits(&gb, temp, 8*SIZE);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7680 for(i=0; i<COUNT; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7681 int j, s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7682
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7683 s= show_bits(&gb, 24);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7684
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7685 START_TIMER
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7686 j= get_se_golomb(&gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7687 if(j != i - COUNT/2){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7688 printf("missmatch! at %d (%d should be %d) bits:%6X\n", i, j, i, s);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7689 // return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7690 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7691 STOP_TIMER("get_se_golomb");
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7692 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7693
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7694 printf("testing 4x4 (I)DCT\n");
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7695
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7696 DCTELEM block[16];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7697 uint8_t src[16], ref[16];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7698 uint64_t error= 0, max_error=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7699
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7700 for(i=0; i<COUNT; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7701 int j;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7702 // printf("%d %d %d\n", r1, r2, (r2-r1)*16);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7703 for(j=0; j<16; j++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7704 ref[j]= random()%255;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7705 src[j]= random()%255;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7706 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7707
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7708 h264_diff_dct_c(block, src, ref, 4);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7709
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7710 //normalize
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7711 for(j=0; j<16; j++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7712 // printf("%d ", block[j]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7713 block[j]= block[j]*4;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7714 if(j&1) block[j]= (block[j]*4 + 2)/5;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7715 if(j&4) block[j]= (block[j]*4 + 2)/5;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7716 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7717 // printf("\n");
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7718
2272
cd43603c46f9 move h264 idct to its own file and call via function pointer in DspContext
michael
parents: 2255
diff changeset
7719 s->dsp.h264_idct_add(ref, block, 4);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7720 /* for(j=0; j<16; j++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7721 printf("%d ", ref[j]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7722 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7723 printf("\n");*/
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7724
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7725 for(j=0; j<16; j++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7726 int diff= ABS(src[j] - ref[j]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7727
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7728 error+= diff*diff;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7729 max_error= FFMAX(max_error, diff);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7730 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7731 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7732 printf("error=%f max_error=%d\n", ((float)error)/COUNT/16, (int)max_error );
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7733 #if 0
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7734 printf("testing quantizer\n");
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7735 for(qp=0; qp<52; qp++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7736 for(i=0; i<16; i++)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7737 src1_block[i]= src2_block[i]= random()%255;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7738
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7739 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7740 #endif
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7741 printf("Testing NAL layer\n");
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7742
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7743 uint8_t bitstream[COUNT];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7744 uint8_t nal[COUNT*2];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7745 H264Context h;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7746 memset(&h, 0, sizeof(H264Context));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7747
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7748 for(i=0; i<COUNT; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7749 int zeros= i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7750 int nal_length;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7751 int consumed;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7752 int out_length;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7753 uint8_t *out;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7754 int j;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7755
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7756 for(j=0; j<COUNT; j++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7757 bitstream[j]= (random() % 255) + 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7758 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7759
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7760 for(j=0; j<zeros; j++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7761 int pos= random() % COUNT;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7762 while(bitstream[pos] == 0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7763 pos++;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7764 pos %= COUNT;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7765 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7766 bitstream[pos]=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7767 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7768
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7769 START_TIMER
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7770
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7771 nal_length= encode_nal(&h, nal, bitstream, COUNT, COUNT*2);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7772 if(nal_length<0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7773 printf("encoding failed\n");
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7774 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7775 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7776
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7777 out= decode_nal(&h, nal, &out_length, &consumed, nal_length);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7778
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7779 STOP_TIMER("NAL")
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7780
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7781 if(out_length != COUNT){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7782 printf("incorrect length %d %d\n", out_length, COUNT);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7783 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7784 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7785
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7786 if(consumed != nal_length){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7787 printf("incorrect consumed length %d %d\n", nal_length, consumed);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7788 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7789 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7790
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7791 if(memcmp(bitstream, out, COUNT)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7792 printf("missmatch\n");
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7793 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7794 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7795 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7796
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7797 printf("Testing RBSP\n");
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7798
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7799
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7800 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7801 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7802 #endif
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7803
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7804
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7805 static int decode_end(AVCodecContext *avctx)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7806 {
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7807 H264Context *h = avctx->priv_data;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7808 MpegEncContext *s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7809
2891
4c6eb826e9cb Just noticed there is a memory leak in h264.c with the usage of rbsp_buffer.
michael
parents: 2883
diff changeset
7810 av_freep(&h->rbsp_buffer);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7811 free_tables(h); //FIXME cleanup init stuff perhaps
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7812 MPV_common_end(s);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7813
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7814 // memset(h, 0, sizeof(H264Context));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7815
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7816 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7817 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7818
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7819
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7820 AVCodec h264_decoder = {
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7821 "h264",
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7822 CODEC_TYPE_VIDEO,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7823 CODEC_ID_H264,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7824 sizeof(H264Context),
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7825 decode_init,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7826 NULL,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7827 decode_end,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7828 decode_frame,
2453
f67b63ed036d avoid buf_size == 0 checks in every decoder
michael
parents: 2449
diff changeset
7829 /*CODEC_CAP_DRAW_HORIZ_BAND |*/ CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED | CODEC_CAP_DELAY,
2640
d5de8b677bad clear the DPB after seeking.
lorenm
parents: 2637
diff changeset
7830 .flush= flush_dpb,
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7831 };
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7832
1988
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
7833 AVCodecParser h264_parser = {
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
7834 { CODEC_ID_H264 },
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
7835 sizeof(H264Context),
1988
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
7836 NULL,
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
7837 h264_parse,
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
7838 ff_parse_close,
2774
3eddfe241bb9 support extracting sps/pps from bitstream and putting it in extradata
michael
parents: 2773
diff changeset
7839 h264_split,
1988
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
7840 };
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
7841
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
7842 #include "svq3.c"