Mercurial > libavcodec.hg
annotate h263.c @ 10797:ab1844655871 libavcodec
Move restore_ac_coeffs() call into decode_ac_pred().
This makes decode_ac_pred() easier to understand.
author | michael |
---|---|
date | Thu, 07 Jan 2010 15:31:54 +0000 |
parents | 3cebe9b3562d |
children | 72de50743adf |
rev | line source |
---|---|
0 | 1 /* |
2 * H263/MPEG4 backend for ffmpeg encoder and decoder | |
8629
04423b2f6e0b
cosmetics: Remove pointless period after copyright statement non-sentences.
diego
parents:
8627
diff
changeset
|
3 * Copyright (c) 2000,2001 Fabrice Bellard |
78 | 4 * H263+ support. |
8629
04423b2f6e0b
cosmetics: Remove pointless period after copyright statement non-sentences.
diego
parents:
8627
diff
changeset
|
5 * Copyright (c) 2001 Juan J. Sierralta P |
1739
07a484280a82
copyright year update of the files i touched and remembered, things look annoyingly unmaintained otherwise
michael
parents:
1708
diff
changeset
|
6 * Copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at> |
0 | 7 * |
5214 | 8 * ac prediction encoding, B-frame support, error resilience, optimizations, |
9 * qpel decoding, gmc decoding, interlaced decoding | |
10 * by Michael Niedermayer <michaelni@gmx.at> | |
11 * | |
3947
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3791
diff
changeset
|
12 * This file is part of FFmpeg. |
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3791
diff
changeset
|
13 * |
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3791
diff
changeset
|
14 * FFmpeg is free software; you can redistribute it and/or |
429 | 15 * modify it under the terms of the GNU Lesser General Public |
16 * License as published by the Free Software Foundation; either | |
3947
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3791
diff
changeset
|
17 * version 2.1 of the License, or (at your option) any later version. |
0 | 18 * |
3947
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3791
diff
changeset
|
19 * FFmpeg is distributed in the hope that it will be useful, |
0 | 20 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
429 | 21 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
22 * Lesser General Public License for more details. | |
0 | 23 * |
429 | 24 * You should have received a copy of the GNU Lesser General Public |
3947
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3791
diff
changeset
|
25 * License along with FFmpeg; if not, write to the Free Software |
3036
0b546eab515d
Update licensing information: The FSF changed postal address.
diego
parents:
3024
diff
changeset
|
26 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
0 | 27 */ |
1034 | 28 |
29 /** | |
8718
e9d9d946f213
Use full internal pathname in doxygen @file directives.
diego
parents:
8691
diff
changeset
|
30 * @file libavcodec/h263.c |
1106 | 31 * h263/mpeg4 codec. |
1034 | 32 */ |
2967 | 33 |
355 | 34 //#define DEBUG |
1490
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
35 #include <limits.h> |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
36 |
0 | 37 #include "dsputil.h" |
38 #include "avcodec.h" | |
39 #include "mpegvideo.h" | |
40 #include "h263data.h" | |
41 #include "mpeg4data.h" | |
8627
d6bab465b82c
moves mid_pred() into mathops.h (with arch specific code split by directory)
aurel
parents:
8612
diff
changeset
|
42 #include "mathops.h" |
9103
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
43 #include "unary.h" |
10787 | 44 #include "flv.h" |
0 | 45 |
690
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
46 //#undef NDEBUG |
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
47 //#include <assert.h> |
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
48 |
10783 | 49 // The defines below define the number of bits that are read at once for |
50 // reading vlc values. Changing these may improve speed and data cache needs | |
51 // be aware though that decreasing them may need the number of stages that is | |
52 // passed to get_vlc* to be increased. | |
544 | 53 #define INTRA_MCBPC_VLC_BITS 6 |
1482 | 54 #define INTER_MCBPC_VLC_BITS 7 |
544 | 55 #define CBPY_VLC_BITS 6 |
56 #define MV_VLC_BITS 9 | |
57 #define DC_VLC_BITS 9 | |
58 #define SPRITE_TRAJ_VLC_BITS 6 | |
59 #define MB_TYPE_B_VLC_BITS 4 | |
60 #define TEX_VLC_BITS 9 | |
1655 | 61 #define H263_MBTYPE_B_VLC_BITS 6 |
62 #define CBPC_B_VLC_BITS 3 | |
544 | 63 |
8590 | 64 #if CONFIG_ENCODERS |
10784 | 65 //The uni_DCtab_* tables below contain unified bits+length tables to encode DC |
66 //differences in mpeg4. Unified in the sense that the specification specifies | |
67 //this encoding in several steps. | |
1064 | 68 static uint8_t uni_DCtab_lum_len[512]; |
69 static uint8_t uni_DCtab_chrom_len[512]; | |
70 static uint16_t uni_DCtab_lum_bits[512]; | |
71 static uint16_t uni_DCtab_chrom_bits[512]; | |
815
78accc54493b
put a few large tables under #ifdef CONFIG_ENCODERS or dynamically allocate them
michaelni
parents:
770
diff
changeset
|
72 |
10784 | 73 /** |
74 * Table of number of bits a motion vector component needs. | |
75 */ | |
4655 | 76 static uint8_t mv_penalty[MAX_FCODE+1][MAX_MV*2+1]; |
10784 | 77 |
78 /** | |
79 * Minimal fcode that a motion vector component would need. | |
80 */ | |
1064 | 81 static uint8_t fcode_tab[MAX_MV*2+1]; |
10784 | 82 |
83 /** | |
84 * Minimal fcode that a motion vector component would need in umv. | |
85 * All entries in this table are 1. | |
86 */ | |
1064 | 87 static uint8_t umv_fcode_tab[MAX_MV*2+1]; |
815
78accc54493b
put a few large tables under #ifdef CONFIG_ENCODERS or dynamically allocate them
michaelni
parents:
770
diff
changeset
|
88 |
10784 | 89 //unified encoding tables for run length encoding of coefficients |
90 //unified in the sense that the specification specifies the encoding in several steps. | |
945 | 91 static uint32_t uni_mpeg4_intra_rl_bits[64*64*2*2]; |
92 static uint8_t uni_mpeg4_intra_rl_len [64*64*2*2]; | |
93 static uint32_t uni_mpeg4_inter_rl_bits[64*64*2*2]; | |
94 static uint8_t uni_mpeg4_inter_rl_len [64*64*2*2]; | |
2253 | 95 static uint8_t uni_h263_intra_aic_rl_len [64*64*2*2]; |
96 static uint8_t uni_h263_inter_rl_len [64*64*2*2]; | |
945 | 97 //#define UNI_MPEG4_ENC_INDEX(last,run,level) ((last)*128 + (run)*256 + (level)) |
648
dddcff6841f2
optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents:
619
diff
changeset
|
98 //#define UNI_MPEG4_ENC_INDEX(last,run,level) ((last)*128*64 + (run) + (level)*64) |
945 | 99 #define UNI_MPEG4_ENC_INDEX(last,run,level) ((last)*128*64 + (run)*128 + (level)) |
648
dddcff6841f2
optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents:
619
diff
changeset
|
100 |
dddcff6841f2
optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents:
619
diff
changeset
|
101 /* mpeg4 |
dddcff6841f2
optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents:
619
diff
changeset
|
102 inter |
dddcff6841f2
optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents:
619
diff
changeset
|
103 max level: 24/6 |
dddcff6841f2
optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents:
619
diff
changeset
|
104 max run: 53/63 |
dddcff6841f2
optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents:
619
diff
changeset
|
105 |
dddcff6841f2
optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents:
619
diff
changeset
|
106 intra |
dddcff6841f2
optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents:
619
diff
changeset
|
107 max level: 53/16 |
dddcff6841f2
optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents:
619
diff
changeset
|
108 max run: 29/41 |
dddcff6841f2
optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents:
619
diff
changeset
|
109 */ |
815
78accc54493b
put a few large tables under #ifdef CONFIG_ENCODERS or dynamically allocate them
michaelni
parents:
770
diff
changeset
|
110 #endif |
78accc54493b
put a few large tables under #ifdef CONFIG_ENCODERS or dynamically allocate them
michaelni
parents:
770
diff
changeset
|
111 |
4672 | 112 static uint8_t static_rl_table_store[5][2][2*MAX_RUN + MAX_LEVEL + 3]; |
113 | |
2646
c735e3e60ca7
Even More spelling errors. patch by (Kevin Baragona <kevinmb500 gawab com)
michael
parents:
2639
diff
changeset
|
114 #if 0 //3IV1 is quite rare and it slows things down a tiny bit |
8612 | 115 #define IS_3IV1 s->codec_tag == AV_RL32("3IV1") |
2967 | 116 #else |
1271
42ea05e4a391
improving 3IV1 support (still far from perfect) note, disabled as it requires some checks in the inner loops which would slow things down a tiny bit
michaelni
parents:
1261
diff
changeset
|
117 #define IS_3IV1 0 |
42ea05e4a391
improving 3IV1 support (still far from perfect) note, disabled as it requires some checks in the inner loops which would slow things down a tiny bit
michaelni
parents:
1261
diff
changeset
|
118 #endif |
293 | 119 |
0 | 120 int h263_get_picture_format(int width, int height) |
121 { | |
122 if (width == 128 && height == 96) | |
10782 | 123 return 1; |
0 | 124 else if (width == 176 && height == 144) |
10782 | 125 return 2; |
0 | 126 else if (width == 352 && height == 288) |
10782 | 127 return 3; |
0 | 128 else if (width == 704 && height == 576) |
10782 | 129 return 4; |
0 | 130 else if (width == 1408 && height == 1152) |
10782 | 131 return 5; |
0 | 132 else |
10782 | 133 return 7; |
0 | 134 } |
135 | |
10791 | 136 void ff_h263_show_pict_info(MpegEncContext *s){ |
10793
9b3ec3d1bdae
Factorize if() surrounding every ff_h263_show_pict_info() call.
michael
parents:
10791
diff
changeset
|
137 if(s->avctx->debug&FF_DEBUG_PICT_INFO){ |
5403 | 138 av_log(s->avctx, AV_LOG_DEBUG, "qp:%d %c size:%d rnd:%d%s%s%s%s%s%s%s%s%s %d/%d\n", |
139 s->qscale, av_get_pict_type_char(s->pict_type), | |
140 s->gb.size_in_bits, 1-s->no_rounding, | |
141 s->obmc ? " AP" : "", | |
142 s->umvplus ? " UMV" : "", | |
143 s->h263_long_vectors ? " LONG" : "", | |
144 s->h263_plus ? " +" : "", | |
145 s->h263_aic ? " AIC" : "", | |
146 s->alt_inter_vlc ? " AIV" : "", | |
147 s->modified_quant ? " MQ" : "", | |
148 s->loop_filter ? " LOOP" : "", | |
149 s->h263_slice_structured ? " SS" : "", | |
150 s->avctx->time_base.den, s->avctx->time_base.num | |
151 ); | |
10793
9b3ec3d1bdae
Factorize if() surrounding every ff_h263_show_pict_info() call.
michael
parents:
10791
diff
changeset
|
152 } |
5403 | 153 } |
154 | |
8590 | 155 #if CONFIG_ENCODERS |
1070
6da5ae9ee199
more #ifdef CONFIG_ENCODERS patch by (Wolfgang Hesseler <qv at multimediaware dot com>) with modifications by me (s/WOLFGANG/CONFIG_ENCODERS/ and some other fixes)
michaelni
parents:
1068
diff
changeset
|
156 |
10786 | 157 /** |
158 * Returns the 4 bit value that specifies the given aspect ratio. | |
159 * This may be one of the standard aspect ratios or it specifies | |
160 * that the aspect will be stored explicitly later. | |
161 */ | |
10785 | 162 static av_const int aspect_to_info(AVRational aspect){ |
887 | 163 int i; |
164 | |
1548 | 165 if(aspect.num==0) aspect= (AVRational){1,1}; |
166 | |
887 | 167 for(i=1; i<6; i++){ |
1548 | 168 if(av_cmp_q(pixel_aspect[i], aspect) == 0){ |
10785 | 169 return i; |
887 | 170 } |
171 } | |
2967 | 172 |
10785 | 173 return FF_ASPECT_EXTENDED; |
880 | 174 } |
175 | |
1354 | 176 void h263_encode_picture_header(MpegEncContext * s, int picture_number) |
177 { | |
1872 | 178 int format, coded_frame_rate, coded_frame_rate_base, i, temp_ref; |
179 int best_clock_code=1; | |
180 int best_divisor=60; | |
181 int best_error= INT_MAX; | |
2967 | 182 |
1872 | 183 if(s->h263_plus){ |
184 for(i=0; i<2; i++){ | |
185 int div, error; | |
2637 | 186 div= (s->avctx->time_base.num*1800000LL + 500LL*s->avctx->time_base.den) / ((1000LL+i)*s->avctx->time_base.den); |
5075
33d50e0e1823
Correct the parameter order for the call to "av_clip".
takis
parents:
4984
diff
changeset
|
187 div= av_clip(div, 1, 127); |
4001 | 188 error= FFABS(s->avctx->time_base.num*1800000LL - (1000LL+i)*s->avctx->time_base.den*div); |
1872 | 189 if(error < best_error){ |
190 best_error= error; | |
191 best_divisor= div; | |
192 best_clock_code= i; | |
193 } | |
194 } | |
195 } | |
196 s->custom_pcf= best_clock_code!=1 || best_divisor!=60; | |
197 coded_frame_rate= 1800000; | |
198 coded_frame_rate_base= (1000+best_clock_code)*best_divisor; | |
1354 | 199 |
200 align_put_bits(&s->pb); | |
1353
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
201 |
231 | 202 /* Update the pointer to last GOB */ |
9431 | 203 s->ptr_lastgob = put_bits_ptr(&s->pb); |
231 | 204 put_bits(&s->pb, 22, 0x20); /* PSC */ |
2637 | 205 temp_ref= s->picture_number * (int64_t)coded_frame_rate * s->avctx->time_base.num / //FIXME use timestamp |
206 (coded_frame_rate_base * (int64_t)s->avctx->time_base.den); | |
7260
3ec34b551aae
bitstream: move put_sbits() from flacenc.c to bitstream.h and use it
ramiro
parents:
7098
diff
changeset
|
207 put_sbits(&s->pb, 8, temp_ref); /* TemporalReference */ |
0 | 208 |
2979 | 209 put_bits(&s->pb, 1, 1); /* marker */ |
210 put_bits(&s->pb, 1, 0); /* h263 id */ | |
211 put_bits(&s->pb, 1, 0); /* split screen off */ | |
212 put_bits(&s->pb, 1, 0); /* camera off */ | |
213 put_bits(&s->pb, 1, 0); /* freeze picture release off */ | |
2967 | 214 |
78 | 215 format = h263_get_picture_format(s->width, s->height); |
0 | 216 if (!s->h263_plus) { |
217 /* H.263v1 */ | |
218 put_bits(&s->pb, 3, format); | |
6481 | 219 put_bits(&s->pb, 1, (s->pict_type == FF_P_TYPE)); |
0 | 220 /* By now UMV IS DISABLED ON H.263v1, since the restrictions |
221 of H.263v1 UMV implies to check the predicted MV after | |
222 calculation of the current MB to see if we're on the limits */ | |
2979 | 223 put_bits(&s->pb, 1, 0); /* Unrestricted Motion Vector: off */ |
224 put_bits(&s->pb, 1, 0); /* SAC: off */ | |
225 put_bits(&s->pb, 1, s->obmc); /* Advanced Prediction */ | |
226 put_bits(&s->pb, 1, 0); /* only I/P frames, no PB frame */ | |
0 | 227 put_bits(&s->pb, 5, s->qscale); |
2979 | 228 put_bits(&s->pb, 1, 0); /* Continuous Presence Multipoint mode: off */ |
0 | 229 } else { |
1872 | 230 int ufep=1; |
0 | 231 /* H.263v2 */ |
232 /* H.263 Plus PTYPE */ | |
2967 | 233 |
0 | 234 put_bits(&s->pb, 3, 7); |
1872 | 235 put_bits(&s->pb,3,ufep); /* Update Full Extended PTYPE */ |
78 | 236 if (format == 7) |
237 put_bits(&s->pb,3,6); /* Custom Source Format */ | |
238 else | |
239 put_bits(&s->pb, 3, format); | |
2967 | 240 |
1872 | 241 put_bits(&s->pb,1, s->custom_pcf); |
1661 | 242 put_bits(&s->pb,1, s->umvplus); /* Unrestricted Motion Vector */ |
0 | 243 put_bits(&s->pb,1,0); /* SAC: off */ |
1633 | 244 put_bits(&s->pb,1,s->obmc); /* Advanced Prediction Mode */ |
350
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
245 put_bits(&s->pb,1,s->h263_aic); /* Advanced Intra Coding */ |
1644 | 246 put_bits(&s->pb,1,s->loop_filter); /* Deblocking Filter */ |
1661 | 247 put_bits(&s->pb,1,s->h263_slice_structured); /* Slice Structured */ |
0 | 248 put_bits(&s->pb,1,0); /* Reference Picture Selection: off */ |
249 put_bits(&s->pb,1,0); /* Independent Segment Decoding: off */ | |
1637 | 250 put_bits(&s->pb,1,s->alt_inter_vlc); /* Alternative Inter VLC */ |
1644 | 251 put_bits(&s->pb,1,s->modified_quant); /* Modified Quantization: */ |
0 | 252 put_bits(&s->pb,1,1); /* "1" to prevent start code emulation */ |
253 put_bits(&s->pb,3,0); /* Reserved */ | |
2967 | 254 |
6481 | 255 put_bits(&s->pb, 3, s->pict_type == FF_P_TYPE); |
2967 | 256 |
0 | 257 put_bits(&s->pb,1,0); /* Reference Picture Resampling: off */ |
258 put_bits(&s->pb,1,0); /* Reduced-Resolution Update: off */ | |
350
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
259 put_bits(&s->pb,1,s->no_rounding); /* Rounding Type */ |
0 | 260 put_bits(&s->pb,2,0); /* Reserved */ |
261 put_bits(&s->pb,1,1); /* "1" to prevent start code emulation */ | |
2967 | 262 |
0 | 263 /* This should be here if PLUSPTYPE */ |
2979 | 264 put_bits(&s->pb, 1, 0); /* Continuous Presence Multipoint mode: off */ |
265 | |
266 if (format == 7) { | |
78 | 267 /* Custom Picture Format (CPFMT) */ |
10785 | 268 s->aspect_ratio_info= aspect_to_info(s->avctx->sample_aspect_ratio); |
880 | 269 |
270 put_bits(&s->pb,4,s->aspect_ratio_info); | |
78 | 271 put_bits(&s->pb,9,(s->width >> 2) - 1); |
272 put_bits(&s->pb,1,1); /* "1" to prevent start code emulation */ | |
273 put_bits(&s->pb,9,(s->height >> 2)); | |
1548 | 274 if (s->aspect_ratio_info == FF_ASPECT_EXTENDED){ |
275 put_bits(&s->pb, 8, s->avctx->sample_aspect_ratio.num); | |
276 put_bits(&s->pb, 8, s->avctx->sample_aspect_ratio.den); | |
2979 | 277 } |
78 | 278 } |
1872 | 279 if(s->custom_pcf){ |
280 if(ufep){ | |
281 put_bits(&s->pb, 1, best_clock_code); | |
282 put_bits(&s->pb, 7, best_divisor); | |
283 } | |
7260
3ec34b551aae
bitstream: move put_sbits() from flacenc.c to bitstream.h and use it
ramiro
parents:
7098
diff
changeset
|
284 put_sbits(&s->pb, 2, temp_ref>>8); |
1872 | 285 } |
2967 | 286 |
0 | 287 /* Unlimited Unrestricted Motion Vectors Indicator (UUI) */ |
79
82e579c37bc3
Moved some H.263+ variables to MpegEncContext to be thread-safe.
pulento
parents:
78
diff
changeset
|
288 if (s->umvplus) |
1089 | 289 // put_bits(&s->pb,1,1); /* Limited according tables of Annex D */ |
1644 | 290 //FIXME check actual requested range |
1089 | 291 put_bits(&s->pb,2,1); /* unlimited */ |
1661 | 292 if(s->h263_slice_structured) |
293 put_bits(&s->pb,2,0); /* no weird submodes */ | |
1089 | 294 |
0 | 295 put_bits(&s->pb, 5, s->qscale); |
296 } | |
297 | |
2979 | 298 put_bits(&s->pb, 1, 0); /* no PEI */ |
498 | 299 |
1670 | 300 if(s->h263_slice_structured){ |
301 put_bits(&s->pb, 1, 1); | |
2967 | 302 |
1670 | 303 assert(s->mb_x == 0 && s->mb_y == 0); |
304 ff_h263_encode_mba(s); | |
305 | |
306 put_bits(&s->pb, 1, 1); | |
307 } | |
308 | |
498 | 309 if(s->h263_aic){ |
2967 | 310 s->y_dc_scale_table= |
1639 | 311 s->c_dc_scale_table= ff_aic_dc_scale_table; |
498 | 312 }else{ |
313 s->y_dc_scale_table= | |
314 s->c_dc_scale_table= ff_mpeg1_dc_scale_table; | |
315 } | |
0 | 316 } |
317 | |
766 | 318 /** |
319 * Encodes a group of blocks header. | |
320 */ | |
1661 | 321 void h263_encode_gob_header(MpegEncContext * s, int mb_line) |
162 | 322 { |
1661 | 323 put_bits(&s->pb, 17, 1); /* GBSC */ |
324 | |
325 if(s->h263_slice_structured){ | |
326 put_bits(&s->pb, 1, 1); | |
327 | |
328 ff_h263_encode_mba(s); | |
329 | |
330 if(s->mb_num > 1583) | |
331 put_bits(&s->pb, 1, 1); | |
332 put_bits(&s->pb, 5, s->qscale); /* GQUANT */ | |
333 put_bits(&s->pb, 1, 1); | |
6481 | 334 put_bits(&s->pb, 2, s->pict_type == FF_I_TYPE); /* GFID */ |
1661 | 335 }else{ |
336 int gob_number= mb_line / s->gob_index; | |
337 | |
338 put_bits(&s->pb, 5, gob_number); /* GN */ | |
6481 | 339 put_bits(&s->pb, 2, s->pict_type == FF_I_TYPE); /* GFID */ |
1661 | 340 put_bits(&s->pb, 5, s->qscale); /* GQUANT */ |
341 } | |
162 | 342 } |
265
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
343 |
10795 | 344 /** |
345 * Returns the number of bits that encoding the 8x8 block in block would need. | |
346 * @param[in] block_last_index last index in scantable order that refers to a non zero element in block. | |
347 */ | |
1492 | 348 static inline int get_block_rate(MpegEncContext * s, DCTELEM block[64], int block_last_index, uint8_t scantable[64]){ |
349 int last=0; | |
350 int j; | |
351 int rate=0; | |
352 | |
353 for(j=1; j<=block_last_index; j++){ | |
354 const int index= scantable[j]; | |
355 int level= block[index]; | |
356 if(level){ | |
357 level+= 64; | |
358 if((level&(~127)) == 0){ | |
359 if(j<block_last_index) rate+= s->intra_ac_vlc_length [UNI_AC_ENC_INDEX(j-last-1, level)]; | |
360 else rate+= s->intra_ac_vlc_last_length[UNI_AC_ENC_INDEX(j-last-1, level)]; | |
361 }else | |
362 rate += s->ac_esc_length; | |
363 | |
364 last= j; | |
365 } | |
366 } | |
2967 | 367 |
1492 | 368 return rate; |
369 } | |
370 | |
10796
3cebe9b3562d
Move restore_ac_coeffs() up so its declared before its use.
michael
parents:
10795
diff
changeset
|
371 static inline void restore_ac_coeffs(MpegEncContext * s, DCTELEM block[6][64], int dir[6], uint8_t *st[6], int zigzag_last_index[6]) |
3cebe9b3562d
Move restore_ac_coeffs() up so its declared before its use.
michael
parents:
10795
diff
changeset
|
372 { |
3cebe9b3562d
Move restore_ac_coeffs() up so its declared before its use.
michael
parents:
10795
diff
changeset
|
373 int i, n; |
3cebe9b3562d
Move restore_ac_coeffs() up so its declared before its use.
michael
parents:
10795
diff
changeset
|
374 memcpy(s->block_last_index, zigzag_last_index, sizeof(int)*6); |
3cebe9b3562d
Move restore_ac_coeffs() up so its declared before its use.
michael
parents:
10795
diff
changeset
|
375 |
3cebe9b3562d
Move restore_ac_coeffs() up so its declared before its use.
michael
parents:
10795
diff
changeset
|
376 for(n=0; n<6; n++){ |
3cebe9b3562d
Move restore_ac_coeffs() up so its declared before its use.
michael
parents:
10795
diff
changeset
|
377 int16_t *ac_val = s->ac_val[0][0] + s->block_index[n] * 16; |
3cebe9b3562d
Move restore_ac_coeffs() up so its declared before its use.
michael
parents:
10795
diff
changeset
|
378 |
3cebe9b3562d
Move restore_ac_coeffs() up so its declared before its use.
michael
parents:
10795
diff
changeset
|
379 st[n]= s->intra_scantable.permutated; |
3cebe9b3562d
Move restore_ac_coeffs() up so its declared before its use.
michael
parents:
10795
diff
changeset
|
380 if(dir[n]){ |
3cebe9b3562d
Move restore_ac_coeffs() up so its declared before its use.
michael
parents:
10795
diff
changeset
|
381 /* top prediction */ |
3cebe9b3562d
Move restore_ac_coeffs() up so its declared before its use.
michael
parents:
10795
diff
changeset
|
382 for(i=1; i<8; i++){ |
3cebe9b3562d
Move restore_ac_coeffs() up so its declared before its use.
michael
parents:
10795
diff
changeset
|
383 block[n][s->dsp.idct_permutation[i ]] = ac_val[i+8]; |
3cebe9b3562d
Move restore_ac_coeffs() up so its declared before its use.
michael
parents:
10795
diff
changeset
|
384 } |
3cebe9b3562d
Move restore_ac_coeffs() up so its declared before its use.
michael
parents:
10795
diff
changeset
|
385 }else{ |
3cebe9b3562d
Move restore_ac_coeffs() up so its declared before its use.
michael
parents:
10795
diff
changeset
|
386 /* left prediction */ |
3cebe9b3562d
Move restore_ac_coeffs() up so its declared before its use.
michael
parents:
10795
diff
changeset
|
387 for(i=1; i<8; i++){ |
3cebe9b3562d
Move restore_ac_coeffs() up so its declared before its use.
michael
parents:
10795
diff
changeset
|
388 block[n][s->dsp.idct_permutation[i<<3]]= ac_val[i ]; |
3cebe9b3562d
Move restore_ac_coeffs() up so its declared before its use.
michael
parents:
10795
diff
changeset
|
389 } |
3cebe9b3562d
Move restore_ac_coeffs() up so its declared before its use.
michael
parents:
10795
diff
changeset
|
390 } |
3cebe9b3562d
Move restore_ac_coeffs() up so its declared before its use.
michael
parents:
10795
diff
changeset
|
391 } |
3cebe9b3562d
Move restore_ac_coeffs() up so its declared before its use.
michael
parents:
10795
diff
changeset
|
392 } |
3cebe9b3562d
Move restore_ac_coeffs() up so its declared before its use.
michael
parents:
10795
diff
changeset
|
393 |
10795 | 394 /** |
395 * Returns the optimal value (0 or 1) for the ac_pred element for the given MB in mpeg4. | |
396 */ | |
1492 | 397 static inline int decide_ac_pred(MpegEncContext * s, DCTELEM block[6][64], int dir[6], uint8_t *st[6], int zigzag_last_index[6]) |
265
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
398 { |
1492 | 399 int score= 0; |
265
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
400 int i, n; |
903 | 401 int8_t * const qscale_table= s->current_picture.qscale_table; |
265
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
402 |
1492 | 403 memcpy(zigzag_last_index, s->block_last_index, sizeof(int)*6); |
2967 | 404 |
265
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
405 for(n=0; n<6; n++){ |
1064 | 406 int16_t *ac_val, *ac_val1; |
2967 | 407 |
1492 | 408 score -= get_block_rate(s, block[n], s->block_last_index[n], s->intra_scantable.permutated); |
265
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
409 |
266 | 410 ac_val = s->ac_val[0][0] + s->block_index[n] * 16; |
265
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
411 ac_val1= ac_val; |
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
412 if(dir[n]){ |
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:
1176
diff
changeset
|
413 const int xy= s->mb_x + s->mb_y*s->mb_stride - s->mb_stride; |
692
852b5a416161
fixing ac prediction encoding with adaptive quantization
michaelni
parents:
690
diff
changeset
|
414 /* top prediction */ |
266 | 415 ac_val-= s->block_wrap[n]*16; |
903 | 416 if(s->mb_y==0 || s->qscale == qscale_table[xy] || n==2 || n==3){ |
692
852b5a416161
fixing ac prediction encoding with adaptive quantization
michaelni
parents:
690
diff
changeset
|
417 /* same qscale */ |
852b5a416161
fixing ac prediction encoding with adaptive quantization
michaelni
parents:
690
diff
changeset
|
418 for(i=1; i<8; i++){ |
1092 | 419 const int level= block[n][s->dsp.idct_permutation[i ]]; |
1492 | 420 block[n][s->dsp.idct_permutation[i ]] = level - ac_val[i+8]; |
1092 | 421 ac_val1[i ]= block[n][s->dsp.idct_permutation[i<<3]]; |
692
852b5a416161
fixing ac prediction encoding with adaptive quantization
michaelni
parents:
690
diff
changeset
|
422 ac_val1[i+8]= level; |
852b5a416161
fixing ac prediction encoding with adaptive quantization
michaelni
parents:
690
diff
changeset
|
423 } |
852b5a416161
fixing ac prediction encoding with adaptive quantization
michaelni
parents:
690
diff
changeset
|
424 }else{ |
852b5a416161
fixing ac prediction encoding with adaptive quantization
michaelni
parents:
690
diff
changeset
|
425 /* different qscale, we must rescale */ |
852b5a416161
fixing ac prediction encoding with adaptive quantization
michaelni
parents:
690
diff
changeset
|
426 for(i=1; i<8; i++){ |
1092 | 427 const int level= block[n][s->dsp.idct_permutation[i ]]; |
1492 | 428 block[n][s->dsp.idct_permutation[i ]] = level - ROUNDED_DIV(ac_val[i + 8]*qscale_table[xy], s->qscale); |
1092 | 429 ac_val1[i ]= block[n][s->dsp.idct_permutation[i<<3]]; |
692
852b5a416161
fixing ac prediction encoding with adaptive quantization
michaelni
parents:
690
diff
changeset
|
430 ac_val1[i+8]= level; |
852b5a416161
fixing ac prediction encoding with adaptive quantization
michaelni
parents:
690
diff
changeset
|
431 } |
265
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
432 } |
1492 | 433 st[n]= s->intra_h_scantable.permutated; |
265
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
434 }else{ |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1176
diff
changeset
|
435 const int xy= s->mb_x-1 + s->mb_y*s->mb_stride; |
692
852b5a416161
fixing ac prediction encoding with adaptive quantization
michaelni
parents:
690
diff
changeset
|
436 /* left prediction */ |
265
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
437 ac_val-= 16; |
903 | 438 if(s->mb_x==0 || s->qscale == qscale_table[xy] || n==1 || n==3){ |
692
852b5a416161
fixing ac prediction encoding with adaptive quantization
michaelni
parents:
690
diff
changeset
|
439 /* same qscale */ |
852b5a416161
fixing ac prediction encoding with adaptive quantization
michaelni
parents:
690
diff
changeset
|
440 for(i=1; i<8; i++){ |
1092 | 441 const int level= block[n][s->dsp.idct_permutation[i<<3]]; |
1492 | 442 block[n][s->dsp.idct_permutation[i<<3]]= level - ac_val[i]; |
692
852b5a416161
fixing ac prediction encoding with adaptive quantization
michaelni
parents:
690
diff
changeset
|
443 ac_val1[i ]= level; |
1092 | 444 ac_val1[i+8]= block[n][s->dsp.idct_permutation[i ]]; |
692
852b5a416161
fixing ac prediction encoding with adaptive quantization
michaelni
parents:
690
diff
changeset
|
445 } |
852b5a416161
fixing ac prediction encoding with adaptive quantization
michaelni
parents:
690
diff
changeset
|
446 }else{ |
852b5a416161
fixing ac prediction encoding with adaptive quantization
michaelni
parents:
690
diff
changeset
|
447 /* different qscale, we must rescale */ |
852b5a416161
fixing ac prediction encoding with adaptive quantization
michaelni
parents:
690
diff
changeset
|
448 for(i=1; i<8; i++){ |
1092 | 449 const int level= block[n][s->dsp.idct_permutation[i<<3]]; |
1492 | 450 block[n][s->dsp.idct_permutation[i<<3]]= level - ROUNDED_DIV(ac_val[i]*qscale_table[xy], s->qscale); |
692
852b5a416161
fixing ac prediction encoding with adaptive quantization
michaelni
parents:
690
diff
changeset
|
451 ac_val1[i ]= level; |
1092 | 452 ac_val1[i+8]= block[n][s->dsp.idct_permutation[i ]]; |
692
852b5a416161
fixing ac prediction encoding with adaptive quantization
michaelni
parents:
690
diff
changeset
|
453 } |
265
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
454 } |
1492 | 455 st[n]= s->intra_v_scantable.permutated; |
456 } | |
457 | |
458 for(i=63; i>0; i--) //FIXME optimize | |
459 if(block[n][ st[n][i] ]) break; | |
460 s->block_last_index[n]= i; | |
461 | |
462 score += get_block_rate(s, block[n], s->block_last_index[n], st[n]); | |
463 } | |
464 | |
10797
ab1844655871
Move restore_ac_coeffs() call into decode_ac_pred().
michael
parents:
10796
diff
changeset
|
465 if(score < 0){ |
ab1844655871
Move restore_ac_coeffs() call into decode_ac_pred().
michael
parents:
10796
diff
changeset
|
466 return 1; |
ab1844655871
Move restore_ac_coeffs() call into decode_ac_pred().
michael
parents:
10796
diff
changeset
|
467 }else{ |
ab1844655871
Move restore_ac_coeffs() call into decode_ac_pred().
michael
parents:
10796
diff
changeset
|
468 restore_ac_coeffs(s, block, dir, st, zigzag_last_index); |
ab1844655871
Move restore_ac_coeffs() call into decode_ac_pred().
michael
parents:
10796
diff
changeset
|
469 return 0; |
ab1844655871
Move restore_ac_coeffs() call into decode_ac_pred().
michael
parents:
10796
diff
changeset
|
470 } |
1492 | 471 } |
472 | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
473 /** |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
474 * modify qscale so that encoding is acually possible in h263 (limit difference to -2..2) |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
475 */ |
695 | 476 void ff_clean_h263_qscales(MpegEncContext *s){ |
690
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
477 int i; |
903 | 478 int8_t * const qscale_table= s->current_picture.qscale_table; |
2967 | 479 |
4316 | 480 ff_init_qscale_tab(s); |
481 | |
690
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
482 for(i=1; i<s->mb_num; i++){ |
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:
1176
diff
changeset
|
483 if(qscale_table[ s->mb_index2xy[i] ] - qscale_table[ s->mb_index2xy[i-1] ] >2) |
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:
1176
diff
changeset
|
484 qscale_table[ s->mb_index2xy[i] ]= qscale_table[ s->mb_index2xy[i-1] ]+2; |
690
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
485 } |
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
486 for(i=s->mb_num-2; i>=0; i--){ |
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:
1176
diff
changeset
|
487 if(qscale_table[ s->mb_index2xy[i] ] - qscale_table[ s->mb_index2xy[i+1] ] >2) |
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:
1176
diff
changeset
|
488 qscale_table[ s->mb_index2xy[i] ]= qscale_table[ s->mb_index2xy[i+1] ]+2; |
690
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
489 } |
1983 | 490 |
491 if(s->codec_id != CODEC_ID_H263P){ | |
492 for(i=1; i<s->mb_num; i++){ | |
493 int mb_xy= s->mb_index2xy[i]; | |
2967 | 494 |
1983 | 495 if(qscale_table[mb_xy] != qscale_table[s->mb_index2xy[i-1]] && (s->mb_type[mb_xy]&CANDIDATE_MB_TYPE_INTER4V)){ |
496 s->mb_type[mb_xy]|= CANDIDATE_MB_TYPE_INTER; | |
497 } | |
498 } | |
499 } | |
695 | 500 } |
501 | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
502 /** |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
503 * modify mb_type & qscale so that encoding is acually possible in mpeg4 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
504 */ |
695 | 505 void ff_clean_mpeg4_qscales(MpegEncContext *s){ |
506 int i; | |
903 | 507 int8_t * const qscale_table= s->current_picture.qscale_table; |
508 | |
695 | 509 ff_clean_h263_qscales(s); |
2967 | 510 |
6481 | 511 if(s->pict_type== FF_B_TYPE){ |
690
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
512 int odd=0; |
2646
c735e3e60ca7
Even More spelling errors. patch by (Kevin Baragona <kevinmb500 gawab com)
michael
parents:
2639
diff
changeset
|
513 /* ok, come on, this isn't funny anymore, there's more code for handling this mpeg4 mess than for the actual adaptive quantization */ |
2967 | 514 |
690
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
515 for(i=0; i<s->mb_num; i++){ |
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:
1176
diff
changeset
|
516 int mb_xy= s->mb_index2xy[i]; |
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:
1176
diff
changeset
|
517 odd += qscale_table[mb_xy]&1; |
690
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
518 } |
2967 | 519 |
690
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
520 if(2*odd > s->mb_num) odd=1; |
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
521 else odd=0; |
2967 | 522 |
690
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
523 for(i=0; i<s->mb_num; i++){ |
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:
1176
diff
changeset
|
524 int mb_xy= s->mb_index2xy[i]; |
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:
1176
diff
changeset
|
525 if((qscale_table[mb_xy]&1) != odd) |
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:
1176
diff
changeset
|
526 qscale_table[mb_xy]++; |
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:
1176
diff
changeset
|
527 if(qscale_table[mb_xy] > 31) |
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:
1176
diff
changeset
|
528 qscale_table[mb_xy]= 31; |
2967 | 529 } |
530 | |
690
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
531 for(i=1; i<s->mb_num; i++){ |
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:
1176
diff
changeset
|
532 int mb_xy= s->mb_index2xy[i]; |
1708 | 533 if(qscale_table[mb_xy] != qscale_table[s->mb_index2xy[i-1]] && (s->mb_type[mb_xy]&CANDIDATE_MB_TYPE_DIRECT)){ |
534 s->mb_type[mb_xy]|= CANDIDATE_MB_TYPE_BIDIR; | |
690
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
535 } |
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
536 } |
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
537 } |
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
538 } |
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
539 |
1070
6da5ae9ee199
more #ifdef CONFIG_ENCODERS patch by (Wolfgang Hesseler <qv at multimediaware dot com>) with modifications by me (s/WOLFGANG/CONFIG_ENCODERS/ and some other fixes)
michaelni
parents:
1068
diff
changeset
|
540 #endif //CONFIG_ENCODERS |
3247 | 541 |
8042 | 542 #define tab_size ((signed)FF_ARRAY_ELEMS(s->direct_scale_mv[0])) |
3255
183e3eb0824a
100l to loren. at least this fixes the compile error, but the code is still broken (decoding buggy/crashing)
rfelker
parents:
3247
diff
changeset
|
543 #define tab_bias (tab_size/2) |
183e3eb0824a
100l to loren. at least this fixes the compile error, but the code is still broken (decoding buggy/crashing)
rfelker
parents:
3247
diff
changeset
|
544 |
3791
b1d5ef809e11
fix rv20 b frames (broke since r5264 Mon Apr 3 07:52:24 2006 UTC 2x faster ff_mpeg4_set_direct_mv)
michael
parents:
3781
diff
changeset
|
545 void ff_mpeg4_init_direct_mv(MpegEncContext *s){ |
3247 | 546 int i; |
547 for(i=0; i<tab_size; i++){ | |
548 s->direct_scale_mv[0][i] = (i-tab_bias)*s->pb_time/s->pp_time; | |
549 s->direct_scale_mv[1][i] = (i-tab_bias)*(s->pb_time-s->pp_time)/s->pp_time; | |
550 } | |
551 } | |
552 | |
553 static inline void ff_mpeg4_set_one_direct_mv(MpegEncContext *s, int mx, int my, int i){ | |
554 int xy= s->block_index[i]; | |
555 uint16_t time_pp= s->pp_time; | |
556 uint16_t time_pb= s->pb_time; | |
557 int p_mx, p_my; | |
558 | |
559 p_mx= s->next_picture.motion_val[0][xy][0]; | |
560 if((unsigned)(p_mx + tab_bias) < tab_size){ | |
561 s->mv[0][i][0] = s->direct_scale_mv[0][p_mx + tab_bias] + mx; | |
562 s->mv[1][i][0] = mx ? s->mv[0][i][0] - p_mx | |
563 : s->direct_scale_mv[1][p_mx + tab_bias]; | |
564 }else{ | |
565 s->mv[0][i][0] = p_mx*time_pb/time_pp + mx; | |
566 s->mv[1][i][0] = mx ? s->mv[0][i][0] - p_mx | |
567 : p_mx*(time_pb - time_pp)/time_pp; | |
568 } | |
569 p_my= s->next_picture.motion_val[0][xy][1]; | |
570 if((unsigned)(p_my + tab_bias) < tab_size){ | |
571 s->mv[0][i][1] = s->direct_scale_mv[0][p_my + tab_bias] + my; | |
572 s->mv[1][i][1] = my ? s->mv[0][i][1] - p_my | |
573 : s->direct_scale_mv[1][p_my + tab_bias]; | |
574 }else{ | |
575 s->mv[0][i][1] = p_my*time_pb/time_pp + my; | |
576 s->mv[1][i][1] = my ? s->mv[0][i][1] - p_my | |
577 : p_my*(time_pb - time_pp)/time_pp; | |
578 } | |
579 } | |
580 | |
3255
183e3eb0824a
100l to loren. at least this fixes the compile error, but the code is still broken (decoding buggy/crashing)
rfelker
parents:
3247
diff
changeset
|
581 #undef tab_size |
183e3eb0824a
100l to loren. at least this fixes the compile error, but the code is still broken (decoding buggy/crashing)
rfelker
parents:
3247
diff
changeset
|
582 #undef tab_bias |
183e3eb0824a
100l to loren. at least this fixes the compile error, but the code is still broken (decoding buggy/crashing)
rfelker
parents:
3247
diff
changeset
|
583 |
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:
1176
diff
changeset
|
584 /** |
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:
1176
diff
changeset
|
585 * |
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:
1176
diff
changeset
|
586 * @return the mb_type |
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:
1176
diff
changeset
|
587 */ |
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:
1176
diff
changeset
|
588 int ff_mpeg4_set_direct_mv(MpegEncContext *s, int mx, int my){ |
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:
1176
diff
changeset
|
589 const int mb_index= s->mb_x + s->mb_y*s->mb_stride; |
1708 | 590 const int colocated_mb_type= s->next_picture.mb_type[mb_index]; |
9484
fb240cb99bcf
Remove useless init from ff_mpeg4_set_direct_mv() found by CSA.
michael
parents:
9481
diff
changeset
|
591 uint16_t time_pp; |
fb240cb99bcf
Remove useless init from ff_mpeg4_set_direct_mv() found by CSA.
michael
parents:
9481
diff
changeset
|
592 uint16_t time_pb; |
936 | 593 int i; |
2967 | 594 |
936 | 595 //FIXME avoid divides |
3247 | 596 // try special case with shifts for 1 and 3 B-frames? |
2967 | 597 |
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:
1176
diff
changeset
|
598 if(IS_8X8(colocated_mb_type)){ |
936 | 599 s->mv_type = MV_TYPE_8X8; |
600 for(i=0; i<4; i++){ | |
3247 | 601 ff_mpeg4_set_one_direct_mv(s, mx, my, i); |
936 | 602 } |
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:
1176
diff
changeset
|
603 return MB_TYPE_DIRECT2 | MB_TYPE_8x8 | MB_TYPE_L0L1; |
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:
1176
diff
changeset
|
604 } else if(IS_INTERLACED(colocated_mb_type)){ |
936 | 605 s->mv_type = MV_TYPE_FIELD; |
606 for(i=0; i<2; i++){ | |
1948 | 607 int field_select= s->next_picture.ref_index[0][s->block_index[2*i]]; |
3205 | 608 s->field_select[0][i]= field_select; |
609 s->field_select[1][i]= i; | |
936 | 610 if(s->top_field_first){ |
1948 | 611 time_pp= s->pp_field_time - field_select + i; |
612 time_pb= s->pb_field_time - field_select + i; | |
936 | 613 }else{ |
1948 | 614 time_pp= s->pp_field_time + field_select - i; |
615 time_pb= s->pb_field_time + field_select - i; | |
936 | 616 } |
1708 | 617 s->mv[0][i][0] = s->p_field_mv_table[i][0][mb_index][0]*time_pb/time_pp + mx; |
618 s->mv[0][i][1] = s->p_field_mv_table[i][0][mb_index][1]*time_pb/time_pp + my; | |
619 s->mv[1][i][0] = mx ? s->mv[0][i][0] - s->p_field_mv_table[i][0][mb_index][0] | |
620 : s->p_field_mv_table[i][0][mb_index][0]*(time_pb - time_pp)/time_pp; | |
2967 | 621 s->mv[1][i][1] = my ? s->mv[0][i][1] - s->p_field_mv_table[i][0][mb_index][1] |
1708 | 622 : s->p_field_mv_table[i][0][mb_index][1]*(time_pb - time_pp)/time_pp; |
936 | 623 } |
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:
1176
diff
changeset
|
624 return MB_TYPE_DIRECT2 | MB_TYPE_16x8 | MB_TYPE_L0L1 | MB_TYPE_INTERLACED; |
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:
1176
diff
changeset
|
625 }else{ |
3247 | 626 ff_mpeg4_set_one_direct_mv(s, mx, my, 0); |
627 s->mv[0][1][0] = s->mv[0][2][0] = s->mv[0][3][0] = s->mv[0][0][0]; | |
628 s->mv[0][1][1] = s->mv[0][2][1] = s->mv[0][3][1] = s->mv[0][0][1]; | |
629 s->mv[1][1][0] = s->mv[1][2][0] = s->mv[1][3][0] = s->mv[1][0][0]; | |
630 s->mv[1][1][1] = s->mv[1][2][1] = s->mv[1][3][1] = s->mv[1][0][1]; | |
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:
1176
diff
changeset
|
631 if((s->avctx->workaround_bugs & FF_BUG_DIRECT_BLOCKSIZE) || !s->quarter_sample) |
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:
1176
diff
changeset
|
632 s->mv_type= MV_TYPE_16X16; |
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:
1176
diff
changeset
|
633 else |
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:
1176
diff
changeset
|
634 s->mv_type= MV_TYPE_8X8; |
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:
1176
diff
changeset
|
635 return MB_TYPE_DIRECT2 | MB_TYPE_16x16 | MB_TYPE_L0L1; //Note see prev line |
936 | 636 } |
637 } | |
638 | |
1389 | 639 void ff_h263_update_motion_val(MpegEncContext * s){ |
640 const int mb_xy = s->mb_y * s->mb_stride + s->mb_x; | |
2646
c735e3e60ca7
Even More spelling errors. patch by (Kevin Baragona <kevinmb500 gawab com)
michael
parents:
2639
diff
changeset
|
641 //FIXME a lot of that is only needed for !low_delay |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1936
diff
changeset
|
642 const int wrap = s->b8_stride; |
1389 | 643 const int xy = s->block_index[0]; |
2967 | 644 |
645 s->current_picture.mbskip_table[mb_xy]= s->mb_skipped; | |
1389 | 646 |
647 if(s->mv_type != MV_TYPE_8X8){ | |
648 int motion_x, motion_y; | |
649 if (s->mb_intra) { | |
650 motion_x = 0; | |
651 motion_y = 0; | |
652 } else if (s->mv_type == MV_TYPE_16X16) { | |
653 motion_x = s->mv[0][0][0]; | |
654 motion_y = s->mv[0][0][1]; | |
655 } else /*if (s->mv_type == MV_TYPE_FIELD)*/ { | |
656 int i; | |
657 motion_x = s->mv[0][0][0] + s->mv[0][1][0]; | |
658 motion_y = s->mv[0][0][1] + s->mv[0][1][1]; | |
659 motion_x = (motion_x>>1) | (motion_x&1); | |
660 for(i=0; i<2; i++){ | |
1708 | 661 s->p_field_mv_table[i][0][mb_xy][0]= s->mv[0][i][0]; |
662 s->p_field_mv_table[i][0][mb_xy][1]= s->mv[0][i][1]; | |
1389 | 663 } |
1948 | 664 s->current_picture.ref_index[0][xy ]= |
665 s->current_picture.ref_index[0][xy + 1]= s->field_select[0][0]; | |
666 s->current_picture.ref_index[0][xy + wrap ]= | |
667 s->current_picture.ref_index[0][xy + wrap + 1]= s->field_select[0][1]; | |
1389 | 668 } |
1948 | 669 |
1389 | 670 /* no update if 8X8 because it has been done during parsing */ |
1668
30746f429df6
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1666
diff
changeset
|
671 s->current_picture.motion_val[0][xy][0] = motion_x; |
30746f429df6
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1666
diff
changeset
|
672 s->current_picture.motion_val[0][xy][1] = motion_y; |
30746f429df6
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1666
diff
changeset
|
673 s->current_picture.motion_val[0][xy + 1][0] = motion_x; |
30746f429df6
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1666
diff
changeset
|
674 s->current_picture.motion_val[0][xy + 1][1] = motion_y; |
30746f429df6
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1666
diff
changeset
|
675 s->current_picture.motion_val[0][xy + wrap][0] = motion_x; |
30746f429df6
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1666
diff
changeset
|
676 s->current_picture.motion_val[0][xy + wrap][1] = motion_y; |
30746f429df6
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1666
diff
changeset
|
677 s->current_picture.motion_val[0][xy + 1 + wrap][0] = motion_x; |
30746f429df6
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1666
diff
changeset
|
678 s->current_picture.motion_val[0][xy + 1 + wrap][1] = motion_y; |
1389 | 679 } |
680 | |
681 if(s->encoding){ //FIXME encoding MUST be cleaned up | |
2967 | 682 if (s->mv_type == MV_TYPE_8X8) |
1389 | 683 s->current_picture.mb_type[mb_xy]= MB_TYPE_L0 | MB_TYPE_8x8; |
1633 | 684 else if(s->mb_intra) |
685 s->current_picture.mb_type[mb_xy]= MB_TYPE_INTRA; | |
1389 | 686 else |
687 s->current_picture.mb_type[mb_xy]= MB_TYPE_L0 | MB_TYPE_16x16; | |
688 } | |
689 } | |
690 | |
10754
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
691 /** |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
692 * predicts the dc. |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
693 * encoding quantized level -> quantized diff |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
694 * decoding quantized diff -> quantized level |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
695 * @param n block index (0-3 are luma, 4-5 are chroma) |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
696 * @param dir_ptr pointer to an integer where the prediction direction will be stored |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
697 */ |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
698 static inline int ff_mpeg4_pred_dc(MpegEncContext * s, int n, int level, int *dir_ptr, int encoding) |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
699 { |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
700 int a, b, c, wrap, pred, scale, ret; |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
701 int16_t *dc_val; |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
702 |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
703 /* find prediction */ |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
704 if (n < 4) { |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
705 scale = s->y_dc_scale; |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
706 } else { |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
707 scale = s->c_dc_scale; |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
708 } |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
709 if(IS_3IV1) |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
710 scale= 8; |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
711 |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
712 wrap= s->block_wrap[n]; |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
713 dc_val = s->dc_val[0] + s->block_index[n]; |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
714 |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
715 /* B C |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
716 * A X |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
717 */ |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
718 a = dc_val[ - 1]; |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
719 b = dc_val[ - 1 - wrap]; |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
720 c = dc_val[ - wrap]; |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
721 |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
722 /* outside slice handling (we can't do that by memset as we need the dc for error resilience) */ |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
723 if(s->first_slice_line && n!=3){ |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
724 if(n!=2) b=c= 1024; |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
725 if(n!=1 && s->mb_x == s->resync_mb_x) b=a= 1024; |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
726 } |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
727 if(s->mb_x == s->resync_mb_x && s->mb_y == s->resync_mb_y+1){ |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
728 if(n==0 || n==4 || n==5) |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
729 b=1024; |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
730 } |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
731 |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
732 if (abs(a - b) < abs(b - c)) { |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
733 pred = c; |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
734 *dir_ptr = 1; /* top */ |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
735 } else { |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
736 pred = a; |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
737 *dir_ptr = 0; /* left */ |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
738 } |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
739 /* we assume pred is positive */ |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
740 pred = FASTDIV((pred + (scale >> 1)), scale); |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
741 |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
742 if(encoding){ |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
743 ret = level - pred; |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
744 }else{ |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
745 level += pred; |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
746 ret= level; |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
747 if(s->error_recognition>=3){ |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
748 if(level<0){ |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
749 av_log(s->avctx, AV_LOG_ERROR, "dc<0 at %dx%d\n", s->mb_x, s->mb_y); |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
750 return -1; |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
751 } |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
752 if(level*scale > 2048 + scale){ |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
753 av_log(s->avctx, AV_LOG_ERROR, "dc overflow at %dx%d\n", s->mb_x, s->mb_y); |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
754 return -1; |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
755 } |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
756 } |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
757 } |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
758 level *=scale; |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
759 if(level&(~2047)){ |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
760 if(level<0) |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
761 level=0; |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
762 else if(!(s->workaround_bugs&FF_BUG_DC_CLIP)) |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
763 level=2047; |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
764 } |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
765 dc_val[0]= level; |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
766 |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
767 return ret; |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
768 } |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
769 |
8590 | 770 #if CONFIG_ENCODERS |
1490
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
771 |
10755
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
772 /** |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
773 * encodes the dc value. |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
774 * @param n block index (0-3 are luma, 4-5 are chroma) |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
775 */ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
776 static inline void mpeg4_encode_dc(PutBitContext * s, int level, int n) |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
777 { |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
778 #if 1 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
779 level+=256; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
780 if (n < 4) { |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
781 /* luminance */ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
782 put_bits(s, uni_DCtab_lum_len[level], uni_DCtab_lum_bits[level]); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
783 } else { |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
784 /* chrominance */ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
785 put_bits(s, uni_DCtab_chrom_len[level], uni_DCtab_chrom_bits[level]); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
786 } |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
787 #else |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
788 int size, v; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
789 /* find number of bits */ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
790 size = 0; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
791 v = abs(level); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
792 while (v) { |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
793 v >>= 1; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
794 size++; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
795 } |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
796 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
797 if (n < 4) { |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
798 /* luminance */ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
799 put_bits(&s->pb, DCtab_lum[size][1], DCtab_lum[size][0]); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
800 } else { |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
801 /* chrominance */ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
802 put_bits(&s->pb, DCtab_chrom[size][1], DCtab_chrom[size][0]); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
803 } |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
804 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
805 /* encode remaining bits */ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
806 if (size > 0) { |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
807 if (level < 0) |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
808 level = (-level) ^ ((1 << size) - 1); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
809 put_bits(&s->pb, size, level); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
810 if (size > 8) |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
811 put_bits(&s->pb, 1, 1); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
812 } |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
813 #endif |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
814 } |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
815 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
816 static inline int mpeg4_get_dc_length(int level, int n){ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
817 if (n < 4) { |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
818 return uni_DCtab_lum_len[level + 256]; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
819 } else { |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
820 return uni_DCtab_chrom_len[level + 256]; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
821 } |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
822 } |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
823 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
824 /** |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
825 * encodes a 8x8 block |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
826 * @param n block index (0-3 are luma, 4-5 are chroma) |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
827 */ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
828 static inline void mpeg4_encode_block(MpegEncContext * s, DCTELEM * block, int n, int intra_dc, |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
829 uint8_t *scan_table, PutBitContext *dc_pb, PutBitContext *ac_pb) |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
830 { |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
831 int i, last_non_zero; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
832 #if 0 //variables for the outcommented version |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
833 int code, sign, last; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
834 #endif |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
835 const RLTable *rl; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
836 uint32_t *bits_tab; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
837 uint8_t *len_tab; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
838 const int last_index = s->block_last_index[n]; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
839 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
840 if (s->mb_intra) { //Note gcc (3.2.1 at least) will optimize this away |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
841 /* mpeg4 based DC predictor */ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
842 mpeg4_encode_dc(dc_pb, intra_dc, n); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
843 if(last_index<1) return; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
844 i = 1; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
845 rl = &rl_intra; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
846 bits_tab= uni_mpeg4_intra_rl_bits; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
847 len_tab = uni_mpeg4_intra_rl_len; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
848 } else { |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
849 if(last_index<0) return; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
850 i = 0; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
851 rl = &rl_inter; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
852 bits_tab= uni_mpeg4_inter_rl_bits; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
853 len_tab = uni_mpeg4_inter_rl_len; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
854 } |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
855 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
856 /* AC coefs */ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
857 last_non_zero = i - 1; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
858 #if 1 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
859 for (; i < last_index; i++) { |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
860 int level = block[ scan_table[i] ]; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
861 if (level) { |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
862 int run = i - last_non_zero - 1; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
863 level+=64; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
864 if((level&(~127)) == 0){ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
865 const int index= UNI_MPEG4_ENC_INDEX(0, run, level); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
866 put_bits(ac_pb, len_tab[index], bits_tab[index]); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
867 }else{ //ESC3 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
868 put_bits(ac_pb, 7+2+1+6+1+12+1, (3<<23)+(3<<21)+(0<<20)+(run<<14)+(1<<13)+(((level-64)&0xfff)<<1)+1); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
869 } |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
870 last_non_zero = i; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
871 } |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
872 } |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
873 /*if(i<=last_index)*/{ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
874 int level = block[ scan_table[i] ]; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
875 int run = i - last_non_zero - 1; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
876 level+=64; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
877 if((level&(~127)) == 0){ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
878 const int index= UNI_MPEG4_ENC_INDEX(1, run, level); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
879 put_bits(ac_pb, len_tab[index], bits_tab[index]); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
880 }else{ //ESC3 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
881 put_bits(ac_pb, 7+2+1+6+1+12+1, (3<<23)+(3<<21)+(1<<20)+(run<<14)+(1<<13)+(((level-64)&0xfff)<<1)+1); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
882 } |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
883 } |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
884 #else |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
885 for (; i <= last_index; i++) { |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
886 const int slevel = block[ scan_table[i] ]; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
887 if (slevel) { |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
888 int level; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
889 int run = i - last_non_zero - 1; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
890 last = (i == last_index); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
891 sign = 0; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
892 level = slevel; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
893 if (level < 0) { |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
894 sign = 1; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
895 level = -level; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
896 } |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
897 code = get_rl_index(rl, last, run, level); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
898 put_bits(ac_pb, rl->table_vlc[code][1], rl->table_vlc[code][0]); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
899 if (code == rl->n) { |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
900 int level1, run1; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
901 level1 = level - rl->max_level[last][run]; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
902 if (level1 < 1) |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
903 goto esc2; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
904 code = get_rl_index(rl, last, run, level1); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
905 if (code == rl->n) { |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
906 esc2: |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
907 put_bits(ac_pb, 1, 1); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
908 if (level > MAX_LEVEL) |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
909 goto esc3; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
910 run1 = run - rl->max_run[last][level] - 1; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
911 if (run1 < 0) |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
912 goto esc3; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
913 code = get_rl_index(rl, last, run1, level); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
914 if (code == rl->n) { |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
915 esc3: |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
916 /* third escape */ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
917 put_bits(ac_pb, 1, 1); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
918 put_bits(ac_pb, 1, last); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
919 put_bits(ac_pb, 6, run); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
920 put_bits(ac_pb, 1, 1); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
921 put_sbits(ac_pb, 12, slevel); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
922 put_bits(ac_pb, 1, 1); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
923 } else { |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
924 /* second escape */ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
925 put_bits(ac_pb, 1, 0); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
926 put_bits(ac_pb, rl->table_vlc[code][1], rl->table_vlc[code][0]); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
927 put_bits(ac_pb, 1, sign); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
928 } |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
929 } else { |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
930 /* first escape */ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
931 put_bits(ac_pb, 1, 0); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
932 put_bits(ac_pb, rl->table_vlc[code][1], rl->table_vlc[code][0]); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
933 put_bits(ac_pb, 1, sign); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
934 } |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
935 } else { |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
936 put_bits(ac_pb, 1, sign); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
937 } |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
938 last_non_zero = i; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
939 } |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
940 } |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
941 #endif |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
942 } |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
943 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
944 static int mpeg4_get_block_length(MpegEncContext * s, DCTELEM * block, int n, int intra_dc, |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
945 uint8_t *scan_table) |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
946 { |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
947 int i, last_non_zero; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
948 uint8_t *len_tab; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
949 const int last_index = s->block_last_index[n]; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
950 int len=0; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
951 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
952 if (s->mb_intra) { //Note gcc (3.2.1 at least) will optimize this away |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
953 /* mpeg4 based DC predictor */ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
954 len += mpeg4_get_dc_length(intra_dc, n); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
955 if(last_index<1) return len; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
956 i = 1; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
957 len_tab = uni_mpeg4_intra_rl_len; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
958 } else { |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
959 if(last_index<0) return 0; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
960 i = 0; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
961 len_tab = uni_mpeg4_inter_rl_len; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
962 } |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
963 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
964 /* AC coefs */ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
965 last_non_zero = i - 1; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
966 for (; i < last_index; i++) { |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
967 int level = block[ scan_table[i] ]; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
968 if (level) { |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
969 int run = i - last_non_zero - 1; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
970 level+=64; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
971 if((level&(~127)) == 0){ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
972 const int index= UNI_MPEG4_ENC_INDEX(0, run, level); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
973 len += len_tab[index]; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
974 }else{ //ESC3 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
975 len += 7+2+1+6+1+12+1; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
976 } |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
977 last_non_zero = i; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
978 } |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
979 } |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
980 /*if(i<=last_index)*/{ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
981 int level = block[ scan_table[i] ]; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
982 int run = i - last_non_zero - 1; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
983 level+=64; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
984 if((level&(~127)) == 0){ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
985 const int index= UNI_MPEG4_ENC_INDEX(1, run, level); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
986 len += len_tab[index]; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
987 }else{ //ESC3 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
988 len += 7+2+1+6+1+12+1; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
989 } |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
990 } |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
991 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
992 return len; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
993 } |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
994 |
2502 | 995 static inline int h263_get_motion_length(MpegEncContext * s, int val, int f_code){ |
996 int l, bit_size, code; | |
997 | |
998 if (val == 0) { | |
999 return mvtab[0][1]; | |
1000 } else { | |
1001 bit_size = f_code - 1; | |
1002 /* modulo encoding */ | |
1003 l= INT_BIT - 6 - bit_size; | |
1004 val = (val<<l)>>l; | |
1005 val--; | |
1006 code = (val >> bit_size) + 1; | |
1007 | |
1008 return mvtab[code][1] + 1 + bit_size; | |
1009 } | |
1010 } | |
1011 | |
1012 static inline void ff_h263_encode_motion_vector(MpegEncContext * s, int x, int y, int f_code){ | |
1013 if(s->flags2 & CODEC_FLAG2_NO_OUTPUT){ | |
2967 | 1014 skip_put_bits(&s->pb, |
2502 | 1015 h263_get_motion_length(s, x, f_code) |
1016 +h263_get_motion_length(s, y, f_code)); | |
1017 }else{ | |
1018 ff_h263_encode_motion(s, x, f_code); | |
1019 ff_h263_encode_motion(s, y, f_code); | |
1020 } | |
1021 } | |
1022 | |
1490
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1023 static inline int get_p_cbp(MpegEncContext * s, |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1024 DCTELEM block[6][64], |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1025 int motion_x, int motion_y){ |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1026 int cbp, i; |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1027 |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1028 if(s->flags & CODEC_FLAG_CBP_RD){ |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1029 int best_cbpy_score= INT_MAX; |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1030 int best_cbpc_score= INT_MAX; |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
1031 int cbpc = (-1), cbpy= (-1); |
1490
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1032 const int offset= (s->mv_type==MV_TYPE_16X16 ? 0 : 16) + (s->dquant ? 8 : 0); |
1505
010f76d07a27
use lagrange multipler instead of qp for ratecontrol, this may break some things, tell me ASAP if u notice anything broken
michaelni
parents:
1492
diff
changeset
|
1033 const int lambda= s->lambda2 >> (FF_LAMBDA_SHIFT - 6); |
1490
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1034 |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1035 for(i=0; i<4; i++){ |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1036 int score= inter_MCBPC_bits[i + offset] * lambda; |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1037 if(i&1) score += s->coded_score[5]; |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1038 if(i&2) score += s->coded_score[4]; |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1039 |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1040 if(score < best_cbpc_score){ |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1041 best_cbpc_score= score; |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1042 cbpc= i; |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1043 } |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1044 } |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1045 |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1046 for(i=0; i<16; i++){ |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1047 int score= cbpy_tab[i ^ 0xF][1] * lambda; |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1048 if(i&1) score += s->coded_score[3]; |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1049 if(i&2) score += s->coded_score[2]; |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1050 if(i&4) score += s->coded_score[1]; |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1051 if(i&8) score += s->coded_score[0]; |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1052 |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1053 if(score < best_cbpy_score){ |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1054 best_cbpy_score= score; |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1055 cbpy= i; |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1056 } |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1057 } |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1058 cbp= cbpc + 4*cbpy; |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1059 if ((motion_x | motion_y | s->dquant) == 0 && s->mv_type==MV_TYPE_16X16){ |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1060 if(best_cbpy_score + best_cbpc_score + 2*lambda >= 0) |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1061 cbp= 0; |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1062 } |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1063 |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1064 for (i = 0; i < 6; i++) { |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1065 if (s->block_last_index[i] >= 0 && ((cbp >> (5 - i))&1)==0 ){ |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1066 s->block_last_index[i]= -1; |
8288 | 1067 s->dsp.clear_block(s->block[i]); |
1490
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1068 } |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1069 } |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1070 }else{ |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1071 cbp= 0; |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1072 for (i = 0; i < 6; i++) { |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1073 if (s->block_last_index[i] >= 0) |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1074 cbp |= 1 << (5 - i); |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1075 } |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1076 } |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1077 return cbp; |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1078 } |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1079 |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1080 static inline int get_b_cbp(MpegEncContext * s, DCTELEM block[6][64], |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1081 int motion_x, int motion_y, int mb_type){ |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1082 int cbp=0, i; |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1083 |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1084 if(s->flags & CODEC_FLAG_CBP_RD){ |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1085 int score=0; |
1505
010f76d07a27
use lagrange multipler instead of qp for ratecontrol, this may break some things, tell me ASAP if u notice anything broken
michaelni
parents:
1492
diff
changeset
|
1086 const int lambda= s->lambda2 >> (FF_LAMBDA_SHIFT - 6); |
2967 | 1087 |
1490
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1088 for(i=0; i<6; i++){ |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1089 if(s->coded_score[i] < 0){ |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1090 score += s->coded_score[i]; |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1091 cbp |= 1 << (5 - i); |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1092 } |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1093 } |
2967 | 1094 |
1490
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1095 if(cbp){ |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1096 int zero_score= -6; |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1097 if ((motion_x | motion_y | s->dquant | mb_type) == 0){ |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1098 zero_score-= 4; //2*MV + mb_type + cbp bit |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1099 } |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1100 |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1101 zero_score*= lambda; |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1102 if(zero_score <= score){ |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1103 cbp=0; |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1104 } |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1105 } |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1106 |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1107 for (i = 0; i < 6; i++) { |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1108 if (s->block_last_index[i] >= 0 && ((cbp >> (5 - i))&1)==0 ){ |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1109 s->block_last_index[i]= -1; |
8288 | 1110 s->dsp.clear_block(s->block[i]); |
1490
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1111 } |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1112 } |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1113 }else{ |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1114 for (i = 0; i < 6; i++) { |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1115 if (s->block_last_index[i] >= 0) |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1116 cbp |= 1 << (5 - i); |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1117 } |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1118 } |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1119 return cbp; |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1120 } |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1121 |
2967 | 1122 static inline void mpeg4_encode_blocks(MpegEncContext * s, DCTELEM block[6][64], int intra_dc[6], |
2502 | 1123 uint8_t **scan_table, PutBitContext *dc_pb, PutBitContext *ac_pb){ |
1124 int i; | |
2967 | 1125 |
2502 | 1126 if(scan_table){ |
1127 if(s->flags2 & CODEC_FLAG2_NO_OUTPUT){ | |
1128 for (i = 0; i < 6; i++) { | |
1129 skip_put_bits(&s->pb, mpeg4_get_block_length(s, block[i], i, intra_dc[i], scan_table[i])); | |
1130 } | |
1131 }else{ | |
1132 /* encode each block */ | |
1133 for (i = 0; i < 6; i++) { | |
1134 mpeg4_encode_block(s, block[i], i, intra_dc[i], scan_table[i], dc_pb, ac_pb); | |
1135 } | |
1136 } | |
1137 }else{ | |
1138 if(s->flags2 & CODEC_FLAG2_NO_OUTPUT){ | |
1139 for (i = 0; i < 6; i++) { | |
1140 skip_put_bits(&s->pb, mpeg4_get_block_length(s, block[i], i, 0, s->intra_scantable.permutated)); | |
1141 } | |
1142 }else{ | |
1143 /* encode each block */ | |
1144 for (i = 0; i < 6; i++) { | |
1145 mpeg4_encode_block(s, block[i], i, 0, s->intra_scantable.permutated, dc_pb, ac_pb); | |
1146 } | |
1147 } | |
1148 } | |
1149 } | |
1150 | |
8644 | 1151 static const int dquant_code[5]= {1,0,9,2,3}; |
1152 | |
265
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
1153 void mpeg4_encode_mb(MpegEncContext * s, |
2979 | 1154 DCTELEM block[6][64], |
1155 int motion_x, int motion_y) | |
265
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
1156 { |
1057 | 1157 int cbpc, cbpy, pred_x, pred_y; |
453 | 1158 PutBitContext * const pb2 = s->data_partitioning ? &s->pb2 : &s->pb; |
6481 | 1159 PutBitContext * const tex_pb = s->data_partitioning && s->pict_type!=FF_B_TYPE ? &s->tex_pb : &s->pb; |
1160 PutBitContext * const dc_pb = s->data_partitioning && s->pict_type!=FF_I_TYPE ? &s->pb2 : &s->pb; | |
453 | 1161 const int interleaved_stats= (s->flags&CODEC_FLAG_PASS1) && !s->data_partitioning ? 1 : 0; |
2967 | 1162 |
265
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
1163 if (!s->mb_intra) { |
1490
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1164 int i, cbp; |
2967 | 1165 |
6481 | 1166 if(s->pict_type==FF_B_TYPE){ |
5445
5581a40c673a
exchange the values of MV_DIR_FORWARD and MV_DIR_BACKWARD (this is more sane,
michael
parents:
5405
diff
changeset
|
1167 static const int mb_type_table[8]= {-1, 3, 2, 1,-1,-1,-1, 0}; /* convert from mv_dir to type */ |
324 | 1168 int mb_type= mb_type_table[s->mv_dir]; |
1708 | 1169 |
324 | 1170 if(s->mb_x==0){ |
1708 | 1171 for(i=0; i<2; i++){ |
2967 | 1172 s->last_mv[i][0][0]= |
1173 s->last_mv[i][0][1]= | |
1174 s->last_mv[i][1][0]= | |
1708 | 1175 s->last_mv[i][1][1]= 0; |
1176 } | |
324 | 1177 } |
2967 | 1178 |
690
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
1179 assert(s->dquant>=-2 && s->dquant<=2); |
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
1180 assert((s->dquant&1)==0); |
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
1181 assert(mb_type>=0); |
265
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
1182 |
2628
511e3afc43e1
Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents:
2615
diff
changeset
|
1183 /* nothing to do if this MB was skipped in the next P Frame */ |
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:
1176
diff
changeset
|
1184 if(s->next_picture.mbskip_table[s->mb_y * s->mb_stride + s->mb_x]){ //FIXME avoid DCT & ... |
324 | 1185 s->skip_count++; |
2967 | 1186 s->mv[0][0][0]= |
1187 s->mv[0][0][1]= | |
1188 s->mv[1][0][0]= | |
324 | 1189 s->mv[1][0][1]= 0; |
2646
c735e3e60ca7
Even More spelling errors. patch by (Kevin Baragona <kevinmb500 gawab com)
michael
parents:
2639
diff
changeset
|
1190 s->mv_dir= MV_DIR_FORWARD; //doesn't matter |
690
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
1191 s->qscale -= s->dquant; |
2628
511e3afc43e1
Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents:
2615
diff
changeset
|
1192 // s->mb_skipped=1; |
903 | 1193 |
324 | 1194 return; |
1195 } | |
2967 | 1196 |
1490
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1197 cbp= get_b_cbp(s, block, motion_x, motion_y, mb_type); |
2967 | 1198 |
324 | 1199 if ((cbp | motion_x | motion_y | mb_type) ==0) { |
1200 /* direct MB with MV={0,0} */ | |
690
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
1201 assert(s->dquant==0); |
2967 | 1202 |
324 | 1203 put_bits(&s->pb, 1, 1); /* mb not coded modb1=1 */ |
453 | 1204 |
1205 if(interleaved_stats){ | |
1206 s->misc_bits++; | |
1207 s->last_bits++; | |
1208 } | |
324 | 1209 s->skip_count++; |
1210 return; | |
1211 } | |
2967 | 1212 |
2979 | 1213 put_bits(&s->pb, 1, 0); /* mb coded modb1=0 */ |
324 | 1214 put_bits(&s->pb, 1, cbp ? 0 : 1); /* modb2 */ //FIXME merge |
2646
c735e3e60ca7
Even More spelling errors. patch by (Kevin Baragona <kevinmb500 gawab com)
michael
parents:
2639
diff
changeset
|
1215 put_bits(&s->pb, mb_type+1, 1); // this table is so simple that we don't need it :) |
324 | 1216 if(cbp) put_bits(&s->pb, 6, cbp); |
2967 | 1217 |
690
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
1218 if(cbp && mb_type){ |
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
1219 if(s->dquant) |
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
1220 put_bits(&s->pb, 2, (s->dquant>>2)+3); |
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
1221 else |
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
1222 put_bits(&s->pb, 1, 0); |
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
1223 }else |
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
1224 s->qscale -= s->dquant; |
2967 | 1225 |
697 | 1226 if(!s->progressive_sequence){ |
1227 if(cbp) | |
1228 put_bits(&s->pb, 1, s->interlaced_dct); | |
2646
c735e3e60ca7
Even More spelling errors. patch by (Kevin Baragona <kevinmb500 gawab com)
michael
parents:
2639
diff
changeset
|
1229 if(mb_type) // not direct mode |
1708 | 1230 put_bits(&s->pb, 1, s->mv_type == MV_TYPE_FIELD); |
697 | 1231 } |
265
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
1232 |
453 | 1233 if(interleaved_stats){ |
1164 | 1234 s->misc_bits+= get_bits_diff(s); |
453 | 1235 } |
295 | 1236 |
1708 | 1237 if(mb_type == 0){ |
1238 assert(s->mv_dir & MV_DIRECT); | |
2502 | 1239 ff_h263_encode_motion_vector(s, motion_x, motion_y, 1); |
656
e47fa3e3f2d5
statistics for forw & back p-MBs instead of just one counter for both
michaelni
parents:
654
diff
changeset
|
1240 s->b_count++; |
e47fa3e3f2d5
statistics for forw & back p-MBs instead of just one counter for both
michaelni
parents:
654
diff
changeset
|
1241 s->f_count++; |
1708 | 1242 }else{ |
1243 assert(mb_type > 0 && mb_type < 4); | |
1244 if(s->mv_type != MV_TYPE_FIELD){ | |
1245 if(s->mv_dir & MV_DIR_FORWARD){ | |
2502 | 1246 ff_h263_encode_motion_vector(s, s->mv[0][0][0] - s->last_mv[0][0][0], |
1247 s->mv[0][0][1] - s->last_mv[0][0][1], s->f_code); | |
1708 | 1248 s->last_mv[0][0][0]= s->last_mv[0][1][0]= s->mv[0][0][0]; |
1249 s->last_mv[0][0][1]= s->last_mv[0][1][1]= s->mv[0][0][1]; | |
1250 s->f_count++; | |
1251 } | |
1252 if(s->mv_dir & MV_DIR_BACKWARD){ | |
2502 | 1253 ff_h263_encode_motion_vector(s, s->mv[1][0][0] - s->last_mv[1][0][0], |
1254 s->mv[1][0][1] - s->last_mv[1][0][1], s->b_code); | |
1708 | 1255 s->last_mv[1][0][0]= s->last_mv[1][1][0]= s->mv[1][0][0]; |
1256 s->last_mv[1][0][1]= s->last_mv[1][1][1]= s->mv[1][0][1]; | |
1257 s->b_count++; | |
1258 } | |
1259 }else{ | |
1260 if(s->mv_dir & MV_DIR_FORWARD){ | |
1261 put_bits(&s->pb, 1, s->field_select[0][0]); | |
1262 put_bits(&s->pb, 1, s->field_select[0][1]); | |
1263 } | |
1264 if(s->mv_dir & MV_DIR_BACKWARD){ | |
1265 put_bits(&s->pb, 1, s->field_select[1][0]); | |
1266 put_bits(&s->pb, 1, s->field_select[1][1]); | |
1267 } | |
1268 if(s->mv_dir & MV_DIR_FORWARD){ | |
1269 for(i=0; i<2; i++){ | |
2502 | 1270 ff_h263_encode_motion_vector(s, s->mv[0][i][0] - s->last_mv[0][i][0] , |
1271 s->mv[0][i][1] - s->last_mv[0][i][1]/2, s->f_code); | |
1708 | 1272 s->last_mv[0][i][0]= s->mv[0][i][0]; |
1273 s->last_mv[0][i][1]= s->mv[0][i][1]*2; | |
1274 } | |
1275 s->f_count++; | |
1276 } | |
1277 if(s->mv_dir & MV_DIR_BACKWARD){ | |
1278 for(i=0; i<2; i++){ | |
2502 | 1279 ff_h263_encode_motion_vector(s, s->mv[1][i][0] - s->last_mv[1][i][0] , |
1280 s->mv[1][i][1] - s->last_mv[1][i][1]/2, s->b_code); | |
1708 | 1281 s->last_mv[1][i][0]= s->mv[1][i][0]; |
1282 s->last_mv[1][i][1]= s->mv[1][i][1]*2; | |
1283 } | |
1284 s->b_count++; | |
1285 } | |
1286 } | |
324 | 1287 } |
453 | 1288 |
1289 if(interleaved_stats){ | |
1164 | 1290 s->mv_bits+= get_bits_diff(s); |
453 | 1291 } |
295 | 1292 |
2502 | 1293 mpeg4_encode_blocks(s, block, NULL, NULL, NULL, &s->pb); |
453 | 1294 |
1295 if(interleaved_stats){ | |
1164 | 1296 s->p_tex_bits+= get_bits_diff(s); |
453 | 1297 } |
1708 | 1298 |
6481 | 1299 }else{ /* s->pict_type==FF_B_TYPE */ |
1490
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1300 cbp= get_p_cbp(s, block, motion_x, motion_y); |
2967 | 1301 |
690
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
1302 if ((cbp | motion_x | motion_y | s->dquant) == 0 && s->mv_type==MV_TYPE_16X16) { |
2967 | 1303 /* check if the B frames can skip it too, as we must skip it if we skip here |
2646
c735e3e60ca7
Even More spelling errors. patch by (Kevin Baragona <kevinmb500 gawab com)
michael
parents:
2639
diff
changeset
|
1304 why didn't they just compress the skip-mb bits instead of reusing them ?! */ |
331 | 1305 if(s->max_b_frames>0){ |
1306 int i; | |
364
6b6332e7008a
segfault fix for b-frame encoding with height%16!=0
michaelni
parents:
360
diff
changeset
|
1307 int x,y, offset; |
6b6332e7008a
segfault fix for b-frame encoding with height%16!=0
michaelni
parents:
360
diff
changeset
|
1308 uint8_t *p_pic; |
6b6332e7008a
segfault fix for b-frame encoding with height%16!=0
michaelni
parents:
360
diff
changeset
|
1309 |
6b6332e7008a
segfault fix for b-frame encoding with height%16!=0
michaelni
parents:
360
diff
changeset
|
1310 x= s->mb_x*16; |
6b6332e7008a
segfault fix for b-frame encoding with height%16!=0
michaelni
parents:
360
diff
changeset
|
1311 y= s->mb_y*16; |
6b6332e7008a
segfault fix for b-frame encoding with height%16!=0
michaelni
parents:
360
diff
changeset
|
1312 if(x+16 > s->width) x= s->width-16; |
6b6332e7008a
segfault fix for b-frame encoding with height%16!=0
michaelni
parents:
360
diff
changeset
|
1313 if(y+16 > s->height) y= s->height-16; |
6b6332e7008a
segfault fix for b-frame encoding with height%16!=0
michaelni
parents:
360
diff
changeset
|
1314 |
6b6332e7008a
segfault fix for b-frame encoding with height%16!=0
michaelni
parents:
360
diff
changeset
|
1315 offset= x + y*s->linesize; |
903 | 1316 p_pic= s->new_picture.data[0] + offset; |
2967 | 1317 |
2628
511e3afc43e1
Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents:
2615
diff
changeset
|
1318 s->mb_skipped=1; |
331 | 1319 for(i=0; i<s->max_b_frames; i++){ |
339 | 1320 uint8_t *b_pic; |
1321 int diff; | |
903 | 1322 Picture *pic= s->reordered_input_picture[i+1]; |
1323 | |
6481 | 1324 if(pic==NULL || pic->pict_type!=FF_B_TYPE) break; |
903 | 1325 |
3068 | 1326 b_pic= pic->data[0] + offset; |
1327 if(pic->type != FF_BUFFER_TYPE_SHARED) | |
1328 b_pic+= INPLACE_OFFSET; | |
2979 | 1329 diff= s->dsp.sad[0](NULL, p_pic, b_pic, s->linesize, 16); |
364
6b6332e7008a
segfault fix for b-frame encoding with height%16!=0
michaelni
parents:
360
diff
changeset
|
1330 if(diff>s->qscale*70){ //FIXME check that 70 is optimal |
2628
511e3afc43e1
Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents:
2615
diff
changeset
|
1331 s->mb_skipped=0; |
331 | 1332 break; |
1333 } | |
1334 } | |
1335 }else | |
2967 | 1336 s->mb_skipped=1; |
2628
511e3afc43e1
Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents:
2615
diff
changeset
|
1337 |
511e3afc43e1
Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents:
2615
diff
changeset
|
1338 if(s->mb_skipped==1){ |
331 | 1339 /* skip macroblock */ |
1340 put_bits(&s->pb, 1, 1); | |
453 | 1341 |
1342 if(interleaved_stats){ | |
1343 s->misc_bits++; | |
1344 s->last_bits++; | |
1345 } | |
331 | 1346 s->skip_count++; |
2967 | 1347 |
331 | 1348 return; |
1349 } | |
295 | 1350 } |
364
6b6332e7008a
segfault fix for b-frame encoding with height%16!=0
michaelni
parents:
360
diff
changeset
|
1351 |
2979 | 1352 put_bits(&s->pb, 1, 0); /* mb coded */ |
1633 | 1353 cbpc = cbp & 3; |
1354 cbpy = cbp >> 2; | |
1355 cbpy ^= 0xf; | |
324 | 1356 if(s->mv_type==MV_TYPE_16X16){ |
690
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
1357 if(s->dquant) cbpc+= 8; |
324 | 1358 put_bits(&s->pb, |
1359 inter_MCBPC_bits[cbpc], | |
1360 inter_MCBPC_code[cbpc]); | |
690
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
1361 |
453 | 1362 put_bits(pb2, cbpy_tab[cbpy][1], cbpy_tab[cbpy][0]); |
690
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
1363 if(s->dquant) |
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
1364 put_bits(pb2, 2, dquant_code[s->dquant+2]); |
697 | 1365 |
1366 if(!s->progressive_sequence){ | |
1367 if(cbp) | |
1368 put_bits(pb2, 1, s->interlaced_dct); | |
1708 | 1369 put_bits(pb2, 1, 0); |
697 | 1370 } |
2967 | 1371 |
453 | 1372 if(interleaved_stats){ |
1164 | 1373 s->misc_bits+= get_bits_diff(s); |
453 | 1374 } |
324 | 1375 |
1376 /* motion vectors: 16x16 mode */ | |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1936
diff
changeset
|
1377 h263_pred_motion(s, 0, 0, &pred_x, &pred_y); |
2967 | 1378 |
2502 | 1379 ff_h263_encode_motion_vector(s, motion_x - pred_x, |
1380 motion_y - pred_y, s->f_code); | |
1708 | 1381 }else if(s->mv_type==MV_TYPE_FIELD){ |
1382 if(s->dquant) cbpc+= 8; | |
1383 put_bits(&s->pb, | |
1384 inter_MCBPC_bits[cbpc], | |
1385 inter_MCBPC_code[cbpc]); | |
1386 | |
1387 put_bits(pb2, cbpy_tab[cbpy][1], cbpy_tab[cbpy][0]); | |
1388 if(s->dquant) | |
1389 put_bits(pb2, 2, dquant_code[s->dquant+2]); | |
1390 | |
1391 assert(!s->progressive_sequence); | |
1392 if(cbp) | |
1393 put_bits(pb2, 1, s->interlaced_dct); | |
1394 put_bits(pb2, 1, 1); | |
2967 | 1395 |
1708 | 1396 if(interleaved_stats){ |
1397 s->misc_bits+= get_bits_diff(s); | |
1398 } | |
1399 | |
1400 /* motion vectors: 16x8 interlaced mode */ | |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1936
diff
changeset
|
1401 h263_pred_motion(s, 0, 0, &pred_x, &pred_y); |
1708 | 1402 pred_y /=2; |
2967 | 1403 |
1708 | 1404 put_bits(&s->pb, 1, s->field_select[0][0]); |
1405 put_bits(&s->pb, 1, s->field_select[0][1]); | |
2967 | 1406 |
2502 | 1407 ff_h263_encode_motion_vector(s, s->mv[0][0][0] - pred_x, |
1408 s->mv[0][0][1] - pred_y, s->f_code); | |
1409 ff_h263_encode_motion_vector(s, s->mv[0][1][0] - pred_x, | |
1410 s->mv[0][1][1] - pred_y, s->f_code); | |
324 | 1411 }else{ |
1708 | 1412 assert(s->mv_type==MV_TYPE_8X8); |
324 | 1413 put_bits(&s->pb, |
1633 | 1414 inter_MCBPC_bits[cbpc+16], |
1415 inter_MCBPC_code[cbpc+16]); | |
453 | 1416 put_bits(pb2, cbpy_tab[cbpy][1], cbpy_tab[cbpy][0]); |
1417 | |
757 | 1418 if(!s->progressive_sequence){ |
1419 if(cbp) | |
1420 put_bits(pb2, 1, s->interlaced_dct); | |
1421 } | |
2967 | 1422 |
453 | 1423 if(interleaved_stats){ |
1164 | 1424 s->misc_bits+= get_bits_diff(s); |
453 | 1425 } |
324 | 1426 |
1427 for(i=0; i<4; i++){ | |
1428 /* motion vectors: 8x8 mode*/ | |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1936
diff
changeset
|
1429 h263_pred_motion(s, i, 0, &pred_x, &pred_y); |
324 | 1430 |
2502 | 1431 ff_h263_encode_motion_vector(s, s->current_picture.motion_val[0][ s->block_index[i] ][0] - pred_x, |
1432 s->current_picture.motion_val[0][ s->block_index[i] ][1] - pred_y, s->f_code); | |
324 | 1433 } |
1434 } | |
453 | 1435 |
2967 | 1436 if(interleaved_stats){ |
1164 | 1437 s->mv_bits+= get_bits_diff(s); |
453 | 1438 } |
324 | 1439 |
2502 | 1440 mpeg4_encode_blocks(s, block, NULL, NULL, NULL, tex_pb); |
453 | 1441 |
1442 if(interleaved_stats){ | |
1164 | 1443 s->p_tex_bits+= get_bits_diff(s); |
453 | 1444 } |
656
e47fa3e3f2d5
statistics for forw & back p-MBs instead of just one counter for both
michaelni
parents:
654
diff
changeset
|
1445 s->f_count++; |
295 | 1446 } |
265
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
1447 } else { |
324 | 1448 int cbp; |
2967 | 1449 int dc_diff[6]; //dc values with the dc prediction subtracted |
265
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
1450 int dir[6]; //prediction direction |
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
1451 int zigzag_last_index[6]; |
2979 | 1452 uint8_t *scan_table[6]; |
1057 | 1453 int i; |
265
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
1454 |
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
1455 for(i=0; i<6; i++){ |
2003 | 1456 dc_diff[i]= ff_mpeg4_pred_dc(s, i, block[i][0], &dir[i], 1); |
265
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
1457 } |
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
1458 |
1492 | 1459 if(s->flags & CODEC_FLAG_AC_PRED){ |
1460 s->ac_pred= decide_ac_pred(s, block, dir, scan_table, zigzag_last_index); | |
265
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
1461 }else{ |
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
1462 for(i=0; i<6; i++) |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
702
diff
changeset
|
1463 scan_table[i]= s->intra_scantable.permutated; |
265
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
1464 } |
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
1465 |
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
1466 /* compute cbp */ |
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
1467 cbp = 0; |
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
1468 for (i = 0; i < 6; i++) { |
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
1469 if (s->block_last_index[i] >= 1) |
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
1470 cbp |= 1 << (5 - i); |
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
1471 } |
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
1472 |
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
1473 cbpc = cbp & 3; |
6481 | 1474 if (s->pict_type == FF_I_TYPE) { |
690
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
1475 if(s->dquant) cbpc+=4; |
265
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
1476 put_bits(&s->pb, |
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
1477 intra_MCBPC_bits[cbpc], |
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
1478 intra_MCBPC_code[cbpc]); |
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
1479 } else { |
690
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
1480 if(s->dquant) cbpc+=8; |
2979 | 1481 put_bits(&s->pb, 1, 0); /* mb coded */ |
265
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
1482 put_bits(&s->pb, |
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
1483 inter_MCBPC_bits[cbpc + 4], |
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
1484 inter_MCBPC_code[cbpc + 4]); |
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
1485 } |
453 | 1486 put_bits(pb2, 1, s->ac_pred); |
265
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
1487 cbpy = cbp >> 2; |
453 | 1488 put_bits(pb2, cbpy_tab[cbpy][1], cbpy_tab[cbpy][0]); |
690
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
1489 if(s->dquant) |
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
1490 put_bits(dc_pb, 2, dquant_code[s->dquant+2]); |
453 | 1491 |
697 | 1492 if(!s->progressive_sequence){ |
1493 put_bits(dc_pb, 1, s->interlaced_dct); | |
1494 } | |
1495 | |
453 | 1496 if(interleaved_stats){ |
1164 | 1497 s->misc_bits+= get_bits_diff(s); |
453 | 1498 } |
286 | 1499 |
2502 | 1500 mpeg4_encode_blocks(s, block, dc_diff, scan_table, dc_pb, tex_pb); |
265
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
1501 |
453 | 1502 if(interleaved_stats){ |
1164 | 1503 s->i_tex_bits+= get_bits_diff(s); |
453 | 1504 } |
286 | 1505 s->i_count++; |
1506 | |
265
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
1507 /* restore ac coeffs & last_index stuff if we messed them up with the prediction */ |
1492 | 1508 if(s->ac_pred) |
1509 restore_ac_coeffs(s, block, dir, scan_table, zigzag_last_index); | |
265
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
1510 } |
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
1511 } |
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
1512 |
10752
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1513 /** |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1514 * encodes a 8x8 block. |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1515 * @param block the 8x8 block |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1516 * @param n block index (0-3 are luma, 4-5 are chroma) |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1517 */ |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1518 static void h263_encode_block(MpegEncContext * s, DCTELEM * block, int n) |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1519 { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1520 int level, run, last, i, j, last_index, last_non_zero, sign, slevel, code; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1521 RLTable *rl; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1522 |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1523 rl = &rl_inter; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1524 if (s->mb_intra && !s->h263_aic) { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1525 /* DC coef */ |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1526 level = block[0]; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1527 /* 255 cannot be represented, so we clamp */ |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1528 if (level > 254) { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1529 level = 254; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1530 block[0] = 254; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1531 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1532 /* 0 cannot be represented also */ |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1533 else if (level < 1) { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1534 level = 1; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1535 block[0] = 1; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1536 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1537 if (level == 128) //FIXME check rv10 |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1538 put_bits(&s->pb, 8, 0xff); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1539 else |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1540 put_bits(&s->pb, 8, level); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1541 i = 1; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1542 } else { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1543 i = 0; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1544 if (s->h263_aic && s->mb_intra) |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1545 rl = &rl_intra_aic; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1546 |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1547 if(s->alt_inter_vlc && !s->mb_intra){ |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1548 int aic_vlc_bits=0; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1549 int inter_vlc_bits=0; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1550 int wrong_pos=-1; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1551 int aic_code; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1552 |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1553 last_index = s->block_last_index[n]; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1554 last_non_zero = i - 1; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1555 for (; i <= last_index; i++) { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1556 j = s->intra_scantable.permutated[i]; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1557 level = block[j]; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1558 if (level) { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1559 run = i - last_non_zero - 1; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1560 last = (i == last_index); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1561 |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1562 if(level<0) level= -level; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1563 |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1564 code = get_rl_index(rl, last, run, level); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1565 aic_code = get_rl_index(&rl_intra_aic, last, run, level); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1566 inter_vlc_bits += rl->table_vlc[code][1]+1; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1567 aic_vlc_bits += rl_intra_aic.table_vlc[aic_code][1]+1; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1568 |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1569 if (code == rl->n) { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1570 inter_vlc_bits += 1+6+8-1; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1571 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1572 if (aic_code == rl_intra_aic.n) { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1573 aic_vlc_bits += 1+6+8-1; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1574 wrong_pos += run + 1; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1575 }else |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1576 wrong_pos += wrong_run[aic_code]; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1577 last_non_zero = i; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1578 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1579 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1580 i = 0; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1581 if(aic_vlc_bits < inter_vlc_bits && wrong_pos > 63) |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1582 rl = &rl_intra_aic; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1583 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1584 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1585 |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1586 /* AC coefs */ |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1587 last_index = s->block_last_index[n]; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1588 last_non_zero = i - 1; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1589 for (; i <= last_index; i++) { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1590 j = s->intra_scantable.permutated[i]; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1591 level = block[j]; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1592 if (level) { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1593 run = i - last_non_zero - 1; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1594 last = (i == last_index); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1595 sign = 0; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1596 slevel = level; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1597 if (level < 0) { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1598 sign = 1; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1599 level = -level; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1600 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1601 code = get_rl_index(rl, last, run, level); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1602 put_bits(&s->pb, rl->table_vlc[code][1], rl->table_vlc[code][0]); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1603 if (code == rl->n) { |
10787 | 1604 if(!CONFIG_FLV_ENCODER || s->h263_flv <= 1){ |
10752
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1605 put_bits(&s->pb, 1, last); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1606 put_bits(&s->pb, 6, run); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1607 |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1608 assert(slevel != 0); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1609 |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1610 if(level < 128) |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1611 put_sbits(&s->pb, 8, slevel); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1612 else{ |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1613 put_bits(&s->pb, 8, 128); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1614 put_sbits(&s->pb, 5, slevel); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1615 put_sbits(&s->pb, 6, slevel>>5); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1616 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1617 }else{ |
10787 | 1618 ff_flv2_encode_ac_esc(&s->pb, slevel, level, run, last); |
10752
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1619 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1620 } else { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1621 put_bits(&s->pb, 1, sign); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1622 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1623 last_non_zero = i; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1624 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1625 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1626 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1627 |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1628 /* Encode MV differences on H.263+ with Unrestricted MV mode */ |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1629 static void h263p_encode_umotion(MpegEncContext * s, int val) |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1630 { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1631 short sval = 0; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1632 short i = 0; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1633 short n_bits = 0; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1634 short temp_val; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1635 int code = 0; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1636 int tcode; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1637 |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1638 if ( val == 0) |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1639 put_bits(&s->pb, 1, 1); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1640 else if (val == 1) |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1641 put_bits(&s->pb, 3, 0); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1642 else if (val == -1) |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1643 put_bits(&s->pb, 3, 2); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1644 else { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1645 |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1646 sval = ((val < 0) ? (short)(-val):(short)val); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1647 temp_val = sval; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1648 |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1649 while (temp_val != 0) { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1650 temp_val = temp_val >> 1; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1651 n_bits++; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1652 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1653 |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1654 i = n_bits - 1; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1655 while (i > 0) { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1656 tcode = (sval & (1 << (i-1))) >> (i-1); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1657 tcode = (tcode << 1) | 1; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1658 code = (code << 2) | tcode; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1659 i--; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1660 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1661 code = ((code << 1) | (val < 0)) << 1; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1662 put_bits(&s->pb, (2*n_bits)+1, code); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1663 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1664 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1665 |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1666 static int h263_pred_dc(MpegEncContext * s, int n, int16_t **dc_val_ptr) |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1667 { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1668 int x, y, wrap, a, c, pred_dc; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1669 int16_t *dc_val; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1670 |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1671 /* find prediction */ |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1672 if (n < 4) { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1673 x = 2 * s->mb_x + (n & 1); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1674 y = 2 * s->mb_y + ((n & 2) >> 1); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1675 wrap = s->b8_stride; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1676 dc_val = s->dc_val[0]; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1677 } else { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1678 x = s->mb_x; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1679 y = s->mb_y; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1680 wrap = s->mb_stride; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1681 dc_val = s->dc_val[n - 4 + 1]; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1682 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1683 /* B C |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1684 * A X |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1685 */ |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1686 a = dc_val[(x - 1) + (y) * wrap]; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1687 c = dc_val[(x) + (y - 1) * wrap]; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1688 |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1689 /* No prediction outside GOB boundary */ |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1690 if(s->first_slice_line && n!=3){ |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1691 if(n!=2) c= 1024; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1692 if(n!=1 && s->mb_x == s->resync_mb_x) a= 1024; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1693 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1694 /* just DC prediction */ |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1695 if (a != 1024 && c != 1024) |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1696 pred_dc = (a + c) >> 1; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1697 else if (a != 1024) |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1698 pred_dc = a; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1699 else |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1700 pred_dc = c; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1701 |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1702 /* we assume pred is positive */ |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1703 *dc_val_ptr = &dc_val[x + y * wrap]; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1704 return pred_dc; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1705 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1706 |
0 | 1707 void h263_encode_mb(MpegEncContext * s, |
2979 | 1708 DCTELEM block[6][64], |
1709 int motion_x, int motion_y) | |
0 | 1710 { |
1711 int cbpc, cbpy, i, cbp, pred_x, pred_y; | |
1064 | 1712 int16_t pred_dc; |
1713 int16_t rec_intradc[6]; | |
3781 | 1714 int16_t *dc_ptr[6]; |
1353
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
1715 const int interleaved_stats= (s->flags&CODEC_FLAG_PASS1); |
2967 | 1716 |
324 | 1717 if (!s->mb_intra) { |
350
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1718 /* compute cbp */ |
1490
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1719 cbp= get_p_cbp(s, block, motion_x, motion_y); |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1720 |
1789 | 1721 if ((cbp | motion_x | motion_y | s->dquant | (s->mv_type - MV_TYPE_16X16)) == 0) { |
324 | 1722 /* skip macroblock */ |
1723 put_bits(&s->pb, 1, 1); | |
1353
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
1724 if(interleaved_stats){ |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
1725 s->misc_bits++; |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
1726 s->last_bits++; |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
1727 } |
1757
3906ddbaffec
optimization & bugfix extracted from the 4k line diff between ffmpeg 0.4.7 and http://www.alicestreet.com/ffh263.html
michael
parents:
1752
diff
changeset
|
1728 s->skip_count++; |
3906ddbaffec
optimization & bugfix extracted from the 4k line diff between ffmpeg 0.4.7 and http://www.alicestreet.com/ffh263.html
michael
parents:
1752
diff
changeset
|
1729 |
324 | 1730 return; |
1731 } | |
2979 | 1732 put_bits(&s->pb, 1, 0); /* mb coded */ |
2967 | 1733 |
324 | 1734 cbpc = cbp & 3; |
1637 | 1735 cbpy = cbp >> 2; |
1736 if(s->alt_inter_vlc==0 || cbpc!=3) | |
1737 cbpy ^= 0xF; | |
695 | 1738 if(s->dquant) cbpc+= 8; |
1633 | 1739 if(s->mv_type==MV_TYPE_16X16){ |
1740 put_bits(&s->pb, | |
1741 inter_MCBPC_bits[cbpc], | |
1742 inter_MCBPC_code[cbpc]); | |
1743 | |
1744 put_bits(&s->pb, cbpy_tab[cbpy][1], cbpy_tab[cbpy][0]); | |
1745 if(s->dquant) | |
1746 put_bits(&s->pb, 2, dquant_code[s->dquant+2]); | |
2967 | 1747 |
1633 | 1748 if(interleaved_stats){ |
1749 s->misc_bits+= get_bits_diff(s); | |
1750 } | |
1751 | |
1752 /* motion vectors: 16x16 mode */ | |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1936
diff
changeset
|
1753 h263_pred_motion(s, 0, 0, &pred_x, &pred_y); |
2967 | 1754 |
1755 if (!s->umvplus) { | |
2502 | 1756 ff_h263_encode_motion_vector(s, motion_x - pred_x, |
1757 motion_y - pred_y, 1); | |
1633 | 1758 } |
1759 else { | |
1760 h263p_encode_umotion(s, motion_x - pred_x); | |
1761 h263p_encode_umotion(s, motion_y - pred_y); | |
1762 if (((motion_x - pred_x) == 1) && ((motion_y - pred_y) == 1)) | |
1763 /* To prevent Start Code emulation */ | |
1764 put_bits(&s->pb,1,1); | |
1765 } | |
1766 }else{ | |
1767 put_bits(&s->pb, | |
1768 inter_MCBPC_bits[cbpc+16], | |
1769 inter_MCBPC_code[cbpc+16]); | |
1770 put_bits(&s->pb, cbpy_tab[cbpy][1], cbpy_tab[cbpy][0]); | |
1771 if(s->dquant) | |
1772 put_bits(&s->pb, 2, dquant_code[s->dquant+2]); | |
1773 | |
1774 if(interleaved_stats){ | |
1775 s->misc_bits+= get_bits_diff(s); | |
1776 } | |
1777 | |
1778 for(i=0; i<4; i++){ | |
1779 /* motion vectors: 8x8 mode*/ | |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1936
diff
changeset
|
1780 h263_pred_motion(s, i, 0, &pred_x, &pred_y); |
1633 | 1781 |
1668
30746f429df6
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1666
diff
changeset
|
1782 motion_x= s->current_picture.motion_val[0][ s->block_index[i] ][0]; |
30746f429df6
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1666
diff
changeset
|
1783 motion_y= s->current_picture.motion_val[0][ s->block_index[i] ][1]; |
2967 | 1784 if (!s->umvplus) { |
2502 | 1785 ff_h263_encode_motion_vector(s, motion_x - pred_x, |
1786 motion_y - pred_y, 1); | |
1633 | 1787 } |
1788 else { | |
1789 h263p_encode_umotion(s, motion_x - pred_x); | |
1790 h263p_encode_umotion(s, motion_y - pred_y); | |
1791 if (((motion_x - pred_x) == 1) && ((motion_y - pred_y) == 1)) | |
1792 /* To prevent Start Code emulation */ | |
1793 put_bits(&s->pb,1,1); | |
1794 } | |
1795 } | |
324 | 1796 } |
1353
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
1797 |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
1798 if(interleaved_stats){ |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
1799 s->mv_bits+= get_bits_diff(s); |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
1800 } |
350
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1801 } else { |
1639 | 1802 assert(s->mb_intra); |
2967 | 1803 |
350
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1804 cbp = 0; |
1666 | 1805 if (s->h263_aic) { |
350
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1806 /* Predict DC */ |
1666 | 1807 for(i=0; i<6; i++) { |
1064 | 1808 int16_t level = block[i][0]; |
1666 | 1809 int scale; |
2967 | 1810 |
1666 | 1811 if(i<4) scale= s->y_dc_scale; |
1812 else scale= s->c_dc_scale; | |
1813 | |
350
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1814 pred_dc = h263_pred_dc(s, i, &dc_ptr[i]); |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1815 level -= pred_dc; |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1816 /* Quant */ |
1666 | 1817 if (level >= 0) |
1818 level = (level + (scale>>1))/scale; | |
350
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1819 else |
1666 | 1820 level = (level - (scale>>1))/scale; |
2967 | 1821 |
350
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1822 /* AIC can change CBP */ |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1823 if (level == 0 && s->block_last_index[i] == 0) |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1824 s->block_last_index[i] = -1; |
1666 | 1825 |
1826 if(!s->modified_quant){ | |
1827 if (level < -127) | |
1828 level = -127; | |
1829 else if (level > 127) | |
1830 level = 127; | |
1831 } | |
1832 | |
350
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1833 block[i][0] = level; |
2967 | 1834 /* Reconstruction */ |
1666 | 1835 rec_intradc[i] = scale*level + pred_dc; |
350
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1836 /* Oddify */ |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1837 rec_intradc[i] |= 1; |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1838 //if ((rec_intradc[i] % 2) == 0) |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1839 // rec_intradc[i]++; |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1840 /* Clipping */ |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1841 if (rec_intradc[i] < 0) |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1842 rec_intradc[i] = 0; |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1843 else if (rec_intradc[i] > 2047) |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1844 rec_intradc[i] = 2047; |
2967 | 1845 |
350
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1846 /* Update AC/DC tables */ |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1847 *dc_ptr[i] = rec_intradc[i]; |
1666 | 1848 if (s->block_last_index[i] >= 0) |
1849 cbp |= 1 << (5 - i); | |
350
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1850 } |
1666 | 1851 }else{ |
1852 for(i=0; i<6; i++) { | |
1853 /* compute cbp */ | |
1854 if (s->block_last_index[i] >= 1) | |
1855 cbp |= 1 << (5 - i); | |
1856 } | |
350
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1857 } |
0 | 1858 |
350
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1859 cbpc = cbp & 3; |
6481 | 1860 if (s->pict_type == FF_I_TYPE) { |
695 | 1861 if(s->dquant) cbpc+=4; |
350
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1862 put_bits(&s->pb, |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1863 intra_MCBPC_bits[cbpc], |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1864 intra_MCBPC_code[cbpc]); |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1865 } else { |
695 | 1866 if(s->dquant) cbpc+=8; |
2979 | 1867 put_bits(&s->pb, 1, 0); /* mb coded */ |
350
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1868 put_bits(&s->pb, |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1869 inter_MCBPC_bits[cbpc + 4], |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1870 inter_MCBPC_code[cbpc + 4]); |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1871 } |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1872 if (s->h263_aic) { |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1873 /* XXX: currently, we do not try to use ac prediction */ |
2979 | 1874 put_bits(&s->pb, 1, 0); /* no AC prediction */ |
350
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1875 } |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1876 cbpy = cbp >> 2; |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1877 put_bits(&s->pb, cbpy_tab[cbpy][1], cbpy_tab[cbpy][0]); |
695 | 1878 if(s->dquant) |
1879 put_bits(&s->pb, 2, dquant_code[s->dquant+2]); | |
1353
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
1880 |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
1881 if(interleaved_stats){ |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
1882 s->misc_bits+= get_bits_diff(s); |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
1883 } |
0 | 1884 } |
1885 | |
350
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1886 for(i=0; i<6; i++) { |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1887 /* encode each block */ |
1354 | 1888 h263_encode_block(s, block[i], i); |
2967 | 1889 |
350
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1890 /* Update INTRADC for decoding */ |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1891 if (s->h263_aic && s->mb_intra) { |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1892 block[i][0] = rec_intradc[i]; |
2967 | 1893 |
350
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1894 } |
0 | 1895 } |
1353
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
1896 |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
1897 if(interleaved_stats){ |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
1898 if (!s->mb_intra) { |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
1899 s->p_tex_bits+= get_bits_diff(s); |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
1900 s->f_count++; |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
1901 }else{ |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
1902 s->i_tex_bits+= get_bits_diff(s); |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
1903 s->i_count++; |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
1904 } |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
1905 } |
0 | 1906 } |
815
78accc54493b
put a few large tables under #ifdef CONFIG_ENCODERS or dynamically allocate them
michaelni
parents:
770
diff
changeset
|
1907 #endif |
0 | 1908 |
1656 | 1909 void ff_h263_loop_filter(MpegEncContext * s){ |
1644 | 1910 int qp_c; |
1911 const int linesize = s->linesize; | |
1912 const int uvlinesize= s->uvlinesize; | |
1913 const int xy = s->mb_y * s->mb_stride + s->mb_x; | |
1914 uint8_t *dest_y = s->dest[0]; | |
1915 uint8_t *dest_cb= s->dest[1]; | |
1916 uint8_t *dest_cr= s->dest[2]; | |
2967 | 1917 |
6481 | 1918 // if(s->pict_type==FF_B_TYPE && !s->readable) return; |
1644 | 1919 |
1920 /* | |
1921 Diag Top | |
1922 Left Center | |
1923 */ | |
1924 if(!IS_SKIP(s->current_picture.mb_type[xy])){ | |
1925 qp_c= s->qscale; | |
1926 s->dsp.h263_v_loop_filter(dest_y+8*linesize , linesize, qp_c); | |
1927 s->dsp.h263_v_loop_filter(dest_y+8*linesize+8, linesize, qp_c); | |
1928 }else | |
1929 qp_c= 0; | |
1930 | |
1931 if(s->mb_y){ | |
8297
20e0f0809b27
s/qp_t/qp_tt/ to avoid bad examples that could lead to issues with reserved
michael
parents:
8288
diff
changeset
|
1932 int qp_dt, qp_tt, qp_tc; |
1644 | 1933 |
1934 if(IS_SKIP(s->current_picture.mb_type[xy-s->mb_stride])) | |
8297
20e0f0809b27
s/qp_t/qp_tt/ to avoid bad examples that could lead to issues with reserved
michael
parents:
8288
diff
changeset
|
1935 qp_tt=0; |
2967 | 1936 else |
8297
20e0f0809b27
s/qp_t/qp_tt/ to avoid bad examples that could lead to issues with reserved
michael
parents:
8288
diff
changeset
|
1937 qp_tt= s->current_picture.qscale_table[xy-s->mb_stride]; |
1644 | 1938 |
2967 | 1939 if(qp_c) |
1644 | 1940 qp_tc= qp_c; |
1941 else | |
8297
20e0f0809b27
s/qp_t/qp_tt/ to avoid bad examples that could lead to issues with reserved
michael
parents:
8288
diff
changeset
|
1942 qp_tc= qp_tt; |
2967 | 1943 |
1644 | 1944 if(qp_tc){ |
1945 const int chroma_qp= s->chroma_qscale_table[qp_tc]; | |
1946 s->dsp.h263_v_loop_filter(dest_y , linesize, qp_tc); | |
1947 s->dsp.h263_v_loop_filter(dest_y+8, linesize, qp_tc); | |
2967 | 1948 |
1644 | 1949 s->dsp.h263_v_loop_filter(dest_cb , uvlinesize, chroma_qp); |
1950 s->dsp.h263_v_loop_filter(dest_cr , uvlinesize, chroma_qp); | |
1951 } | |
2967 | 1952 |
8297
20e0f0809b27
s/qp_t/qp_tt/ to avoid bad examples that could lead to issues with reserved
michael
parents:
8288
diff
changeset
|
1953 if(qp_tt) |
20e0f0809b27
s/qp_t/qp_tt/ to avoid bad examples that could lead to issues with reserved
michael
parents:
8288
diff
changeset
|
1954 s->dsp.h263_h_loop_filter(dest_y-8*linesize+8 , linesize, qp_tt); |
2967 | 1955 |
1644 | 1956 if(s->mb_x){ |
8297
20e0f0809b27
s/qp_t/qp_tt/ to avoid bad examples that could lead to issues with reserved
michael
parents:
8288
diff
changeset
|
1957 if(qp_tt || IS_SKIP(s->current_picture.mb_type[xy-1-s->mb_stride])) |
20e0f0809b27
s/qp_t/qp_tt/ to avoid bad examples that could lead to issues with reserved
michael
parents:
8288
diff
changeset
|
1958 qp_dt= qp_tt; |
1644 | 1959 else |
1960 qp_dt= s->current_picture.qscale_table[xy-1-s->mb_stride]; | |
2967 | 1961 |
1644 | 1962 if(qp_dt){ |
1963 const int chroma_qp= s->chroma_qscale_table[qp_dt]; | |
1964 s->dsp.h263_h_loop_filter(dest_y -8*linesize , linesize, qp_dt); | |
1965 s->dsp.h263_h_loop_filter(dest_cb-8*uvlinesize, uvlinesize, chroma_qp); | |
2178 | 1966 s->dsp.h263_h_loop_filter(dest_cr-8*uvlinesize, uvlinesize, chroma_qp); |
1644 | 1967 } |
1968 } | |
1969 } | |
1970 | |
1971 if(qp_c){ | |
1972 s->dsp.h263_h_loop_filter(dest_y +8, linesize, qp_c); | |
1973 if(s->mb_y + 1 == s->mb_height) | |
1974 s->dsp.h263_h_loop_filter(dest_y+8*linesize+8, linesize, qp_c); | |
1975 } | |
2967 | 1976 |
1644 | 1977 if(s->mb_x){ |
1978 int qp_lc; | |
1979 if(qp_c || IS_SKIP(s->current_picture.mb_type[xy-1])) | |
1980 qp_lc= qp_c; | |
1981 else | |
1982 qp_lc= s->current_picture.qscale_table[xy-1]; | |
2967 | 1983 |
1644 | 1984 if(qp_lc){ |
1985 s->dsp.h263_h_loop_filter(dest_y, linesize, qp_lc); | |
1986 if(s->mb_y + 1 == s->mb_height){ | |
1987 const int chroma_qp= s->chroma_qscale_table[qp_lc]; | |
1988 s->dsp.h263_h_loop_filter(dest_y +8* linesize, linesize, qp_lc); | |
1989 s->dsp.h263_h_loop_filter(dest_cb , uvlinesize, chroma_qp); | |
1990 s->dsp.h263_h_loop_filter(dest_cr , uvlinesize, chroma_qp); | |
1991 } | |
1992 } | |
1993 } | |
1994 } | |
1995 | |
1057 | 1996 static void h263_pred_acdc(MpegEncContext * s, DCTELEM *block, int n) |
248
56ee684c48bb
- H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents:
245
diff
changeset
|
1997 { |
249
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
1998 int x, y, wrap, a, c, pred_dc, scale, i; |
3781 | 1999 int16_t *dc_val, *ac_val, *ac_val1; |
248
56ee684c48bb
- H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents:
245
diff
changeset
|
2000 |
56ee684c48bb
- H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents:
245
diff
changeset
|
2001 /* find prediction */ |
56ee684c48bb
- H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents:
245
diff
changeset
|
2002 if (n < 4) { |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1936
diff
changeset
|
2003 x = 2 * s->mb_x + (n & 1); |
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1936
diff
changeset
|
2004 y = 2 * s->mb_y + (n>> 1); |
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1936
diff
changeset
|
2005 wrap = s->b8_stride; |
248
56ee684c48bb
- H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents:
245
diff
changeset
|
2006 dc_val = s->dc_val[0]; |
249
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
2007 ac_val = s->ac_val[0][0]; |
248
56ee684c48bb
- H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents:
245
diff
changeset
|
2008 scale = s->y_dc_scale; |
56ee684c48bb
- H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents:
245
diff
changeset
|
2009 } else { |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1936
diff
changeset
|
2010 x = s->mb_x; |
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1936
diff
changeset
|
2011 y = s->mb_y; |
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1936
diff
changeset
|
2012 wrap = s->mb_stride; |
248
56ee684c48bb
- H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents:
245
diff
changeset
|
2013 dc_val = s->dc_val[n - 4 + 1]; |
249
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
2014 ac_val = s->ac_val[n - 4 + 1][0]; |
248
56ee684c48bb
- H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents:
245
diff
changeset
|
2015 scale = s->c_dc_scale; |
56ee684c48bb
- H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents:
245
diff
changeset
|
2016 } |
2967 | 2017 |
249
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
2018 ac_val += ((y) * wrap + (x)) * 16; |
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
2019 ac_val1 = ac_val; |
2967 | 2020 |
248
56ee684c48bb
- H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents:
245
diff
changeset
|
2021 /* B C |
2967 | 2022 * A X |
248
56ee684c48bb
- H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents:
245
diff
changeset
|
2023 */ |
56ee684c48bb
- H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents:
245
diff
changeset
|
2024 a = dc_val[(x - 1) + (y) * wrap]; |
56ee684c48bb
- H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents:
245
diff
changeset
|
2025 c = dc_val[(x) + (y - 1) * wrap]; |
2967 | 2026 |
350
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
2027 /* No prediction outside GOB boundary */ |
1639 | 2028 if(s->first_slice_line && n!=3){ |
2029 if(n!=2) c= 1024; | |
2030 if(n!=1 && s->mb_x == s->resync_mb_x) a= 1024; | |
2031 } | |
2967 | 2032 |
248
56ee684c48bb
- H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents:
245
diff
changeset
|
2033 if (s->ac_pred) { |
1639 | 2034 pred_dc = 1024; |
248
56ee684c48bb
- H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents:
245
diff
changeset
|
2035 if (s->h263_aic_dir) { |
56ee684c48bb
- H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents:
245
diff
changeset
|
2036 /* left prediction */ |
249
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
2037 if (a != 1024) { |
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
2038 ac_val -= 16; |
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
2039 for(i=1;i<8;i++) { |
1092 | 2040 block[s->dsp.idct_permutation[i<<3]] += ac_val[i]; |
249
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
2041 } |
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
2042 pred_dc = a; |
248
56ee684c48bb
- H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents:
245
diff
changeset
|
2043 } |
56ee684c48bb
- H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents:
245
diff
changeset
|
2044 } else { |
56ee684c48bb
- H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents:
245
diff
changeset
|
2045 /* top prediction */ |
249
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
2046 if (c != 1024) { |
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
2047 ac_val -= 16 * wrap; |
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
2048 for(i=1;i<8;i++) { |
1092 | 2049 block[s->dsp.idct_permutation[i ]] += ac_val[i + 8]; |
249
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
2050 } |
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
2051 pred_dc = c; |
248
56ee684c48bb
- H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents:
245
diff
changeset
|
2052 } |
56ee684c48bb
- H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents:
245
diff
changeset
|
2053 } |
249
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
2054 } else { |
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
2055 /* just DC prediction */ |
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
2056 if (a != 1024 && c != 1024) |
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
2057 pred_dc = (a + c) >> 1; |
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
2058 else if (a != 1024) |
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
2059 pred_dc = a; |
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
2060 else |
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
2061 pred_dc = c; |
248
56ee684c48bb
- H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents:
245
diff
changeset
|
2062 } |
2967 | 2063 |
249
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
2064 /* we assume pred is positive */ |
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
2065 block[0]=block[0]*scale + pred_dc; |
2967 | 2066 |
249
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
2067 if (block[0] < 0) |
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
2068 block[0] = 0; |
2967 | 2069 else |
1639 | 2070 block[0] |= 1; |
2967 | 2071 |
249
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
2072 /* Update AC/DC tables */ |
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
2073 dc_val[(x) + (y) * wrap] = block[0]; |
2967 | 2074 |
248
56ee684c48bb
- H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents:
245
diff
changeset
|
2075 /* left copy */ |
56ee684c48bb
- H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents:
245
diff
changeset
|
2076 for(i=1;i<8;i++) |
1092 | 2077 ac_val1[i ] = block[s->dsp.idct_permutation[i<<3]]; |
248
56ee684c48bb
- H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents:
245
diff
changeset
|
2078 /* top copy */ |
56ee684c48bb
- H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents:
245
diff
changeset
|
2079 for(i=1;i<8;i++) |
1092 | 2080 ac_val1[8 + i] = block[s->dsp.idct_permutation[i ]]; |
248
56ee684c48bb
- H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents:
245
diff
changeset
|
2081 } |
56ee684c48bb
- H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents:
245
diff
changeset
|
2082 |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1936
diff
changeset
|
2083 int16_t *h263_pred_motion(MpegEncContext * s, int block, int dir, |
0 | 2084 int *px, int *py) |
2085 { | |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1936
diff
changeset
|
2086 int wrap; |
1655 | 2087 int16_t *A, *B, *C, (*mot_val)[2]; |
2088 static const int off[4]= {2, 1, 1, -1}; | |
2089 | |
2090 wrap = s->b8_stride; | |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1936
diff
changeset
|
2091 mot_val = s->current_picture.motion_val[dir] + s->block_index[block]; |
1655 | 2092 |
2093 A = mot_val[ - 1]; | |
2094 /* special case for first (slice) line */ | |
2095 if (s->first_slice_line && block<3) { | |
2646
c735e3e60ca7
Even More spelling errors. patch by (Kevin Baragona <kevinmb500 gawab com)
michael
parents:
2639
diff
changeset
|
2096 // we can't just change some MVs to simulate that as we need them for the B frames (and ME) |
1655 | 2097 // and if we ever support non rectangular objects than we need to do a few ifs here anyway :( |
2098 if(block==0){ //most common case | |
2099 if(s->mb_x == s->resync_mb_x){ //rare | |
2100 *px= *py = 0; | |
2101 }else if(s->mb_x + 1 == s->resync_mb_x && s->h263_pred){ //rare | |
2102 C = mot_val[off[block] - wrap]; | |
2103 if(s->mb_x==0){ | |
2104 *px = C[0]; | |
2105 *py = C[1]; | |
2106 }else{ | |
2107 *px = mid_pred(A[0], 0, C[0]); | |
2108 *py = mid_pred(A[1], 0, C[1]); | |
2109 } | |
2110 }else{ | |
2111 *px = A[0]; | |
2112 *py = A[1]; | |
2113 } | |
2114 }else if(block==1){ | |
2115 if(s->mb_x + 1 == s->resync_mb_x && s->h263_pred){ //rare | |
2116 C = mot_val[off[block] - wrap]; | |
2117 *px = mid_pred(A[0], 0, C[0]); | |
2118 *py = mid_pred(A[1], 0, C[1]); | |
2119 }else{ | |
2120 *px = A[0]; | |
2121 *py = A[1]; | |
2122 } | |
2123 }else{ /* block==2*/ | |
2124 B = mot_val[ - wrap]; | |
2125 C = mot_val[off[block] - wrap]; | |
2126 if(s->mb_x == s->resync_mb_x) //rare | |
2127 A[0]=A[1]=0; | |
2967 | 2128 |
1655 | 2129 *px = mid_pred(A[0], B[0], C[0]); |
2130 *py = mid_pred(A[1], B[1], C[1]); | |
2131 } | |
2132 } else { | |
2133 B = mot_val[ - wrap]; | |
2134 C = mot_val[off[block] - wrap]; | |
2135 *px = mid_pred(A[0], B[0], C[0]); | |
2136 *py = mid_pred(A[1], B[1], C[1]); | |
2137 } | |
2138 return *mot_val; | |
2139 } | |
2140 | |
8590 | 2141 #if CONFIG_ENCODERS |
10755
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2142 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2143 /***************************************************/ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2144 /** |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2145 * add mpeg4 stuffing bits (01...1) |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2146 */ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2147 void ff_mpeg4_stuffing(PutBitContext * pbc) |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2148 { |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2149 int length; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2150 put_bits(pbc, 1, 0); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2151 length= (-put_bits_count(pbc))&7; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2152 if(length) put_bits(pbc, length, (1<<length)-1); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2153 } |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2154 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2155 /* must be called before writing the header */ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2156 void ff_set_mpeg4_time(MpegEncContext * s){ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2157 if(s->pict_type==FF_B_TYPE){ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2158 ff_mpeg4_init_direct_mv(s); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2159 }else{ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2160 s->last_time_base= s->time_base; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2161 s->time_base= s->time/s->avctx->time_base.den; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2162 } |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2163 } |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2164 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2165 static void mpeg4_encode_gop_header(MpegEncContext * s){ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2166 int hours, minutes, seconds; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2167 int64_t time; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2168 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2169 put_bits(&s->pb, 16, 0); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2170 put_bits(&s->pb, 16, GOP_STARTCODE); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2171 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2172 time= s->current_picture_ptr->pts; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2173 if(s->reordered_input_picture[1]) |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2174 time= FFMIN(time, s->reordered_input_picture[1]->pts); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2175 time= time*s->avctx->time_base.num; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2176 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2177 seconds= time/s->avctx->time_base.den; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2178 minutes= seconds/60; seconds %= 60; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2179 hours= minutes/60; minutes %= 60; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2180 hours%=24; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2181 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2182 put_bits(&s->pb, 5, hours); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2183 put_bits(&s->pb, 6, minutes); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2184 put_bits(&s->pb, 1, 1); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2185 put_bits(&s->pb, 6, seconds); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2186 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2187 put_bits(&s->pb, 1, !!(s->flags&CODEC_FLAG_CLOSED_GOP)); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2188 put_bits(&s->pb, 1, 0); //broken link == NO |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2189 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2190 s->last_time_base= time / s->avctx->time_base.den; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2191 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2192 ff_mpeg4_stuffing(&s->pb); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2193 } |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2194 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2195 static void mpeg4_encode_visual_object_header(MpegEncContext * s){ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2196 int profile_and_level_indication; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2197 int vo_ver_id; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2198 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2199 if(s->avctx->profile != FF_PROFILE_UNKNOWN){ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2200 profile_and_level_indication = s->avctx->profile << 4; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2201 }else if(s->max_b_frames || s->quarter_sample){ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2202 profile_and_level_indication= 0xF0; // adv simple |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2203 }else{ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2204 profile_and_level_indication= 0x00; // simple |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2205 } |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2206 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2207 if(s->avctx->level != FF_LEVEL_UNKNOWN){ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2208 profile_and_level_indication |= s->avctx->level; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2209 }else{ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2210 profile_and_level_indication |= 1; //level 1 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2211 } |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2212 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2213 if(profile_and_level_indication>>4 == 0xF){ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2214 vo_ver_id= 5; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2215 }else{ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2216 vo_ver_id= 1; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2217 } |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2218 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2219 //FIXME levels |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2220 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2221 put_bits(&s->pb, 16, 0); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2222 put_bits(&s->pb, 16, VOS_STARTCODE); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2223 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2224 put_bits(&s->pb, 8, profile_and_level_indication); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2225 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2226 put_bits(&s->pb, 16, 0); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2227 put_bits(&s->pb, 16, VISUAL_OBJ_STARTCODE); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2228 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2229 put_bits(&s->pb, 1, 1); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2230 put_bits(&s->pb, 4, vo_ver_id); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2231 put_bits(&s->pb, 3, 1); //priority |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2232 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2233 put_bits(&s->pb, 4, 1); //visual obj type== video obj |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2234 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2235 put_bits(&s->pb, 1, 0); //video signal type == no clue //FIXME |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2236 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2237 ff_mpeg4_stuffing(&s->pb); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2238 } |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2239 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2240 static void mpeg4_encode_vol_header(MpegEncContext * s, int vo_number, int vol_number) |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2241 { |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2242 int vo_ver_id; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2243 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2244 if (!CONFIG_MPEG4_ENCODER) return; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2245 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2246 if(s->max_b_frames || s->quarter_sample){ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2247 vo_ver_id= 5; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2248 s->vo_type= ADV_SIMPLE_VO_TYPE; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2249 }else{ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2250 vo_ver_id= 1; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2251 s->vo_type= SIMPLE_VO_TYPE; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2252 } |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2253 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2254 put_bits(&s->pb, 16, 0); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2255 put_bits(&s->pb, 16, 0x100 + vo_number); /* video obj */ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2256 put_bits(&s->pb, 16, 0); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2257 put_bits(&s->pb, 16, 0x120 + vol_number); /* video obj layer */ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2258 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2259 put_bits(&s->pb, 1, 0); /* random access vol */ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2260 put_bits(&s->pb, 8, s->vo_type); /* video obj type indication */ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2261 if(s->workaround_bugs & FF_BUG_MS) { |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2262 put_bits(&s->pb, 1, 0); /* is obj layer id= no */ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2263 } else { |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2264 put_bits(&s->pb, 1, 1); /* is obj layer id= yes */ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2265 put_bits(&s->pb, 4, vo_ver_id); /* is obj layer ver id */ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2266 put_bits(&s->pb, 3, 1); /* is obj layer priority */ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2267 } |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2268 |
10785 | 2269 s->aspect_ratio_info= aspect_to_info(s->avctx->sample_aspect_ratio); |
10755
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2270 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2271 put_bits(&s->pb, 4, s->aspect_ratio_info);/* aspect ratio info */ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2272 if (s->aspect_ratio_info == FF_ASPECT_EXTENDED){ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2273 put_bits(&s->pb, 8, s->avctx->sample_aspect_ratio.num); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2274 put_bits(&s->pb, 8, s->avctx->sample_aspect_ratio.den); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2275 } |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2276 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2277 if(s->workaround_bugs & FF_BUG_MS) { // |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2278 put_bits(&s->pb, 1, 0); /* vol control parameters= no @@@ */ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2279 } else { |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2280 put_bits(&s->pb, 1, 1); /* vol control parameters= yes */ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2281 put_bits(&s->pb, 2, 1); /* chroma format YUV 420/YV12 */ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2282 put_bits(&s->pb, 1, s->low_delay); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2283 put_bits(&s->pb, 1, 0); /* vbv parameters= no */ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2284 } |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2285 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2286 put_bits(&s->pb, 2, RECT_SHAPE); /* vol shape= rectangle */ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2287 put_bits(&s->pb, 1, 1); /* marker bit */ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2288 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2289 put_bits(&s->pb, 16, s->avctx->time_base.den); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2290 if (s->time_increment_bits < 1) |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2291 s->time_increment_bits = 1; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2292 put_bits(&s->pb, 1, 1); /* marker bit */ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2293 put_bits(&s->pb, 1, 0); /* fixed vop rate=no */ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2294 put_bits(&s->pb, 1, 1); /* marker bit */ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2295 put_bits(&s->pb, 13, s->width); /* vol width */ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2296 put_bits(&s->pb, 1, 1); /* marker bit */ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2297 put_bits(&s->pb, 13, s->height); /* vol height */ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2298 put_bits(&s->pb, 1, 1); /* marker bit */ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2299 put_bits(&s->pb, 1, s->progressive_sequence ? 0 : 1); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2300 put_bits(&s->pb, 1, 1); /* obmc disable */ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2301 if (vo_ver_id == 1) { |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2302 put_bits(&s->pb, 1, s->vol_sprite_usage); /* sprite enable */ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2303 }else{ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2304 put_bits(&s->pb, 2, s->vol_sprite_usage); /* sprite enable */ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2305 } |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2306 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2307 put_bits(&s->pb, 1, 0); /* not 8 bit == false */ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2308 put_bits(&s->pb, 1, s->mpeg_quant); /* quant type= (0=h263 style)*/ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2309 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2310 if(s->mpeg_quant){ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2311 ff_write_quant_matrix(&s->pb, s->avctx->intra_matrix); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2312 ff_write_quant_matrix(&s->pb, s->avctx->inter_matrix); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2313 } |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2314 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2315 if (vo_ver_id != 1) |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2316 put_bits(&s->pb, 1, s->quarter_sample); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2317 put_bits(&s->pb, 1, 1); /* complexity estimation disable */ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2318 s->resync_marker= s->rtp_mode; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2319 put_bits(&s->pb, 1, s->resync_marker ? 0 : 1);/* resync marker disable */ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2320 put_bits(&s->pb, 1, s->data_partitioning ? 1 : 0); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2321 if(s->data_partitioning){ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2322 put_bits(&s->pb, 1, 0); /* no rvlc */ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2323 } |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2324 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2325 if (vo_ver_id != 1){ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2326 put_bits(&s->pb, 1, 0); /* newpred */ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2327 put_bits(&s->pb, 1, 0); /* reduced res vop */ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2328 } |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2329 put_bits(&s->pb, 1, 0); /* scalability */ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2330 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2331 ff_mpeg4_stuffing(&s->pb); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2332 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2333 /* user data */ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2334 if(!(s->flags & CODEC_FLAG_BITEXACT)){ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2335 put_bits(&s->pb, 16, 0); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2336 put_bits(&s->pb, 16, 0x1B2); /* user_data */ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2337 ff_put_string(&s->pb, LIBAVCODEC_IDENT, 0); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2338 } |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2339 } |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2340 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2341 /* write mpeg4 VOP header */ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2342 void mpeg4_encode_picture_header(MpegEncContext * s, int picture_number) |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2343 { |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2344 int time_incr; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2345 int time_div, time_mod; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2346 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2347 if(s->pict_type==FF_I_TYPE){ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2348 if(!(s->flags&CODEC_FLAG_GLOBAL_HEADER)){ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2349 if(s->strict_std_compliance < FF_COMPLIANCE_VERY_STRICT) //HACK, the reference sw is buggy |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2350 mpeg4_encode_visual_object_header(s); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2351 if(s->strict_std_compliance < FF_COMPLIANCE_VERY_STRICT || picture_number==0) //HACK, the reference sw is buggy |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2352 mpeg4_encode_vol_header(s, 0, 0); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2353 } |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2354 if(!(s->workaround_bugs & FF_BUG_MS)) |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2355 mpeg4_encode_gop_header(s); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2356 } |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2357 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2358 s->partitioned_frame= s->data_partitioning && s->pict_type!=FF_B_TYPE; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2359 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2360 put_bits(&s->pb, 16, 0); /* vop header */ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2361 put_bits(&s->pb, 16, VOP_STARTCODE); /* vop header */ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2362 put_bits(&s->pb, 2, s->pict_type - 1); /* pict type: I = 0 , P = 1 */ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2363 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2364 assert(s->time>=0); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2365 time_div= s->time/s->avctx->time_base.den; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2366 time_mod= s->time%s->avctx->time_base.den; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2367 time_incr= time_div - s->last_time_base; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2368 assert(time_incr >= 0); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2369 while(time_incr--) |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2370 put_bits(&s->pb, 1, 1); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2371 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2372 put_bits(&s->pb, 1, 0); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2373 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2374 put_bits(&s->pb, 1, 1); /* marker */ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2375 put_bits(&s->pb, s->time_increment_bits, time_mod); /* time increment */ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2376 put_bits(&s->pb, 1, 1); /* marker */ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2377 put_bits(&s->pb, 1, 1); /* vop coded */ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2378 if ( s->pict_type == FF_P_TYPE |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2379 || (s->pict_type == FF_S_TYPE && s->vol_sprite_usage==GMC_SPRITE)) { |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2380 put_bits(&s->pb, 1, s->no_rounding); /* rounding type */ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2381 } |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2382 put_bits(&s->pb, 3, 0); /* intra dc VLC threshold */ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2383 if(!s->progressive_sequence){ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2384 put_bits(&s->pb, 1, s->current_picture_ptr->top_field_first); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2385 put_bits(&s->pb, 1, s->alternate_scan); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2386 } |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2387 //FIXME sprite stuff |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2388 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2389 put_bits(&s->pb, 5, s->qscale); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2390 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2391 if (s->pict_type != FF_I_TYPE) |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2392 put_bits(&s->pb, 3, s->f_code); /* fcode_for */ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2393 if (s->pict_type == FF_B_TYPE) |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2394 put_bits(&s->pb, 3, s->b_code); /* fcode_back */ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2395 } |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2396 |
2017 | 2397 void ff_h263_encode_motion(MpegEncContext * s, int val, int f_code) |
0 | 2398 { |
702 | 2399 int range, l, bit_size, sign, code, bits; |
0 | 2400 |
2401 if (val == 0) { | |
2402 /* zero vector */ | |
2403 code = 0; | |
2404 put_bits(&s->pb, mvtab[code][1], mvtab[code][0]); | |
2405 } else { | |
324 | 2406 bit_size = f_code - 1; |
0 | 2407 range = 1 << bit_size; |
2408 /* modulo encoding */ | |
2093 | 2409 l= INT_BIT - 6 - bit_size; |
2410 val = (val<<l)>>l; | |
702 | 2411 sign = val>>31; |
2412 val= (val^sign)-sign; | |
2413 sign&=1; | |
2093 | 2414 |
312 | 2415 val--; |
2416 code = (val >> bit_size) + 1; | |
2417 bits = val & (range - 1); | |
0 | 2418 |
2967 | 2419 put_bits(&s->pb, mvtab[code][1] + 1, (mvtab[code][0] << 1) | sign); |
0 | 2420 if (bit_size > 0) { |
2421 put_bits(&s->pb, bit_size, bits); | |
2422 } | |
2423 } | |
2424 } | |
2425 | |
277
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
274
diff
changeset
|
2426 static void init_mv_penalty_and_fcode(MpegEncContext *s) |
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
274
diff
changeset
|
2427 { |
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
274
diff
changeset
|
2428 int f_code; |
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
274
diff
changeset
|
2429 int mv; |
2967 | 2430 |
277
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
274
diff
changeset
|
2431 for(f_code=1; f_code<=MAX_FCODE; f_code++){ |
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
274
diff
changeset
|
2432 for(mv=-MAX_MV; mv<=MAX_MV; mv++){ |
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
274
diff
changeset
|
2433 int len; |
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
274
diff
changeset
|
2434 |
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
274
diff
changeset
|
2435 if(mv==0) len= mvtab[0][1]; |
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
274
diff
changeset
|
2436 else{ |
9465
9dcb191f1df3
Remove unused variable in init_mv_penalty_and_fcode() found by CSA.
michael
parents:
9458
diff
changeset
|
2437 int val, bit_size, code; |
277
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
274
diff
changeset
|
2438 |
1893
779bdf5063ce
1000000l (using uninitalized variable for initalizing bits per MV table)
michael
parents:
1873
diff
changeset
|
2439 bit_size = f_code - 1; |
277
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
274
diff
changeset
|
2440 |
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
274
diff
changeset
|
2441 val=mv; |
2967 | 2442 if (val < 0) |
277
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
274
diff
changeset
|
2443 val = -val; |
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
274
diff
changeset
|
2444 val--; |
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
274
diff
changeset
|
2445 code = (val >> bit_size) + 1; |
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
274
diff
changeset
|
2446 if(code<33){ |
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
274
diff
changeset
|
2447 len= mvtab[code][1] + 1 + bit_size; |
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
274
diff
changeset
|
2448 }else{ |
2985 | 2449 len= mvtab[32][1] + av_log2(code>>5) + 2 + bit_size; |
277
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
274
diff
changeset
|
2450 } |
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
274
diff
changeset
|
2451 } |
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
274
diff
changeset
|
2452 |
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
274
diff
changeset
|
2453 mv_penalty[f_code][mv+MAX_MV]= len; |
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
274
diff
changeset
|
2454 } |
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
274
diff
changeset
|
2455 } |
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
274
diff
changeset
|
2456 |
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
274
diff
changeset
|
2457 for(f_code=MAX_FCODE; f_code>0; f_code--){ |
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
274
diff
changeset
|
2458 for(mv=-(16<<f_code); mv<(16<<f_code); mv++){ |
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
274
diff
changeset
|
2459 fcode_tab[mv+MAX_MV]= f_code; |
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
274
diff
changeset
|
2460 } |
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
274
diff
changeset
|
2461 } |
287 | 2462 |
2463 for(mv=0; mv<MAX_MV*2+1; mv++){ | |
2464 umv_fcode_tab[mv]= 1; | |
2465 } | |
277
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
274
diff
changeset
|
2466 } |
1070
6da5ae9ee199
more #ifdef CONFIG_ENCODERS patch by (Wolfgang Hesseler <qv at multimediaware dot com>) with modifications by me (s/WOLFGANG/CONFIG_ENCODERS/ and some other fixes)
michaelni
parents:
1068
diff
changeset
|
2467 |
468 | 2468 static void init_uni_dc_tab(void) |
293 | 2469 { |
2470 int level, uni_code, uni_len; | |
2471 | |
312 | 2472 for(level=-256; level<256; level++){ |
293 | 2473 int size, v, l; |
2474 /* find number of bits */ | |
2475 size = 0; | |
2476 v = abs(level); | |
2477 while (v) { | |
2478 v >>= 1; | |
2979 | 2479 size++; |
293 | 2480 } |
2481 | |
2482 if (level < 0) | |
2483 l= (-level) ^ ((1 << size) - 1); | |
2484 else | |
2485 l= level; | |
2486 | |
2487 /* luminance */ | |
2488 uni_code= DCtab_lum[size][0]; | |
2489 uni_len = DCtab_lum[size][1]; | |
2490 | |
2491 if (size > 0) { | |
2492 uni_code<<=size; uni_code|=l; | |
2493 uni_len+=size; | |
2494 if (size > 8){ | |
2495 uni_code<<=1; uni_code|=1; | |
2496 uni_len++; | |
2497 } | |
2498 } | |
1013 | 2499 uni_DCtab_lum_bits[level+256]= uni_code; |
2500 uni_DCtab_lum_len [level+256]= uni_len; | |
293 | 2501 |
2502 /* chrominance */ | |
2503 uni_code= DCtab_chrom[size][0]; | |
2504 uni_len = DCtab_chrom[size][1]; | |
2967 | 2505 |
293 | 2506 if (size > 0) { |
2507 uni_code<<=size; uni_code|=l; | |
2508 uni_len+=size; | |
2509 if (size > 8){ | |
2510 uni_code<<=1; uni_code|=1; | |
2511 uni_len++; | |
2512 } | |
2513 } | |
1013 | 2514 uni_DCtab_chrom_bits[level+256]= uni_code; |
2515 uni_DCtab_chrom_len [level+256]= uni_len; | |
293 | 2516 |
2517 } | |
2518 } | |
2519 | |
1064 | 2520 static void init_uni_mpeg4_rl_tab(RLTable *rl, uint32_t *bits_tab, uint8_t *len_tab){ |
648
dddcff6841f2
optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents:
619
diff
changeset
|
2521 int slevel, run, last; |
2967 | 2522 |
648
dddcff6841f2
optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents:
619
diff
changeset
|
2523 assert(MAX_LEVEL >= 64); |
dddcff6841f2
optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents:
619
diff
changeset
|
2524 assert(MAX_RUN >= 63); |
dddcff6841f2
optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents:
619
diff
changeset
|
2525 |
dddcff6841f2
optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents:
619
diff
changeset
|
2526 for(slevel=-64; slevel<64; slevel++){ |
dddcff6841f2
optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents:
619
diff
changeset
|
2527 if(slevel==0) continue; |
dddcff6841f2
optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents:
619
diff
changeset
|
2528 for(run=0; run<64; run++){ |
dddcff6841f2
optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents:
619
diff
changeset
|
2529 for(last=0; last<=1; last++){ |
dddcff6841f2
optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents:
619
diff
changeset
|
2530 const int index= UNI_MPEG4_ENC_INDEX(last, run, slevel+64); |
dddcff6841f2
optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents:
619
diff
changeset
|
2531 int level= slevel < 0 ? -slevel : slevel; |
dddcff6841f2
optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents:
619
diff
changeset
|
2532 int sign= slevel < 0 ? 1 : 0; |
dddcff6841f2
optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents:
619
diff
changeset
|
2533 int bits, len, code; |
dddcff6841f2
optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents:
619
diff
changeset
|
2534 int level1, run1; |
2967 | 2535 |
648
dddcff6841f2
optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents:
619
diff
changeset
|
2536 len_tab[index]= 100; |
2967 | 2537 |
648
dddcff6841f2
optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents:
619
diff
changeset
|
2538 /* ESC0 */ |
dddcff6841f2
optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents:
619
diff
changeset
|
2539 code= get_rl_index(rl, last, run, level); |
dddcff6841f2
optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents:
619
diff
changeset
|
2540 bits= rl->table_vlc[code][0]; |
dddcff6841f2
optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents:
619
diff
changeset
|
2541 len= rl->table_vlc[code][1]; |
dddcff6841f2
optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents:
619
diff
changeset
|
2542 bits=bits*2+sign; len++; |
2967 | 2543 |
648
dddcff6841f2
optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents:
619
diff
changeset
|
2544 if(code!=rl->n && len < len_tab[index]){ |
dddcff6841f2
optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents:
619
diff
changeset
|
2545 bits_tab[index]= bits; |
dddcff6841f2
optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents:
619
diff
changeset
|
2546 len_tab [index]= len; |
dddcff6841f2
optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents:
619
diff
changeset
|
2547 } |
dddcff6841f2
optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents:
619
diff
changeset
|
2548 /* ESC1 */ |
dddcff6841f2
optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents:
619
diff
changeset
|
2549 bits= rl->table_vlc[rl->n][0]; |
dddcff6841f2
optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents:
619
diff
changeset
|
2550 len= rl->table_vlc[rl->n][1]; |
dddcff6841f2
optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents:
619
diff
changeset
|
2551 bits=bits*2; len++; //esc1 |
dddcff6841f2
optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents:
619
diff
changeset
|
2552 level1= level - rl->max_level[last][run]; |
dddcff6841f2
optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents:
619
diff
changeset
|
2553 if(level1>0){ |
dddcff6841f2
optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents:
619
diff
changeset
|
2554 code= get_rl_index(rl, last, run, level1); |
dddcff6841f2
optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents:
619
diff
changeset
|
2555 bits<<= rl->table_vlc[code][1]; |
dddcff6841f2
optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents:
619
diff
changeset
|
2556 len += rl->table_vlc[code][1]; |
dddcff6841f2
optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents:
619
diff
changeset
|
2557 bits += rl->table_vlc[code][0]; |
dddcff6841f2
optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents:
619
diff
changeset
|
2558 bits=bits*2+sign; len++; |
2967 | 2559 |
648
dddcff6841f2
optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents:
619
diff
changeset
|
2560 if(code!=rl->n && len < len_tab[index]){ |
dddcff6841f2
optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents:
619
diff
changeset
|
2561 bits_tab[index]= bits; |
dddcff6841f2
optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents:
619
diff
changeset
|
2562 len_tab [index]= len; |
dddcff6841f2
optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents:
619
diff
changeset
|
2563 } |
dddcff6841f2
optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents:
619
diff
changeset
|
2564 } |
dddcff6841f2
optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents:
619
diff
changeset
|
2565 /* ESC2 */ |
dddcff6841f2
optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents:
619
diff
changeset
|
2566 bits= rl->table_vlc[rl->n][0]; |
dddcff6841f2
optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents:
619
diff
changeset
|
2567 len= rl->table_vlc[rl->n][1]; |
dddcff6841f2
optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents:
619
diff
changeset
|
2568 bits=bits*4+2; len+=2; //esc2 |
dddcff6841f2
optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents:
619
diff
changeset
|
2569 run1 = run - rl->max_run[last][level] - 1; |
dddcff6841f2
optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents:
619
diff
changeset
|
2570 if(run1>=0){ |
dddcff6841f2
optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents:
619
diff
changeset
|
2571 code= get_rl_index(rl, last, run1, level); |
dddcff6841f2
optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents:
619
diff
changeset
|
2572 bits<<= rl->table_vlc[code][1]; |
dddcff6841f2
optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents:
619
diff
changeset
|
2573 len += rl->table_vlc[code][1]; |
dddcff6841f2
optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents:
619
diff
changeset
|
2574 bits += rl->table_vlc[code][0]; |
dddcff6841f2
optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents:
619
diff
changeset
|
2575 bits=bits*2+sign; len++; |
2967 | 2576 |
648
dddcff6841f2
optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents:
619
diff
changeset
|
2577 if(code!=rl->n && len < len_tab[index]){ |
dddcff6841f2
optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents:
619
diff
changeset
|
2578 bits_tab[index]= bits; |
dddcff6841f2
optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents:
619
diff
changeset
|
2579 len_tab [index]= len; |
dddcff6841f2
optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents:
619
diff
changeset
|
2580 } |
dddcff6841f2
optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents:
619
diff
changeset
|
2581 } |
2967 | 2582 /* ESC3 */ |
648
dddcff6841f2
optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents:
619
diff
changeset
|
2583 bits= rl->table_vlc[rl->n][0]; |
dddcff6841f2
optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents:
619
diff
changeset
|
2584 len = rl->table_vlc[rl->n][1]; |
dddcff6841f2
optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents:
619
diff
changeset
|
2585 bits=bits*4+3; len+=2; //esc3 |
dddcff6841f2
optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents:
619
diff
changeset
|
2586 bits=bits*2+last; len++; |
dddcff6841f2
optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents:
619
diff
changeset
|
2587 bits=bits*64+run; len+=6; |
dddcff6841f2
optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents:
619
diff
changeset
|
2588 bits=bits*2+1; len++; //marker |
dddcff6841f2
optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents:
619
diff
changeset
|
2589 bits=bits*4096+(slevel&0xfff); len+=12; |
dddcff6841f2
optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents:
619
diff
changeset
|
2590 bits=bits*2+1; len++; //marker |
2967 | 2591 |
648
dddcff6841f2
optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents:
619
diff
changeset
|
2592 if(len < len_tab[index]){ |
dddcff6841f2
optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents:
619
diff
changeset
|
2593 bits_tab[index]= bits; |
dddcff6841f2
optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents:
619
diff
changeset
|
2594 len_tab [index]= len; |
dddcff6841f2
optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents:
619
diff
changeset
|
2595 } |
dddcff6841f2
optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents:
619
diff
changeset
|
2596 } |
dddcff6841f2
optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents:
619
diff
changeset
|
2597 } |
dddcff6841f2
optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents:
619
diff
changeset
|
2598 } |
dddcff6841f2
optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents:
619
diff
changeset
|
2599 } |
dddcff6841f2
optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents:
619
diff
changeset
|
2600 |
2253 | 2601 static void init_uni_h263_rl_tab(RLTable *rl, uint32_t *bits_tab, uint8_t *len_tab){ |
2602 int slevel, run, last; | |
2967 | 2603 |
2253 | 2604 assert(MAX_LEVEL >= 64); |
2605 assert(MAX_RUN >= 63); | |
2606 | |
2607 for(slevel=-64; slevel<64; slevel++){ | |
2608 if(slevel==0) continue; | |
2609 for(run=0; run<64; run++){ | |
2610 for(last=0; last<=1; last++){ | |
2611 const int index= UNI_MPEG4_ENC_INDEX(last, run, slevel+64); | |
2612 int level= slevel < 0 ? -slevel : slevel; | |
2613 int sign= slevel < 0 ? 1 : 0; | |
2614 int bits, len, code; | |
2967 | 2615 |
2253 | 2616 len_tab[index]= 100; |
2967 | 2617 |
2253 | 2618 /* ESC0 */ |
2619 code= get_rl_index(rl, last, run, level); | |
2620 bits= rl->table_vlc[code][0]; | |
2621 len= rl->table_vlc[code][1]; | |
2622 bits=bits*2+sign; len++; | |
2967 | 2623 |
2253 | 2624 if(code!=rl->n && len < len_tab[index]){ |
2625 if(bits_tab) bits_tab[index]= bits; | |
2626 len_tab [index]= len; | |
2627 } | |
2628 /* ESC */ | |
2629 bits= rl->table_vlc[rl->n][0]; | |
2630 len = rl->table_vlc[rl->n][1]; | |
2631 bits=bits*2+last; len++; | |
2632 bits=bits*64+run; len+=6; | |
2633 bits=bits*256+(level&0xff); len+=8; | |
2967 | 2634 |
2253 | 2635 if(len < len_tab[index]){ |
2636 if(bits_tab) bits_tab[index]= bits; | |
2637 len_tab [index]= len; | |
2638 } | |
2639 } | |
2640 } | |
2641 } | |
2642 } | |
2643 | |
277
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
274
diff
changeset
|
2644 void h263_encode_init(MpegEncContext *s) |
0 | 2645 { |
2646 static int done = 0; | |
2647 | |
2648 if (!done) { | |
2649 done = 1; | |
293 | 2650 |
2651 init_uni_dc_tab(); | |
2652 | |
4668 | 2653 init_rl(&rl_inter, static_rl_table_store[0]); |
2654 init_rl(&rl_intra, static_rl_table_store[1]); | |
2655 init_rl(&rl_intra_aic, static_rl_table_store[2]); | |
2967 | 2656 |
648
dddcff6841f2
optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents:
619
diff
changeset
|
2657 init_uni_mpeg4_rl_tab(&rl_intra, uni_mpeg4_intra_rl_bits, uni_mpeg4_intra_rl_len); |
dddcff6841f2
optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents:
619
diff
changeset
|
2658 init_uni_mpeg4_rl_tab(&rl_inter, uni_mpeg4_inter_rl_bits, uni_mpeg4_inter_rl_len); |
277
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
274
diff
changeset
|
2659 |
2253 | 2660 init_uni_h263_rl_tab(&rl_intra_aic, NULL, uni_h263_intra_aic_rl_len); |
2661 init_uni_h263_rl_tab(&rl_inter , NULL, uni_h263_inter_rl_len); | |
2662 | |
277
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
274
diff
changeset
|
2663 init_mv_penalty_and_fcode(s); |
0 | 2664 } |
936 | 2665 s->me.mv_penalty= mv_penalty; //FIXME exact table for msmpeg4 & h263p |
2967 | 2666 |
2253 | 2667 s->intra_ac_vlc_length =s->inter_ac_vlc_length = uni_h263_inter_rl_len; |
2668 s->intra_ac_vlc_last_length=s->inter_ac_vlc_last_length= uni_h263_inter_rl_len + 128*64; | |
2669 if(s->h263_aic){ | |
2670 s->intra_ac_vlc_length = uni_h263_intra_aic_rl_len; | |
2671 s->intra_ac_vlc_last_length= uni_h263_intra_aic_rl_len + 128*64; | |
2672 } | |
2673 s->ac_esc_length= 7+1+6+8; | |
2674 | |
287 | 2675 // use fcodes >1 only for mpeg4 & h263 & h263p FIXME |
344 | 2676 switch(s->codec_id){ |
2677 case CODEC_ID_MPEG4: | |
2678 s->fcode_tab= fcode_tab; | |
2679 s->min_qcoeff= -2048; | |
2680 s->max_qcoeff= 2047; | |
945 | 2681 s->intra_ac_vlc_length = uni_mpeg4_intra_rl_len; |
2682 s->intra_ac_vlc_last_length= uni_mpeg4_intra_rl_len + 128*64; | |
2683 s->inter_ac_vlc_length = uni_mpeg4_inter_rl_len; | |
2684 s->inter_ac_vlc_last_length= uni_mpeg4_inter_rl_len + 128*64; | |
1013 | 2685 s->luma_dc_vlc_length= uni_DCtab_lum_len; |
2686 s->chroma_dc_vlc_length= uni_DCtab_chrom_len; | |
945 | 2687 s->ac_esc_length= 7+2+1+6+1+12+1; |
1799 | 2688 s->y_dc_scale_table= ff_mpeg4_y_dc_scale_table; |
2689 s->c_dc_scale_table= ff_mpeg4_c_dc_scale_table; | |
2690 | |
1424 | 2691 if(s->flags & CODEC_FLAG_GLOBAL_HEADER){ |
1483 | 2692 |
1424 | 2693 s->avctx->extradata= av_malloc(1024); |
1522
79dddc5cd990
removed the obsolete and unused parameters of init_put_bits
alex
parents:
1521
diff
changeset
|
2694 init_put_bits(&s->pb, s->avctx->extradata, 1024); |
2967 | 2695 |
2572
c22ad129a91b
support omiting various headers in mpeg4 as WMP seems to have difficulty with them
michael
parents:
2554
diff
changeset
|
2696 if(!(s->workaround_bugs & FF_BUG_MS)) |
c22ad129a91b
support omiting various headers in mpeg4 as WMP seems to have difficulty with them
michael
parents:
2554
diff
changeset
|
2697 mpeg4_encode_visual_object_header(s); |
1424 | 2698 mpeg4_encode_vol_header(s, 0, 0); |
2699 | |
2700 // ff_mpeg4_stuffing(&s->pb); ? | |
2701 flush_put_bits(&s->pb); | |
1786 | 2702 s->avctx->extradata_size= (put_bits_count(&s->pb)+7)>>3; |
1424 | 2703 } |
2967 | 2704 |
344 | 2705 break; |
2706 case CODEC_ID_H263P: | |
1666 | 2707 if(s->umvplus) |
2708 s->fcode_tab= umv_fcode_tab; | |
2709 if(s->modified_quant){ | |
2710 s->min_qcoeff= -2047; | |
2711 s->max_qcoeff= 2047; | |
2712 }else{ | |
2713 s->min_qcoeff= -127; | |
2714 s->max_qcoeff= 127; | |
2715 } | |
344 | 2716 break; |
2967 | 2717 //Note for mpeg4 & h263 the dc-scale table will be set per frame as needed later |
1353
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
2718 case CODEC_ID_FLV1: |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
2719 if (s->h263_flv > 1) { |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
2720 s->min_qcoeff= -1023; |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
2721 s->max_qcoeff= 1023; |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
2722 } else { |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
2723 s->min_qcoeff= -127; |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
2724 s->max_qcoeff= 127; |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
2725 } |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
2726 s->y_dc_scale_table= |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
2727 s->c_dc_scale_table= ff_mpeg1_dc_scale_table; |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
2728 break; |
2646
c735e3e60ca7
Even More spelling errors. patch by (Kevin Baragona <kevinmb500 gawab com)
michael
parents:
2639
diff
changeset
|
2729 default: //nothing needed - default table already set in mpegvideo.c |
1089 | 2730 s->min_qcoeff= -127; |
344 | 2731 s->max_qcoeff= 127; |
498 | 2732 s->y_dc_scale_table= |
2733 s->c_dc_scale_table= ff_mpeg1_dc_scale_table; | |
344 | 2734 } |
0 | 2735 } |
1070
6da5ae9ee199
more #ifdef CONFIG_ENCODERS patch by (Wolfgang Hesseler <qv at multimediaware dot com>) with modifications by me (s/WOLFGANG/CONFIG_ENCODERS/ and some other fixes)
michaelni
parents:
1068
diff
changeset
|
2736 #endif //CONFIG_ENCODERS |
6da5ae9ee199
more #ifdef CONFIG_ENCODERS patch by (Wolfgang Hesseler <qv at multimediaware dot com>) with modifications by me (s/WOLFGANG/CONFIG_ENCODERS/ and some other fixes)
michaelni
parents:
1068
diff
changeset
|
2737 |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
2738 /** |
1034 | 2739 * predicts the ac. |
2740 * @param n block index (0-3 are luma, 4-5 are chroma) | |
2741 * @param dir the ac prediction direction | |
2742 */ | |
1008 | 2743 void mpeg4_pred_ac(MpegEncContext * s, DCTELEM *block, int n, |
0 | 2744 int dir) |
2745 { | |
266 | 2746 int i; |
1064 | 2747 int16_t *ac_val, *ac_val1; |
903 | 2748 int8_t * const qscale_table= s->current_picture.qscale_table; |
0 | 2749 |
2750 /* find prediction */ | |
266 | 2751 ac_val = s->ac_val[0][0] + s->block_index[n] * 16; |
0 | 2752 ac_val1 = ac_val; |
2753 if (s->ac_pred) { | |
2754 if (dir == 0) { | |
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:
1176
diff
changeset
|
2755 const int xy= s->mb_x-1 + s->mb_y*s->mb_stride; |
0 | 2756 /* left prediction */ |
2757 ac_val -= 16; | |
2967 | 2758 |
903 | 2759 if(s->mb_x==0 || s->qscale == qscale_table[xy] || n==1 || n==3){ |
575 | 2760 /* same qscale */ |
2761 for(i=1;i<8;i++) { | |
1092 | 2762 block[s->dsp.idct_permutation[i<<3]] += ac_val[i]; |
575 | 2763 } |
2764 }else{ | |
2765 /* different qscale, we must rescale */ | |
2766 for(i=1;i<8;i++) { | |
1092 | 2767 block[s->dsp.idct_permutation[i<<3]] += ROUNDED_DIV(ac_val[i]*qscale_table[xy], s->qscale); |
575 | 2768 } |
0 | 2769 } |
2770 } else { | |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1176
diff
changeset
|
2771 const int xy= s->mb_x + s->mb_y*s->mb_stride - s->mb_stride; |
0 | 2772 /* top prediction */ |
266 | 2773 ac_val -= 16 * s->block_wrap[n]; |
575 | 2774 |
903 | 2775 if(s->mb_y==0 || s->qscale == qscale_table[xy] || n==2 || n==3){ |
575 | 2776 /* same qscale */ |
2777 for(i=1;i<8;i++) { | |
1092 | 2778 block[s->dsp.idct_permutation[i]] += ac_val[i + 8]; |
575 | 2779 } |
2780 }else{ | |
2781 /* different qscale, we must rescale */ | |
2782 for(i=1;i<8;i++) { | |
1092 | 2783 block[s->dsp.idct_permutation[i]] += ROUNDED_DIV(ac_val[i + 8]*qscale_table[xy], s->qscale); |
575 | 2784 } |
0 | 2785 } |
2786 } | |
2787 } | |
2788 /* left copy */ | |
2789 for(i=1;i<8;i++) | |
1092 | 2790 ac_val1[i ] = block[s->dsp.idct_permutation[i<<3]]; |
591 | 2791 |
0 | 2792 /* top copy */ |
2793 for(i=1;i<8;i++) | |
1092 | 2794 ac_val1[8 + i] = block[s->dsp.idct_permutation[i ]]; |
591 | 2795 |
0 | 2796 } |
2797 | |
2798 /***********************************************/ | |
2799 /* decoding */ | |
2800 | |
2801 static VLC intra_MCBPC_vlc; | |
2802 static VLC inter_MCBPC_vlc; | |
2803 static VLC cbpy_vlc; | |
2804 static VLC mv_vlc; | |
2805 static VLC dc_lum, dc_chrom; | |
254
b4fed8b24e3a
gmc bitstream decoding support (the real motion compensation isnt implemnted yet)
michaelni
parents:
253
diff
changeset
|
2806 static VLC sprite_trajectory; |
262 | 2807 static VLC mb_type_b_vlc; |
1655 | 2808 static VLC h263_mbtype_b_vlc; |
2809 static VLC cbpc_b_vlc; | |
0 | 2810 |
2811 /* init vlcs */ | |
2812 | |
2813 /* XXX: find a better solution to handle static init */ | |
2814 void h263_decode_init_vlc(MpegEncContext *s) | |
2815 { | |
2816 static int done = 0; | |
2817 | |
2818 if (!done) { | |
2819 done = 1; | |
2820 | |
7098 | 2821 INIT_VLC_STATIC(&intra_MCBPC_vlc, INTRA_MCBPC_VLC_BITS, 9, |
0 | 2822 intra_MCBPC_bits, 1, 1, |
7098 | 2823 intra_MCBPC_code, 1, 1, 72); |
2824 INIT_VLC_STATIC(&inter_MCBPC_vlc, INTER_MCBPC_VLC_BITS, 28, | |
0 | 2825 inter_MCBPC_bits, 1, 1, |
7098 | 2826 inter_MCBPC_code, 1, 1, 198); |
2827 INIT_VLC_STATIC(&cbpy_vlc, CBPY_VLC_BITS, 16, | |
0 | 2828 &cbpy_tab[0][1], 2, 1, |
7098 | 2829 &cbpy_tab[0][0], 2, 1, 64); |
2830 INIT_VLC_STATIC(&mv_vlc, MV_VLC_BITS, 33, | |
0 | 2831 &mvtab[0][1], 2, 1, |
7098 | 2832 &mvtab[0][0], 2, 1, 538); |
4668 | 2833 init_rl(&rl_inter, static_rl_table_store[0]); |
2834 init_rl(&rl_intra, static_rl_table_store[1]); | |
2835 init_rl(&rvlc_rl_inter, static_rl_table_store[3]); | |
2836 init_rl(&rvlc_rl_intra, static_rl_table_store[4]); | |
2837 init_rl(&rl_intra_aic, static_rl_table_store[2]); | |
6940
778ecab25dd8
Change init_vlc_rl() so it does not use *alloc_static() anymore.
michael
parents:
6918
diff
changeset
|
2838 INIT_VLC_RL(rl_inter, 554); |
778ecab25dd8
Change init_vlc_rl() so it does not use *alloc_static() anymore.
michael
parents:
6918
diff
changeset
|
2839 INIT_VLC_RL(rl_intra, 554); |
778ecab25dd8
Change init_vlc_rl() so it does not use *alloc_static() anymore.
michael
parents:
6918
diff
changeset
|
2840 INIT_VLC_RL(rvlc_rl_inter, 1072); |
778ecab25dd8
Change init_vlc_rl() so it does not use *alloc_static() anymore.
michael
parents:
6918
diff
changeset
|
2841 INIT_VLC_RL(rvlc_rl_intra, 1072); |
778ecab25dd8
Change init_vlc_rl() so it does not use *alloc_static() anymore.
michael
parents:
6918
diff
changeset
|
2842 INIT_VLC_RL(rl_intra_aic, 554); |
7098 | 2843 INIT_VLC_STATIC(&dc_lum, DC_VLC_BITS, 10 /* 13 */, |
0 | 2844 &DCtab_lum[0][1], 2, 1, |
7098 | 2845 &DCtab_lum[0][0], 2, 1, 512); |
2846 INIT_VLC_STATIC(&dc_chrom, DC_VLC_BITS, 10 /* 13 */, | |
0 | 2847 &DCtab_chrom[0][1], 2, 1, |
7098 | 2848 &DCtab_chrom[0][0], 2, 1, 512); |
2849 INIT_VLC_STATIC(&sprite_trajectory, SPRITE_TRAJ_VLC_BITS, 15, | |
254
b4fed8b24e3a
gmc bitstream decoding support (the real motion compensation isnt implemnted yet)
michaelni
parents:
253
diff
changeset
|
2850 &sprite_trajectory_tab[0][1], 4, 2, |
7098 | 2851 &sprite_trajectory_tab[0][0], 4, 2, 128); |
2852 INIT_VLC_STATIC(&mb_type_b_vlc, MB_TYPE_B_VLC_BITS, 4, | |
262 | 2853 &mb_type_b_tab[0][1], 2, 1, |
7098 | 2854 &mb_type_b_tab[0][0], 2, 1, 16); |
2855 INIT_VLC_STATIC(&h263_mbtype_b_vlc, H263_MBTYPE_B_VLC_BITS, 15, | |
1655 | 2856 &h263_mbtype_b_tab[0][1], 2, 1, |
7098 | 2857 &h263_mbtype_b_tab[0][0], 2, 1, 80); |
2858 INIT_VLC_STATIC(&cbpc_b_vlc, CBPC_B_VLC_BITS, 4, | |
1655 | 2859 &cbpc_b_tab[0][1], 2, 1, |
7098 | 2860 &cbpc_b_tab[0][0], 2, 1, 8); |
0 | 2861 } |
2862 } | |
2863 | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
2864 /** |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
2865 * Get the GOB height based on picture height. |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
2866 */ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
2867 int ff_h263_get_gob_height(MpegEncContext *s){ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
2868 if (s->height <= 400) |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
2869 return 1; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
2870 else if (s->height <= 800) |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
2871 return 2; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
2872 else |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
2873 return 4; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
2874 } |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
2875 |
1661 | 2876 int ff_h263_decode_mba(MpegEncContext *s) |
2877 { | |
2878 int i, mb_pos; | |
2879 | |
2880 for(i=0; i<6; i++){ | |
1670 | 2881 if(s->mb_num-1 <= ff_mba_max[i]) break; |
1661 | 2882 } |
2883 mb_pos= get_bits(&s->gb, ff_mba_length[i]); | |
2884 s->mb_x= mb_pos % s->mb_width; | |
2885 s->mb_y= mb_pos / s->mb_width; | |
2886 | |
2887 return mb_pos; | |
2888 } | |
2889 | |
2890 void ff_h263_encode_mba(MpegEncContext *s) | |
2891 { | |
2892 int i, mb_pos; | |
2893 | |
2894 for(i=0; i<6; i++){ | |
1670 | 2895 if(s->mb_num-1 <= ff_mba_max[i]) break; |
1661 | 2896 } |
2897 mb_pos= s->mb_x + s->mb_width*s->mb_y; | |
2898 put_bits(&s->pb, ff_mba_length[i], mb_pos); | |
2899 } | |
2900 | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
2901 /** |
1661 | 2902 * decodes the group of blocks header or slice header. |
6524 | 2903 * @return <0 if an error occurred |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
2904 */ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
2905 static int h263_decode_gob_header(MpegEncContext *s) |
162 | 2906 { |
1661 | 2907 unsigned int val, gfid, gob_number; |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
2908 int left; |
2967 | 2909 |
162 | 2910 /* Check for GOB Start Code */ |
2911 val = show_bits(&s->gb, 16); | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
2912 if(val) |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
2913 return -1; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
2914 |
162 | 2915 /* We have a GBSC probably with GSTUFF */ |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
2916 skip_bits(&s->gb, 16); /* Drop the zeros */ |
10535
95f3daa991a2
Use get_bits_left() instead of size_in_bits - get_bits_count().
rbultje
parents:
9999
diff
changeset
|
2917 left= get_bits_left(&s->gb); |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
2918 //MN: we must check the bits left or we might end in a infinite loop (or segfault) |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
2919 for(;left>13; left--){ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
2920 if(get_bits1(&s->gb)) break; /* Seek the '1' bit */ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
2921 } |
2967 | 2922 if(left<=13) |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
2923 return -1; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
2924 |
1661 | 2925 if(s->h263_slice_structured){ |
2926 if(get_bits1(&s->gb)==0) | |
2927 return -1; | |
2928 | |
2929 ff_h263_decode_mba(s); | |
2930 | |
2931 if(s->mb_num > 1583) | |
2932 if(get_bits1(&s->gb)==0) | |
2933 return -1; | |
2967 | 2934 |
1661 | 2935 s->qscale = get_bits(&s->gb, 5); /* SQUANT */ |
2936 if(get_bits1(&s->gb)==0) | |
2937 return -1; | |
2938 gfid = get_bits(&s->gb, 2); /* GFID */ | |
2939 }else{ | |
2940 gob_number = get_bits(&s->gb, 5); /* GN */ | |
2941 s->mb_x= 0; | |
2942 s->mb_y= s->gob_index* gob_number; | |
2943 gfid = get_bits(&s->gb, 2); /* GFID */ | |
2944 s->qscale = get_bits(&s->gb, 5); /* GQUANT */ | |
2945 } | |
2967 | 2946 |
2947 if(s->mb_y >= s->mb_height) | |
1661 | 2948 return -1; |
2949 | |
2967 | 2950 if(s->qscale==0) |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
2951 return -1; |
1644 | 2952 |
162 | 2953 return 0; |
2954 } | |
2955 | |
290 | 2956 static inline void memsetw(short *tab, int val, int n) |
2957 { | |
2958 int i; | |
2959 for(i=0;i<n;i++) | |
2960 tab[i] = val; | |
2961 } | |
2962 | |
8590 | 2963 #if CONFIG_ENCODERS |
1070
6da5ae9ee199
more #ifdef CONFIG_ENCODERS patch by (Wolfgang Hesseler <qv at multimediaware dot com>) with modifications by me (s/WOLFGANG/CONFIG_ENCODERS/ and some other fixes)
michaelni
parents:
1068
diff
changeset
|
2964 |
453 | 2965 void ff_mpeg4_init_partitions(MpegEncContext *s) |
2966 { | |
9431 | 2967 uint8_t *start= put_bits_ptr(&s->pb); |
1799 | 2968 uint8_t *end= s->pb.buf_end; |
2969 int size= end - start; | |
9259 | 2970 int pb_size = (((intptr_t)start + size/3)&(~3)) - (intptr_t)start; |
1912 | 2971 int tex_size= (size - 2*pb_size)&(~3); |
2967 | 2972 |
1799 | 2973 set_put_bits_buffer_size(&s->pb, pb_size); |
2974 init_put_bits(&s->tex_pb, start + pb_size , tex_size); | |
1910
5c21b165abf6
ensure that the bitstream buffers for encoding partitioned frames are aligned
michael
parents:
1896
diff
changeset
|
2975 init_put_bits(&s->pb2 , start + pb_size + tex_size, pb_size); |
453 | 2976 } |
2977 | |
2978 void ff_mpeg4_merge_partitions(MpegEncContext *s) | |
290 | 2979 { |
1786 | 2980 const int pb2_len = put_bits_count(&s->pb2 ); |
2981 const int tex_pb_len= put_bits_count(&s->tex_pb); | |
2982 const int bits= put_bits_count(&s->pb); | |
453 | 2983 |
6481 | 2984 if(s->pict_type==FF_I_TYPE){ |
453 | 2985 put_bits(&s->pb, 19, DC_MARKER); |
2986 s->misc_bits+=19 + pb2_len + bits - s->last_bits; | |
2987 s->i_tex_bits+= tex_pb_len; | |
2988 }else{ | |
2989 put_bits(&s->pb, 17, MOTION_MARKER); | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
2990 s->misc_bits+=17 + pb2_len; |
453 | 2991 s->mv_bits+= bits - s->last_bits; |
2992 s->p_tex_bits+= tex_pb_len; | |
2993 } | |
2994 | |
2995 flush_put_bits(&s->pb2); | |
2996 flush_put_bits(&s->tex_pb); | |
2997 | |
1799 | 2998 set_put_bits_buffer_size(&s->pb, s->pb2.buf_end - s->pb.buf); |
2999 ff_copy_bits(&s->pb, s->pb2.buf , pb2_len); | |
3000 ff_copy_bits(&s->pb, s->tex_pb.buf, tex_pb_len); | |
1786 | 3001 s->last_bits= put_bits_count(&s->pb); |
453 | 3002 } |
3003 | |
1070
6da5ae9ee199
more #ifdef CONFIG_ENCODERS patch by (Wolfgang Hesseler <qv at multimediaware dot com>) with modifications by me (s/WOLFGANG/CONFIG_ENCODERS/ and some other fixes)
michaelni
parents:
1068
diff
changeset
|
3004 #endif //CONFIG_ENCODERS |
6da5ae9ee199
more #ifdef CONFIG_ENCODERS patch by (Wolfgang Hesseler <qv at multimediaware dot com>) with modifications by me (s/WOLFGANG/CONFIG_ENCODERS/ and some other fixes)
michaelni
parents:
1068
diff
changeset
|
3005 |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3006 int ff_mpeg4_get_video_packet_prefix_length(MpegEncContext *s){ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3007 switch(s->pict_type){ |
6481 | 3008 case FF_I_TYPE: |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3009 return 16; |
6481 | 3010 case FF_P_TYPE: |
3011 case FF_S_TYPE: | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3012 return s->f_code+15; |
6481 | 3013 case FF_B_TYPE: |
6655
22cca5d3173a
Implement FFMAX3(a,b,c) - maximum over three arguments.
voroshil
parents:
6524
diff
changeset
|
3014 return FFMAX3(s->f_code, s->b_code, 2) + 15; |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3015 default: |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3016 return -1; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3017 } |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3018 } |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3019 |
8590 | 3020 #if CONFIG_ENCODERS |
1070
6da5ae9ee199
more #ifdef CONFIG_ENCODERS patch by (Wolfgang Hesseler <qv at multimediaware dot com>) with modifications by me (s/WOLFGANG/CONFIG_ENCODERS/ and some other fixes)
michaelni
parents:
1068
diff
changeset
|
3021 |
453 | 3022 void ff_mpeg4_encode_video_packet_header(MpegEncContext *s) |
3023 { | |
3024 int mb_num_bits= av_log2(s->mb_num - 1) + 1; | |
3025 | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3026 put_bits(&s->pb, ff_mpeg4_get_video_packet_prefix_length(s), 0); |
453 | 3027 put_bits(&s->pb, 1, 1); |
2967 | 3028 |
453 | 3029 put_bits(&s->pb, mb_num_bits, s->mb_x + s->mb_y*s->mb_width); |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3030 put_bits(&s->pb, s->quant_precision, s->qscale); |
453 | 3031 put_bits(&s->pb, 1, 0); /* no HEC */ |
3032 } | |
3033 | |
1070
6da5ae9ee199
more #ifdef CONFIG_ENCODERS patch by (Wolfgang Hesseler <qv at multimediaware dot com>) with modifications by me (s/WOLFGANG/CONFIG_ENCODERS/ and some other fixes)
michaelni
parents:
1068
diff
changeset
|
3034 #endif //CONFIG_ENCODERS |
6da5ae9ee199
more #ifdef CONFIG_ENCODERS patch by (Wolfgang Hesseler <qv at multimediaware dot com>) with modifications by me (s/WOLFGANG/CONFIG_ENCODERS/ and some other fixes)
michaelni
parents:
1068
diff
changeset
|
3035 |
453 | 3036 /** |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3037 * check if the next stuff is a resync marker or the end. |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3038 * @return 0 if not |
453 | 3039 */ |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3040 static inline int mpeg4_is_resync(MpegEncContext *s){ |
4161
f81bca10a740
100l for me, iam being to stupid to read the mpeg4 spec / eat stuffing mbs a the end of the picture
michael
parents:
4155
diff
changeset
|
3041 int bits_count= get_bits_count(&s->gb); |
f81bca10a740
100l for me, iam being to stupid to read the mpeg4 spec / eat stuffing mbs a the end of the picture
michael
parents:
4155
diff
changeset
|
3042 int v= show_bits(&s->gb, 16); |
2967 | 3043 |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3044 if(s->workaround_bugs&FF_BUG_NO_PADDING){ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3045 return 0; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3046 } |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3047 |
4161
f81bca10a740
100l for me, iam being to stupid to read the mpeg4 spec / eat stuffing mbs a the end of the picture
michael
parents:
4155
diff
changeset
|
3048 while(v<=0xFF){ |
6481 | 3049 if(s->pict_type==FF_B_TYPE || (v>>(8-s->pict_type)!=1) || s->partitioned_frame) |
4161
f81bca10a740
100l for me, iam being to stupid to read the mpeg4 spec / eat stuffing mbs a the end of the picture
michael
parents:
4155
diff
changeset
|
3050 break; |
f81bca10a740
100l for me, iam being to stupid to read the mpeg4 spec / eat stuffing mbs a the end of the picture
michael
parents:
4155
diff
changeset
|
3051 skip_bits(&s->gb, 8+s->pict_type); |
f81bca10a740
100l for me, iam being to stupid to read the mpeg4 spec / eat stuffing mbs a the end of the picture
michael
parents:
4155
diff
changeset
|
3052 bits_count+= 8+s->pict_type; |
f81bca10a740
100l for me, iam being to stupid to read the mpeg4 spec / eat stuffing mbs a the end of the picture
michael
parents:
4155
diff
changeset
|
3053 v= show_bits(&s->gb, 16); |
f81bca10a740
100l for me, iam being to stupid to read the mpeg4 spec / eat stuffing mbs a the end of the picture
michael
parents:
4155
diff
changeset
|
3054 } |
f81bca10a740
100l for me, iam being to stupid to read the mpeg4 spec / eat stuffing mbs a the end of the picture
michael
parents:
4155
diff
changeset
|
3055 |
1025
1f9afd8b9131
GetBitContext.size is allways multiplied by 8 -> use size_in_bits to avoid useless *8 in a few inner loops
michaelni
parents:
1013
diff
changeset
|
3056 if(bits_count + 8 >= s->gb.size_in_bits){ |
4161
f81bca10a740
100l for me, iam being to stupid to read the mpeg4 spec / eat stuffing mbs a the end of the picture
michael
parents:
4155
diff
changeset
|
3057 v>>=8; |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3058 v|= 0x7F >> (7-(bits_count&7)); |
2967 | 3059 |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3060 if(v==0x7F) |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3061 return 1; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3062 }else{ |
4161
f81bca10a740
100l for me, iam being to stupid to read the mpeg4 spec / eat stuffing mbs a the end of the picture
michael
parents:
4155
diff
changeset
|
3063 if(v == ff_mpeg4_resync_prefix[bits_count&7]){ |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3064 int len; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3065 GetBitContext gb= s->gb; |
2967 | 3066 |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3067 skip_bits(&s->gb, 1); |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3068 align_get_bits(&s->gb); |
2967 | 3069 |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3070 for(len=0; len<32; len++){ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3071 if(get_bits1(&s->gb)) break; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3072 } |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3073 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3074 s->gb= gb; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3075 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3076 if(len>=ff_mpeg4_get_video_packet_prefix_length(s)) |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3077 return 1; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3078 } |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3079 } |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3080 return 0; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3081 } |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3082 |
10753
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3083 static void mpeg4_decode_sprite_trajectory(MpegEncContext * s, GetBitContext *gb) |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3084 { |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3085 int i; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3086 int a= 2<<s->sprite_warping_accuracy; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3087 int rho= 3-s->sprite_warping_accuracy; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3088 int r=16/a; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3089 const int vop_ref[4][2]= {{0,0}, {s->width,0}, {0, s->height}, {s->width, s->height}}; // only true for rectangle shapes |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3090 int d[4][2]={{0,0}, {0,0}, {0,0}, {0,0}}; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3091 int sprite_ref[4][2]; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3092 int virtual_ref[2][2]; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3093 int w2, h2, w3, h3; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3094 int alpha=0, beta=0; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3095 int w= s->width; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3096 int h= s->height; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3097 int min_ab; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3098 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3099 for(i=0; i<s->num_sprite_warping_points; i++){ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3100 int length; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3101 int x=0, y=0; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3102 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3103 length= get_vlc2(gb, sprite_trajectory.table, SPRITE_TRAJ_VLC_BITS, 3); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3104 if(length){ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3105 x= get_xbits(gb, length); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3106 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3107 if(!(s->divx_version==500 && s->divx_build==413)) skip_bits1(gb); /* marker bit */ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3108 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3109 length= get_vlc2(gb, sprite_trajectory.table, SPRITE_TRAJ_VLC_BITS, 3); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3110 if(length){ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3111 y=get_xbits(gb, length); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3112 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3113 skip_bits1(gb); /* marker bit */ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3114 s->sprite_traj[i][0]= d[i][0]= x; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3115 s->sprite_traj[i][1]= d[i][1]= y; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3116 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3117 for(; i<4; i++) |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3118 s->sprite_traj[i][0]= s->sprite_traj[i][1]= 0; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3119 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3120 while((1<<alpha)<w) alpha++; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3121 while((1<<beta )<h) beta++; // there seems to be a typo in the mpeg4 std for the definition of w' and h' |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3122 w2= 1<<alpha; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3123 h2= 1<<beta; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3124 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3125 // Note, the 4th point isn't used for GMC |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3126 if(s->divx_version==500 && s->divx_build==413){ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3127 sprite_ref[0][0]= a*vop_ref[0][0] + d[0][0]; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3128 sprite_ref[0][1]= a*vop_ref[0][1] + d[0][1]; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3129 sprite_ref[1][0]= a*vop_ref[1][0] + d[0][0] + d[1][0]; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3130 sprite_ref[1][1]= a*vop_ref[1][1] + d[0][1] + d[1][1]; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3131 sprite_ref[2][0]= a*vop_ref[2][0] + d[0][0] + d[2][0]; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3132 sprite_ref[2][1]= a*vop_ref[2][1] + d[0][1] + d[2][1]; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3133 } else { |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3134 sprite_ref[0][0]= (a>>1)*(2*vop_ref[0][0] + d[0][0]); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3135 sprite_ref[0][1]= (a>>1)*(2*vop_ref[0][1] + d[0][1]); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3136 sprite_ref[1][0]= (a>>1)*(2*vop_ref[1][0] + d[0][0] + d[1][0]); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3137 sprite_ref[1][1]= (a>>1)*(2*vop_ref[1][1] + d[0][1] + d[1][1]); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3138 sprite_ref[2][0]= (a>>1)*(2*vop_ref[2][0] + d[0][0] + d[2][0]); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3139 sprite_ref[2][1]= (a>>1)*(2*vop_ref[2][1] + d[0][1] + d[2][1]); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3140 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3141 /* sprite_ref[3][0]= (a>>1)*(2*vop_ref[3][0] + d[0][0] + d[1][0] + d[2][0] + d[3][0]); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3142 sprite_ref[3][1]= (a>>1)*(2*vop_ref[3][1] + d[0][1] + d[1][1] + d[2][1] + d[3][1]); */ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3143 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3144 // this is mostly identical to the mpeg4 std (and is totally unreadable because of that ...) |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3145 // perhaps it should be reordered to be more readable ... |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3146 // the idea behind this virtual_ref mess is to be able to use shifts later per pixel instead of divides |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3147 // so the distance between points is converted from w&h based to w2&h2 based which are of the 2^x form |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3148 virtual_ref[0][0]= 16*(vop_ref[0][0] + w2) |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3149 + ROUNDED_DIV(((w - w2)*(r*sprite_ref[0][0] - 16*vop_ref[0][0]) + w2*(r*sprite_ref[1][0] - 16*vop_ref[1][0])),w); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3150 virtual_ref[0][1]= 16*vop_ref[0][1] |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3151 + ROUNDED_DIV(((w - w2)*(r*sprite_ref[0][1] - 16*vop_ref[0][1]) + w2*(r*sprite_ref[1][1] - 16*vop_ref[1][1])),w); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3152 virtual_ref[1][0]= 16*vop_ref[0][0] |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3153 + ROUNDED_DIV(((h - h2)*(r*sprite_ref[0][0] - 16*vop_ref[0][0]) + h2*(r*sprite_ref[2][0] - 16*vop_ref[2][0])),h); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3154 virtual_ref[1][1]= 16*(vop_ref[0][1] + h2) |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3155 + ROUNDED_DIV(((h - h2)*(r*sprite_ref[0][1] - 16*vop_ref[0][1]) + h2*(r*sprite_ref[2][1] - 16*vop_ref[2][1])),h); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3156 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3157 switch(s->num_sprite_warping_points) |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3158 { |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3159 case 0: |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3160 s->sprite_offset[0][0]= 0; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3161 s->sprite_offset[0][1]= 0; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3162 s->sprite_offset[1][0]= 0; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3163 s->sprite_offset[1][1]= 0; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3164 s->sprite_delta[0][0]= a; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3165 s->sprite_delta[0][1]= 0; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3166 s->sprite_delta[1][0]= 0; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3167 s->sprite_delta[1][1]= a; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3168 s->sprite_shift[0]= 0; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3169 s->sprite_shift[1]= 0; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3170 break; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3171 case 1: //GMC only |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3172 s->sprite_offset[0][0]= sprite_ref[0][0] - a*vop_ref[0][0]; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3173 s->sprite_offset[0][1]= sprite_ref[0][1] - a*vop_ref[0][1]; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3174 s->sprite_offset[1][0]= ((sprite_ref[0][0]>>1)|(sprite_ref[0][0]&1)) - a*(vop_ref[0][0]/2); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3175 s->sprite_offset[1][1]= ((sprite_ref[0][1]>>1)|(sprite_ref[0][1]&1)) - a*(vop_ref[0][1]/2); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3176 s->sprite_delta[0][0]= a; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3177 s->sprite_delta[0][1]= 0; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3178 s->sprite_delta[1][0]= 0; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3179 s->sprite_delta[1][1]= a; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3180 s->sprite_shift[0]= 0; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3181 s->sprite_shift[1]= 0; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3182 break; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3183 case 2: |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3184 s->sprite_offset[0][0]= (sprite_ref[0][0]<<(alpha+rho)) |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3185 + (-r*sprite_ref[0][0] + virtual_ref[0][0])*(-vop_ref[0][0]) |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3186 + ( r*sprite_ref[0][1] - virtual_ref[0][1])*(-vop_ref[0][1]) |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3187 + (1<<(alpha+rho-1)); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3188 s->sprite_offset[0][1]= (sprite_ref[0][1]<<(alpha+rho)) |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3189 + (-r*sprite_ref[0][1] + virtual_ref[0][1])*(-vop_ref[0][0]) |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3190 + (-r*sprite_ref[0][0] + virtual_ref[0][0])*(-vop_ref[0][1]) |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3191 + (1<<(alpha+rho-1)); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3192 s->sprite_offset[1][0]= ( (-r*sprite_ref[0][0] + virtual_ref[0][0])*(-2*vop_ref[0][0] + 1) |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3193 +( r*sprite_ref[0][1] - virtual_ref[0][1])*(-2*vop_ref[0][1] + 1) |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3194 +2*w2*r*sprite_ref[0][0] |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3195 - 16*w2 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3196 + (1<<(alpha+rho+1))); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3197 s->sprite_offset[1][1]= ( (-r*sprite_ref[0][1] + virtual_ref[0][1])*(-2*vop_ref[0][0] + 1) |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3198 +(-r*sprite_ref[0][0] + virtual_ref[0][0])*(-2*vop_ref[0][1] + 1) |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3199 +2*w2*r*sprite_ref[0][1] |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3200 - 16*w2 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3201 + (1<<(alpha+rho+1))); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3202 s->sprite_delta[0][0]= (-r*sprite_ref[0][0] + virtual_ref[0][0]); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3203 s->sprite_delta[0][1]= (+r*sprite_ref[0][1] - virtual_ref[0][1]); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3204 s->sprite_delta[1][0]= (-r*sprite_ref[0][1] + virtual_ref[0][1]); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3205 s->sprite_delta[1][1]= (-r*sprite_ref[0][0] + virtual_ref[0][0]); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3206 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3207 s->sprite_shift[0]= alpha+rho; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3208 s->sprite_shift[1]= alpha+rho+2; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3209 break; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3210 case 3: |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3211 min_ab= FFMIN(alpha, beta); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3212 w3= w2>>min_ab; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3213 h3= h2>>min_ab; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3214 s->sprite_offset[0][0]= (sprite_ref[0][0]<<(alpha+beta+rho-min_ab)) |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3215 + (-r*sprite_ref[0][0] + virtual_ref[0][0])*h3*(-vop_ref[0][0]) |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3216 + (-r*sprite_ref[0][0] + virtual_ref[1][0])*w3*(-vop_ref[0][1]) |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3217 + (1<<(alpha+beta+rho-min_ab-1)); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3218 s->sprite_offset[0][1]= (sprite_ref[0][1]<<(alpha+beta+rho-min_ab)) |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3219 + (-r*sprite_ref[0][1] + virtual_ref[0][1])*h3*(-vop_ref[0][0]) |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3220 + (-r*sprite_ref[0][1] + virtual_ref[1][1])*w3*(-vop_ref[0][1]) |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3221 + (1<<(alpha+beta+rho-min_ab-1)); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3222 s->sprite_offset[1][0]= (-r*sprite_ref[0][0] + virtual_ref[0][0])*h3*(-2*vop_ref[0][0] + 1) |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3223 + (-r*sprite_ref[0][0] + virtual_ref[1][0])*w3*(-2*vop_ref[0][1] + 1) |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3224 + 2*w2*h3*r*sprite_ref[0][0] |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3225 - 16*w2*h3 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3226 + (1<<(alpha+beta+rho-min_ab+1)); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3227 s->sprite_offset[1][1]= (-r*sprite_ref[0][1] + virtual_ref[0][1])*h3*(-2*vop_ref[0][0] + 1) |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3228 + (-r*sprite_ref[0][1] + virtual_ref[1][1])*w3*(-2*vop_ref[0][1] + 1) |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3229 + 2*w2*h3*r*sprite_ref[0][1] |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3230 - 16*w2*h3 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3231 + (1<<(alpha+beta+rho-min_ab+1)); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3232 s->sprite_delta[0][0]= (-r*sprite_ref[0][0] + virtual_ref[0][0])*h3; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3233 s->sprite_delta[0][1]= (-r*sprite_ref[0][0] + virtual_ref[1][0])*w3; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3234 s->sprite_delta[1][0]= (-r*sprite_ref[0][1] + virtual_ref[0][1])*h3; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3235 s->sprite_delta[1][1]= (-r*sprite_ref[0][1] + virtual_ref[1][1])*w3; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3236 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3237 s->sprite_shift[0]= alpha + beta + rho - min_ab; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3238 s->sprite_shift[1]= alpha + beta + rho - min_ab + 2; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3239 break; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3240 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3241 /* try to simplify the situation */ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3242 if( s->sprite_delta[0][0] == a<<s->sprite_shift[0] |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3243 && s->sprite_delta[0][1] == 0 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3244 && s->sprite_delta[1][0] == 0 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3245 && s->sprite_delta[1][1] == a<<s->sprite_shift[0]) |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3246 { |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3247 s->sprite_offset[0][0]>>=s->sprite_shift[0]; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3248 s->sprite_offset[0][1]>>=s->sprite_shift[0]; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3249 s->sprite_offset[1][0]>>=s->sprite_shift[1]; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3250 s->sprite_offset[1][1]>>=s->sprite_shift[1]; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3251 s->sprite_delta[0][0]= a; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3252 s->sprite_delta[0][1]= 0; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3253 s->sprite_delta[1][0]= 0; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3254 s->sprite_delta[1][1]= a; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3255 s->sprite_shift[0]= 0; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3256 s->sprite_shift[1]= 0; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3257 s->real_sprite_warping_points=1; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3258 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3259 else{ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3260 int shift_y= 16 - s->sprite_shift[0]; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3261 int shift_c= 16 - s->sprite_shift[1]; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3262 for(i=0; i<2; i++){ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3263 s->sprite_offset[0][i]<<= shift_y; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3264 s->sprite_offset[1][i]<<= shift_c; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3265 s->sprite_delta[0][i]<<= shift_y; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3266 s->sprite_delta[1][i]<<= shift_y; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3267 s->sprite_shift[i]= 16; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3268 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3269 s->real_sprite_warping_points= s->num_sprite_warping_points; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3270 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3271 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3272 |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3273 /** |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3274 * decodes the next video packet. |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3275 * @return <0 if something went wrong |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3276 */ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3277 static int mpeg4_decode_video_packet_header(MpegEncContext *s) |
453 | 3278 { |
290 | 3279 int mb_num_bits= av_log2(s->mb_num - 1) + 1; |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3280 int header_extension=0, mb_num, len; |
2967 | 3281 |
453 | 3282 /* is there enough space left for a video packet + header */ |
1025
1f9afd8b9131
GetBitContext.size is allways multiplied by 8 -> use size_in_bits to avoid useless *8 in a few inner loops
michaelni
parents:
1013
diff
changeset
|
3283 if( get_bits_count(&s->gb) > s->gb.size_in_bits-20) return -1; |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3284 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3285 for(len=0; len<32; len++){ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3286 if(get_bits1(&s->gb)) break; |
453 | 3287 } |
3288 | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3289 if(len!=ff_mpeg4_get_video_packet_prefix_length(s)){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
3290 av_log(s->avctx, AV_LOG_ERROR, "marker does not match f_code\n"); |
453 | 3291 return -1; |
3292 } | |
2967 | 3293 |
453 | 3294 if(s->shape != RECT_SHAPE){ |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3295 header_extension= get_bits1(&s->gb); |
453 | 3296 //FIXME more stuff here |
3297 } | |
3298 | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3299 mb_num= get_bits(&s->gb, mb_num_bits); |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3300 if(mb_num>=s->mb_num){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
3301 av_log(s->avctx, AV_LOG_ERROR, "illegal mb_num in video packet (%d %d) \n", mb_num, s->mb_num); |
453 | 3302 return -1; |
3303 } | |
6481 | 3304 if(s->pict_type == FF_B_TYPE){ |
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:
1176
diff
changeset
|
3305 while(s->next_picture.mbskip_table[ s->mb_index2xy[ mb_num ] ]) mb_num++; |
6497 | 3306 if(mb_num >= s->mb_num) return -1; // slice contains just skipped MBs which where already decoded |
1176 | 3307 } |
2967 | 3308 |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3309 s->mb_x= mb_num % s->mb_width; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3310 s->mb_y= mb_num / s->mb_width; |
453 | 3311 |
3312 if(s->shape != BIN_ONLY_SHAPE){ | |
2967 | 3313 int qscale= get_bits(&s->gb, s->quant_precision); |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3314 if(qscale) |
1644 | 3315 s->chroma_qscale=s->qscale= qscale; |
290 | 3316 } |
3317 | |
3318 if(s->shape == RECT_SHAPE){ | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3319 header_extension= get_bits1(&s->gb); |
290 | 3320 } |
3321 if(header_extension){ | |
453 | 3322 int time_increment; |
290 | 3323 int time_incr=0; |
453 | 3324 |
2967 | 3325 while (get_bits1(&s->gb) != 0) |
290 | 3326 time_incr++; |
3327 | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3328 check_marker(&s->gb, "before time_increment in video packed header"); |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3329 time_increment= get_bits(&s->gb, s->time_increment_bits); |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3330 check_marker(&s->gb, "before vop_coding_type in video packed header"); |
2967 | 3331 |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3332 skip_bits(&s->gb, 2); /* vop coding type */ |
290 | 3333 //FIXME not rect stuff here |
3334 | |
3335 if(s->shape != BIN_ONLY_SHAPE){ | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3336 skip_bits(&s->gb, 3); /* intra dc vlc threshold */ |
2646
c735e3e60ca7
Even More spelling errors. patch by (Kevin Baragona <kevinmb500 gawab com)
michael
parents:
2639
diff
changeset
|
3337 //FIXME don't just ignore everything |
6481 | 3338 if(s->pict_type == FF_S_TYPE && s->vol_sprite_usage==GMC_SPRITE){ |
1914 | 3339 mpeg4_decode_sprite_trajectory(s, &s->gb); |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
3340 av_log(s->avctx, AV_LOG_ERROR, "untested\n"); |
290 | 3341 } |
3342 | |
3343 //FIXME reduced res stuff here | |
2967 | 3344 |
6481 | 3345 if (s->pict_type != FF_I_TYPE) { |
2979 | 3346 int f_code = get_bits(&s->gb, 3); /* fcode_for */ |
660 | 3347 if(f_code==0){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
3348 av_log(s->avctx, AV_LOG_ERROR, "Error, video packet header damaged (f_code=0)\n"); |
290 | 3349 } |
3350 } | |
6481 | 3351 if (s->pict_type == FF_B_TYPE) { |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3352 int b_code = get_bits(&s->gb, 3); |
660 | 3353 if(b_code==0){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
3354 av_log(s->avctx, AV_LOG_ERROR, "Error, video packet header damaged (b_code=0)\n"); |
660 | 3355 } |
2967 | 3356 } |
290 | 3357 } |
3358 } | |
3359 //FIXME new-pred stuff | |
2967 | 3360 |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3361 return 0; |
453 | 3362 } |
3363 | |
3364 void ff_mpeg4_clean_buffers(MpegEncContext *s) | |
3365 { | |
3366 int c_wrap, c_xy, l_wrap, l_xy; | |
290 | 3367 |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1936
diff
changeset
|
3368 l_wrap= s->b8_stride; |
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1936
diff
changeset
|
3369 l_xy= (2*s->mb_y-1)*l_wrap + s->mb_x*2 - 1; |
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1936
diff
changeset
|
3370 c_wrap= s->mb_stride; |
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1936
diff
changeset
|
3371 c_xy= (s->mb_y-1)*c_wrap + s->mb_x - 1; |
290 | 3372 |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3373 #if 0 |
290 | 3374 /* clean DC */ |
453 | 3375 memsetw(s->dc_val[0] + l_xy, 1024, l_wrap*2+1); |
3376 memsetw(s->dc_val[1] + c_xy, 1024, c_wrap+1); | |
3377 memsetw(s->dc_val[2] + c_xy, 1024, c_wrap+1); | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3378 #endif |
290 | 3379 |
3380 /* clean AC */ | |
1064 | 3381 memset(s->ac_val[0] + l_xy, 0, (l_wrap*2+1)*16*sizeof(int16_t)); |
3382 memset(s->ac_val[1] + c_xy, 0, (c_wrap +1)*16*sizeof(int16_t)); | |
3383 memset(s->ac_val[2] + c_xy, 0, (c_wrap +1)*16*sizeof(int16_t)); | |
290 | 3384 |
3385 /* clean MV */ | |
2646
c735e3e60ca7
Even More spelling errors. patch by (Kevin Baragona <kevinmb500 gawab com)
michael
parents:
2639
diff
changeset
|
3386 // we can't clear the MVs as they might be needed by a b frame |
1064 | 3387 // memset(s->motion_val + l_xy, 0, (l_wrap*2+1)*2*sizeof(int16_t)); |
3388 // memset(s->motion_val, 0, 2*sizeof(int16_t)*(2 + s->mb_width*2)*(2 + s->mb_height*2)); | |
453 | 3389 s->last_mv[0][0][0]= |
3390 s->last_mv[0][0][1]= | |
3391 s->last_mv[1][0][0]= | |
3392 s->last_mv[1][0][1]= 0; | |
3393 } | |
3394 | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3395 /** |
9024
2bf694251330
Add ff_h263_find_resync_marker() to find the bit position of the next resync_marker, if any.
michael
parents:
9008
diff
changeset
|
3396 * finds the next resync_marker |
2bf694251330
Add ff_h263_find_resync_marker() to find the bit position of the next resync_marker, if any.
michael
parents:
9008
diff
changeset
|
3397 * @param p pointer to buffer to scan |
2bf694251330
Add ff_h263_find_resync_marker() to find the bit position of the next resync_marker, if any.
michael
parents:
9008
diff
changeset
|
3398 * @param end pointer to the end of the buffer |
10759
2bcd7a44350f
Remove residual use of the doxygen markup which is deprecated,
stefano
parents:
10755
diff
changeset
|
3399 * @return pointer to the next resync_marker, or end if none was found |
9024
2bf694251330
Add ff_h263_find_resync_marker() to find the bit position of the next resync_marker, if any.
michael
parents:
9008
diff
changeset
|
3400 */ |
2bf694251330
Add ff_h263_find_resync_marker() to find the bit position of the next resync_marker, if any.
michael
parents:
9008
diff
changeset
|
3401 const uint8_t *ff_h263_find_resync_marker(const uint8_t *restrict p, const uint8_t * restrict end) |
2bf694251330
Add ff_h263_find_resync_marker() to find the bit position of the next resync_marker, if any.
michael
parents:
9008
diff
changeset
|
3402 { |
2bf694251330
Add ff_h263_find_resync_marker() to find the bit position of the next resync_marker, if any.
michael
parents:
9008
diff
changeset
|
3403 assert(p < end); |
2bf694251330
Add ff_h263_find_resync_marker() to find the bit position of the next resync_marker, if any.
michael
parents:
9008
diff
changeset
|
3404 |
2bf694251330
Add ff_h263_find_resync_marker() to find the bit position of the next resync_marker, if any.
michael
parents:
9008
diff
changeset
|
3405 end-=2; |
2bf694251330
Add ff_h263_find_resync_marker() to find the bit position of the next resync_marker, if any.
michael
parents:
9008
diff
changeset
|
3406 p++; |
2bf694251330
Add ff_h263_find_resync_marker() to find the bit position of the next resync_marker, if any.
michael
parents:
9008
diff
changeset
|
3407 for(;p<end; p+=2){ |
2bf694251330
Add ff_h263_find_resync_marker() to find the bit position of the next resync_marker, if any.
michael
parents:
9008
diff
changeset
|
3408 if(!*p){ |
2bf694251330
Add ff_h263_find_resync_marker() to find the bit position of the next resync_marker, if any.
michael
parents:
9008
diff
changeset
|
3409 if (!p[-1] && p[1]) return p - 1; |
2bf694251330
Add ff_h263_find_resync_marker() to find the bit position of the next resync_marker, if any.
michael
parents:
9008
diff
changeset
|
3410 else if(!p[ 1] && p[2]) return p; |
2bf694251330
Add ff_h263_find_resync_marker() to find the bit position of the next resync_marker, if any.
michael
parents:
9008
diff
changeset
|
3411 } |
2bf694251330
Add ff_h263_find_resync_marker() to find the bit position of the next resync_marker, if any.
michael
parents:
9008
diff
changeset
|
3412 } |
2bf694251330
Add ff_h263_find_resync_marker() to find the bit position of the next resync_marker, if any.
michael
parents:
9008
diff
changeset
|
3413 return end+2; |
2bf694251330
Add ff_h263_find_resync_marker() to find the bit position of the next resync_marker, if any.
michael
parents:
9008
diff
changeset
|
3414 } |
2bf694251330
Add ff_h263_find_resync_marker() to find the bit position of the next resync_marker, if any.
michael
parents:
9008
diff
changeset
|
3415 |
2bf694251330
Add ff_h263_find_resync_marker() to find the bit position of the next resync_marker, if any.
michael
parents:
9008
diff
changeset
|
3416 /** |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3417 * decodes the group of blocks / video packet header. |
8691
25aa5388fa97
Make ff_h263_resync() return the bit position of the resync_marker or
benoit
parents:
8690
diff
changeset
|
3418 * @return bit position of the resync_marker, or <0 if none was found |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3419 */ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3420 int ff_h263_resync(MpegEncContext *s){ |
8691
25aa5388fa97
Make ff_h263_resync() return the bit position of the resync_marker or
benoit
parents:
8690
diff
changeset
|
3421 int left, pos, ret; |
2967 | 3422 |
1521 | 3423 if(s->codec_id==CODEC_ID_MPEG4){ |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3424 skip_bits1(&s->gb); |
1521 | 3425 align_get_bits(&s->gb); |
3426 } | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3427 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3428 if(show_bits(&s->gb, 16)==0){ |
8691
25aa5388fa97
Make ff_h263_resync() return the bit position of the resync_marker or
benoit
parents:
8690
diff
changeset
|
3429 pos= get_bits_count(&s->gb); |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3430 if(s->codec_id==CODEC_ID_MPEG4) |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3431 ret= mpeg4_decode_video_packet_header(s); |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3432 else |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3433 ret= h263_decode_gob_header(s); |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3434 if(ret>=0) |
8691
25aa5388fa97
Make ff_h263_resync() return the bit position of the resync_marker or
benoit
parents:
8690
diff
changeset
|
3435 return pos; |
453 | 3436 } |
5129 | 3437 //OK, it's not where it is supposed to be ... |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3438 s->gb= s->last_resync_gb; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3439 align_get_bits(&s->gb); |
10535
95f3daa991a2
Use get_bits_left() instead of size_in_bits - get_bits_count().
rbultje
parents:
9999
diff
changeset
|
3440 left= get_bits_left(&s->gb); |
2967 | 3441 |
3442 for(;left>16+1+5+5; left-=8){ | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3443 if(show_bits(&s->gb, 16)==0){ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3444 GetBitContext bak= s->gb; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3445 |
8691
25aa5388fa97
Make ff_h263_resync() return the bit position of the resync_marker or
benoit
parents:
8690
diff
changeset
|
3446 pos= get_bits_count(&s->gb); |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3447 if(s->codec_id==CODEC_ID_MPEG4) |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3448 ret= mpeg4_decode_video_packet_header(s); |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3449 else |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3450 ret= h263_decode_gob_header(s); |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3451 if(ret>=0) |
8691
25aa5388fa97
Make ff_h263_resync() return the bit position of the resync_marker or
benoit
parents:
8690
diff
changeset
|
3452 return pos; |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3453 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3454 s->gb= bak; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3455 } |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3456 skip_bits(&s->gb, 8); |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3457 } |
2967 | 3458 |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3459 return -1; |
453 | 3460 } |
3461 | |
10752
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3462 static int h263_decode_motion(MpegEncContext * s, int pred, int f_code) |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3463 { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3464 int code, val, sign, shift, l; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3465 code = get_vlc2(&s->gb, mv_vlc.table, MV_VLC_BITS, 2); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3466 |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3467 if (code == 0) |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3468 return pred; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3469 if (code < 0) |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3470 return 0xffff; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3471 |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3472 sign = get_bits1(&s->gb); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3473 shift = f_code - 1; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3474 val = code; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3475 if (shift) { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3476 val = (val - 1) << shift; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3477 val |= get_bits(&s->gb, shift); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3478 val++; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3479 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3480 if (sign) |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3481 val = -val; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3482 val += pred; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3483 |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3484 /* modulo decoding */ |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3485 if (!s->h263_long_vectors) { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3486 l = INT_BIT - 5 - f_code; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3487 val = (val<<l)>>l; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3488 } else { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3489 /* horrible h263 long vector mode */ |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3490 if (pred < -31 && val < -63) |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3491 val += 64; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3492 if (pred > 32 && val > 63) |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3493 val -= 64; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3494 |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3495 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3496 return val; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3497 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3498 |
453 | 3499 /** |
1034 | 3500 * gets the average motion vector for a GMC MB. |
753 | 3501 * @param n either 0 for the x component or 1 for y |
3502 * @returns the average MV for a GMC MB | |
3503 */ | |
3504 static inline int get_amv(MpegEncContext *s, int n){ | |
3505 int x, y, mb_v, sum, dx, dy, shift; | |
3506 int len = 1 << (s->f_code + 4); | |
3507 const int a= s->sprite_warping_accuracy; | |
2967 | 3508 |
1997 | 3509 if(s->workaround_bugs & FF_BUG_AMV) |
3510 len >>= s->quarter_sample; | |
753 | 3511 |
3512 if(s->real_sprite_warping_points==1){ | |
3513 if(s->divx_version==500 && s->divx_build==413) | |
3514 sum= s->sprite_offset[0][n] / (1<<(a - s->quarter_sample)); | |
3515 else | |
3516 sum= RSHIFT(s->sprite_offset[0][n]<<s->quarter_sample, a); | |
3517 }else{ | |
3518 dx= s->sprite_delta[n][0]; | |
3519 dy= s->sprite_delta[n][1]; | |
3520 shift= s->sprite_shift[0]; | |
3521 if(n) dy -= 1<<(shift + a + 1); | |
3522 else dx -= 1<<(shift + a + 1); | |
3523 mb_v= s->sprite_offset[0][n] + dx*s->mb_x*16 + dy*s->mb_y*16; | |
3524 | |
3525 sum=0; | |
3526 for(y=0; y<16; y++){ | |
3527 int v; | |
2967 | 3528 |
753 | 3529 v= mb_v + dy*y; |
3530 //XXX FIXME optimize | |
3531 for(x=0; x<16; x++){ | |
3532 sum+= v>>shift; | |
3533 v+= dx; | |
3534 } | |
3535 } | |
999
74dc4105e147
average motion vector rounding like the reference says and not what the standard says
michaelni
parents:
953
diff
changeset
|
3536 sum= RSHIFT(sum, a+8-s->quarter_sample); |
753 | 3537 } |
3538 | |
3539 if (sum < -len) sum= -len; | |
3540 else if (sum >= len) sum= len-1; | |
3541 | |
3542 return sum; | |
3543 } | |
3544 | |
3545 /** | |
10753
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3546 * decodes the dc value. |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3547 * @param n block index (0-3 are luma, 4-5 are chroma) |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3548 * @param dir_ptr the prediction direction will be stored here |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3549 * @return the quantized dc |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3550 */ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3551 static inline int mpeg4_decode_dc(MpegEncContext * s, int n, int *dir_ptr) |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3552 { |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3553 int level, code; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3554 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3555 if (n < 4) |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3556 code = get_vlc2(&s->gb, dc_lum.table, DC_VLC_BITS, 1); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3557 else |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3558 code = get_vlc2(&s->gb, dc_chrom.table, DC_VLC_BITS, 1); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3559 if (code < 0 || code > 9 /* && s->nbit<9 */){ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3560 av_log(s->avctx, AV_LOG_ERROR, "illegal dc vlc\n"); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3561 return -1; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3562 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3563 if (code == 0) { |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3564 level = 0; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3565 } else { |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3566 if(IS_3IV1){ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3567 if(code==1) |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3568 level= 2*get_bits1(&s->gb)-1; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3569 else{ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3570 if(get_bits1(&s->gb)) |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3571 level = get_bits(&s->gb, code-1) + (1<<(code-1)); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3572 else |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3573 level = -get_bits(&s->gb, code-1) - (1<<(code-1)); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3574 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3575 }else{ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3576 level = get_xbits(&s->gb, code); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3577 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3578 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3579 if (code > 8){ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3580 if(get_bits1(&s->gb)==0){ /* marker */ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3581 if(s->error_recognition>=2){ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3582 av_log(s->avctx, AV_LOG_ERROR, "dc marker bit missing\n"); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3583 return -1; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3584 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3585 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3586 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3587 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3588 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3589 return ff_mpeg4_pred_dc(s, n, level, dir_ptr, 0); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3590 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3591 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3592 /** |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3593 * decodes first partition. |
6524 | 3594 * @return number of MBs decoded or <0 if an error occurred |
453 | 3595 */ |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3596 static int mpeg4_decode_partition_a(MpegEncContext *s){ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3597 int mb_num; |
1064 | 3598 static const int8_t quant_tab[4] = { -1, -2, 1, 2 }; |
2967 | 3599 |
453 | 3600 /* decode first partition */ |
3601 mb_num=0; | |
290 | 3602 s->first_slice_line=1; |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3603 for(; s->mb_y<s->mb_height; s->mb_y++){ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3604 ff_init_block_index(s); |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3605 for(; s->mb_x<s->mb_width; s->mb_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:
1176
diff
changeset
|
3606 const int xy= s->mb_x + s->mb_y*s->mb_stride; |
453 | 3607 int cbpc; |
3608 int dir=0; | |
2967 | 3609 |
453 | 3610 mb_num++; |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3611 ff_update_block_index(s); |
453 | 3612 if(s->mb_x == s->resync_mb_x && s->mb_y == s->resync_mb_y+1) |
3613 s->first_slice_line=0; | |
2967 | 3614 |
6481 | 3615 if(s->pict_type==FF_I_TYPE){ |
453 | 3616 int i; |
3617 | |
1482 | 3618 do{ |
1873 | 3619 if(show_bits_long(&s->gb, 19)==DC_MARKER){ |
3620 return mb_num-1; | |
3621 } | |
3622 | |
1482 | 3623 cbpc = get_vlc2(&s->gb, intra_MCBPC_vlc.table, INTRA_MCBPC_VLC_BITS, 2); |
3624 if (cbpc < 0){ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
3625 av_log(s->avctx, AV_LOG_ERROR, "cbpc corrupted at %d %d\n", s->mb_x, s->mb_y); |
1482 | 3626 return -1; |
3627 } | |
3628 }while(cbpc == 8); | |
2967 | 3629 |
453 | 3630 s->cbp_table[xy]= cbpc & 3; |
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:
1176
diff
changeset
|
3631 s->current_picture.mb_type[xy]= MB_TYPE_INTRA; |
453 | 3632 s->mb_intra = 1; |
3633 | |
3634 if(cbpc & 4) { | |
1652 | 3635 ff_set_qscale(s, s->qscale + quant_tab[get_bits(&s->gb, 2)]); |
453 | 3636 } |
903 | 3637 s->current_picture.qscale_table[xy]= s->qscale; |
453 | 3638 |
3639 s->mbintra_table[xy]= 1; | |
3640 for(i=0; i<6; i++){ | |
3641 int dc_pred_dir; | |
2967 | 3642 int dc= mpeg4_decode_dc(s, i, &dc_pred_dir); |
453 | 3643 if(dc < 0){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
3644 av_log(s->avctx, AV_LOG_ERROR, "DC corrupted at %d %d\n", s->mb_x, s->mb_y); |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3645 return -1; |
453 | 3646 } |
3647 dir<<=1; | |
3648 if(dc_pred_dir) dir|=1; | |
3649 } | |
3650 s->pred_dir_table[xy]= dir; | |
3651 }else{ /* P/S_TYPE */ | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3652 int mx, my, pred_x, pred_y, bits; |
1668
30746f429df6
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1666
diff
changeset
|
3653 int16_t * const mot_val= s->current_picture.motion_val[0][s->block_index[0]]; |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1936
diff
changeset
|
3654 const int stride= s->b8_stride*2; |
453 | 3655 |
1873 | 3656 try_again: |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3657 bits= show_bits(&s->gb, 17); |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3658 if(bits==MOTION_MARKER){ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3659 return mb_num-1; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3660 } |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3661 skip_bits1(&s->gb); |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3662 if(bits&0x10000){ |
453 | 3663 /* skip mb */ |
6481 | 3664 if(s->pict_type==FF_S_TYPE && s->vol_sprite_usage==GMC_SPRITE){ |
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:
1176
diff
changeset
|
3665 s->current_picture.mb_type[xy]= MB_TYPE_SKIP | MB_TYPE_16x16 | MB_TYPE_GMC | MB_TYPE_L0; |
753 | 3666 mx= get_amv(s, 0); |
3667 my= get_amv(s, 1); | |
453 | 3668 }else{ |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1176
diff
changeset
|
3669 s->current_picture.mb_type[xy]= MB_TYPE_SKIP | MB_TYPE_16x16 | MB_TYPE_L0; |
753 | 3670 mx=my=0; |
453 | 3671 } |
3672 mot_val[0 ]= mot_val[2 ]= | |
3673 mot_val[0+stride]= mot_val[2+stride]= mx; | |
3674 mot_val[1 ]= mot_val[3 ]= | |
3675 mot_val[1+stride]= mot_val[3+stride]= my; | |
3676 | |
3677 if(s->mbintra_table[xy]) | |
3678 ff_clean_intra_table_entries(s); | |
3679 continue; | |
3680 } | |
1482 | 3681 |
544 | 3682 cbpc = get_vlc2(&s->gb, inter_MCBPC_vlc.table, INTER_MCBPC_VLC_BITS, 2); |
453 | 3683 if (cbpc < 0){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
3684 av_log(s->avctx, AV_LOG_ERROR, "cbpc corrupted at %d %d\n", s->mb_x, s->mb_y); |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3685 return -1; |
453 | 3686 } |
1873 | 3687 if(cbpc == 20) |
3688 goto try_again; | |
1482 | 3689 |
453 | 3690 s->cbp_table[xy]= cbpc&(8+3); //8 is dquant |
2967 | 3691 |
453 | 3692 s->mb_intra = ((cbpc & 4) != 0); |
2967 | 3693 |
453 | 3694 if(s->mb_intra){ |
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:
1176
diff
changeset
|
3695 s->current_picture.mb_type[xy]= MB_TYPE_INTRA; |
453 | 3696 s->mbintra_table[xy]= 1; |
2967 | 3697 mot_val[0 ]= mot_val[2 ]= |
453 | 3698 mot_val[0+stride]= mot_val[2+stride]= 0; |
3699 mot_val[1 ]= mot_val[3 ]= | |
3700 mot_val[1+stride]= mot_val[3+stride]= 0; | |
3701 }else{ | |
3702 if(s->mbintra_table[xy]) | |
3703 ff_clean_intra_table_entries(s); | |
3704 | |
6481 | 3705 if(s->pict_type==FF_S_TYPE && s->vol_sprite_usage==GMC_SPRITE && (cbpc & 16) == 0) |
453 | 3706 s->mcsel= get_bits1(&s->gb); |
3707 else s->mcsel= 0; | |
2967 | 3708 |
453 | 3709 if ((cbpc & 16) == 0) { |
3710 /* 16x16 motion prediction */ | |
3711 | |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1936
diff
changeset
|
3712 h263_pred_motion(s, 0, 0, &pred_x, &pred_y); |
753 | 3713 if(!s->mcsel){ |
3714 mx = h263_decode_motion(s, pred_x, s->f_code); | |
3715 if (mx >= 0xffff) | |
3716 return -1; | |
3717 | |
3718 my = h263_decode_motion(s, pred_y, s->f_code); | |
3719 if (my >= 0xffff) | |
3720 return -1; | |
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:
1176
diff
changeset
|
3721 s->current_picture.mb_type[xy]= MB_TYPE_16x16 | MB_TYPE_L0; |
753 | 3722 } else { |
3723 mx = get_amv(s, 0); | |
3724 my = get_amv(s, 1); | |
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:
1176
diff
changeset
|
3725 s->current_picture.mb_type[xy]= MB_TYPE_16x16 | MB_TYPE_GMC | MB_TYPE_L0; |
453 | 3726 } |
753 | 3727 |
453 | 3728 mot_val[0 ]= mot_val[2 ] = |
3729 mot_val[0+stride]= mot_val[2+stride]= mx; | |
3730 mot_val[1 ]= mot_val[3 ]= | |
3731 mot_val[1+stride]= mot_val[3+stride]= my; | |
3732 } else { | |
3733 int i; | |
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:
1176
diff
changeset
|
3734 s->current_picture.mb_type[xy]= MB_TYPE_8x8 | MB_TYPE_L0; |
453 | 3735 for(i=0;i<4;i++) { |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1936
diff
changeset
|
3736 int16_t *mot_val= h263_pred_motion(s, i, 0, &pred_x, &pred_y); |
453 | 3737 mx = h263_decode_motion(s, pred_x, s->f_code); |
3738 if (mx >= 0xffff) | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3739 return -1; |
2967 | 3740 |
453 | 3741 my = h263_decode_motion(s, pred_y, s->f_code); |
3742 if (my >= 0xffff) | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3743 return -1; |
453 | 3744 mot_val[0] = mx; |
3745 mot_val[1] = my; | |
3746 } | |
3747 } | |
3748 } | |
3749 } | |
3750 } | |
3751 s->mb_x= 0; | |
3752 } | |
3753 | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3754 return mb_num; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3755 } |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3756 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3757 /** |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3758 * decode second partition. |
6524 | 3759 * @return <0 if an error occurred |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3760 */ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3761 static int mpeg4_decode_partition_b(MpegEncContext *s, int mb_count){ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3762 int mb_num=0; |
1064 | 3763 static const int8_t quant_tab[4] = { -1, -2, 1, 2 }; |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3764 |
453 | 3765 s->mb_x= s->resync_mb_x; |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3766 s->first_slice_line=1; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3767 for(s->mb_y= s->resync_mb_y; mb_num < mb_count; s->mb_y++){ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3768 ff_init_block_index(s); |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3769 for(; mb_num < mb_count && s->mb_x<s->mb_width; s->mb_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:
1176
diff
changeset
|
3770 const int xy= s->mb_x + s->mb_y*s->mb_stride; |
453 | 3771 |
3772 mb_num++; | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3773 ff_update_block_index(s); |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3774 if(s->mb_x == s->resync_mb_x && s->mb_y == s->resync_mb_y+1) |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3775 s->first_slice_line=0; |
2967 | 3776 |
6481 | 3777 if(s->pict_type==FF_I_TYPE){ |
453 | 3778 int ac_pred= get_bits1(&s->gb); |
544 | 3779 int cbpy = get_vlc2(&s->gb, cbpy_vlc.table, CBPY_VLC_BITS, 1); |
453 | 3780 if(cbpy<0){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
3781 av_log(s->avctx, AV_LOG_ERROR, "cbpy corrupted at %d %d\n", s->mb_x, s->mb_y); |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3782 return -1; |
453 | 3783 } |
2967 | 3784 |
453 | 3785 s->cbp_table[xy]|= cbpy<<2; |
2967 | 3786 s->current_picture.mb_type[xy] |= ac_pred*MB_TYPE_ACPRED; |
453 | 3787 }else{ /* P || S_TYPE */ |
2967 | 3788 if(IS_INTRA(s->current_picture.mb_type[xy])){ |
453 | 3789 int dir=0,i; |
3790 int ac_pred = get_bits1(&s->gb); | |
544 | 3791 int cbpy = get_vlc2(&s->gb, cbpy_vlc.table, CBPY_VLC_BITS, 1); |
453 | 3792 |
3793 if(cbpy<0){ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
3794 av_log(s->avctx, AV_LOG_ERROR, "I cbpy corrupted at %d %d\n", s->mb_x, s->mb_y); |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3795 return -1; |
453 | 3796 } |
2967 | 3797 |
453 | 3798 if(s->cbp_table[xy] & 8) { |
1652 | 3799 ff_set_qscale(s, s->qscale + quant_tab[get_bits(&s->gb, 2)]); |
453 | 3800 } |
903 | 3801 s->current_picture.qscale_table[xy]= s->qscale; |
453 | 3802 |
3803 for(i=0; i<6; i++){ | |
3804 int dc_pred_dir; | |
2967 | 3805 int dc= mpeg4_decode_dc(s, i, &dc_pred_dir); |
453 | 3806 if(dc < 0){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
3807 av_log(s->avctx, AV_LOG_ERROR, "DC corrupted at %d %d\n", s->mb_x, s->mb_y); |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3808 return -1; |
453 | 3809 } |
3810 dir<<=1; | |
3811 if(dc_pred_dir) dir|=1; | |
3812 } | |
3813 s->cbp_table[xy]&= 3; //remove dquant | |
3814 s->cbp_table[xy]|= cbpy<<2; | |
2967 | 3815 s->current_picture.mb_type[xy] |= ac_pred*MB_TYPE_ACPRED; |
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:
1176
diff
changeset
|
3816 s->pred_dir_table[xy]= dir; |
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:
1176
diff
changeset
|
3817 }else if(IS_SKIP(s->current_picture.mb_type[xy])){ |
903 | 3818 s->current_picture.qscale_table[xy]= s->qscale; |
453 | 3819 s->cbp_table[xy]= 0; |
3820 }else{ | |
544 | 3821 int cbpy = get_vlc2(&s->gb, cbpy_vlc.table, CBPY_VLC_BITS, 1); |
453 | 3822 |
3823 if(cbpy<0){ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
3824 av_log(s->avctx, AV_LOG_ERROR, "P cbpy corrupted at %d %d\n", s->mb_x, s->mb_y); |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3825 return -1; |
453 | 3826 } |
2967 | 3827 |
453 | 3828 if(s->cbp_table[xy] & 8) { |
1652 | 3829 ff_set_qscale(s, s->qscale + quant_tab[get_bits(&s->gb, 2)]); |
453 | 3830 } |
903 | 3831 s->current_picture.qscale_table[xy]= s->qscale; |
453 | 3832 |
3833 s->cbp_table[xy]&= 3; //remove dquant | |
3834 s->cbp_table[xy]|= (cbpy^0xf)<<2; | |
3835 } | |
3836 } | |
3837 } | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3838 if(mb_num >= mb_count) return 0; |
453 | 3839 s->mb_x= 0; |
3840 } | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3841 return 0; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3842 } |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3843 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3844 /** |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3845 * decodes the first & second partition |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3846 * @return <0 if error (and sets error type in the error_status_table) |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3847 */ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3848 int ff_mpeg4_decode_partitions(MpegEncContext *s) |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3849 { |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3850 int mb_num; |
6481 | 3851 const int part_a_error= s->pict_type==FF_I_TYPE ? (DC_ERROR|MV_ERROR) : MV_ERROR; |
3852 const int part_a_end = s->pict_type==FF_I_TYPE ? (DC_END |MV_END) : MV_END; | |
2967 | 3853 |
3854 mb_num= mpeg4_decode_partition_a(s); | |
1144 | 3855 if(mb_num<0){ |
3856 ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y, s->mb_x, s->mb_y, part_a_error); | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3857 return -1; |
1144 | 3858 } |
2967 | 3859 |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3860 if(s->resync_mb_x + s->resync_mb_y*s->mb_width + mb_num > s->mb_num){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
3861 av_log(s->avctx, AV_LOG_ERROR, "slice below monitor ...\n"); |
1144 | 3862 ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y, s->mb_x, s->mb_y, part_a_error); |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3863 return -1; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3864 } |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3865 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3866 s->mb_num_left= mb_num; |
2967 | 3867 |
6481 | 3868 if(s->pict_type==FF_I_TYPE){ |
1873 | 3869 while(show_bits(&s->gb, 9) == 1) |
3870 skip_bits(&s->gb, 9); | |
1257 | 3871 if(get_bits_long(&s->gb, 19)!=DC_MARKER){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
3872 av_log(s->avctx, AV_LOG_ERROR, "marker missing after first I partition at %d %d\n", s->mb_x, s->mb_y); |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3873 return -1; |
1144 | 3874 } |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3875 }else{ |
1873 | 3876 while(show_bits(&s->gb, 10) == 1) |
3877 skip_bits(&s->gb, 10); | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3878 if(get_bits(&s->gb, 17)!=MOTION_MARKER){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
3879 av_log(s->avctx, AV_LOG_ERROR, "marker missing after first P partition at %d %d\n", s->mb_x, s->mb_y); |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3880 return -1; |
1144 | 3881 } |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3882 } |
1144 | 3883 ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y, s->mb_x-1, s->mb_y, part_a_end); |
2967 | 3884 |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3885 if( mpeg4_decode_partition_b(s, mb_num) < 0){ |
6481 | 3886 if(s->pict_type==FF_P_TYPE) |
1144 | 3887 ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y, s->mb_x, s->mb_y, DC_ERROR); |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3888 return -1; |
1144 | 3889 }else{ |
6481 | 3890 if(s->pict_type==FF_P_TYPE) |
1144 | 3891 ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y, s->mb_x-1, s->mb_y, DC_END); |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3892 } |
453 | 3893 |
2967 | 3894 return 0; |
453 | 3895 } |
3896 | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3897 /** |
10753
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3898 * decodes a block. |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3899 * @return <0 if an error occurred |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3900 */ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3901 static inline int mpeg4_decode_block(MpegEncContext * s, DCTELEM * block, |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3902 int n, int coded, int intra, int rvlc) |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3903 { |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3904 int level, i, last, run; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3905 int dc_pred_dir; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3906 RLTable * rl; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3907 RL_VLC_ELEM * rl_vlc; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3908 const uint8_t * scan_table; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3909 int qmul, qadd; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3910 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3911 //Note intra & rvlc should be optimized away if this is inlined |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3912 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3913 if(intra) { |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3914 if(s->use_intra_dc_vlc){ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3915 /* DC coef */ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3916 if(s->partitioned_frame){ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3917 level = s->dc_val[0][ s->block_index[n] ]; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3918 if(n<4) level= FASTDIV((level + (s->y_dc_scale>>1)), s->y_dc_scale); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3919 else level= FASTDIV((level + (s->c_dc_scale>>1)), s->c_dc_scale); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3920 dc_pred_dir= (s->pred_dir_table[s->mb_x + s->mb_y*s->mb_stride]<<n)&32; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3921 }else{ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3922 level = mpeg4_decode_dc(s, n, &dc_pred_dir); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3923 if (level < 0) |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3924 return -1; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3925 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3926 block[0] = level; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3927 i = 0; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3928 }else{ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3929 i = -1; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3930 ff_mpeg4_pred_dc(s, n, 0, &dc_pred_dir, 0); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3931 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3932 if (!coded) |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3933 goto not_coded; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3934 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3935 if(rvlc){ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3936 rl = &rvlc_rl_intra; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3937 rl_vlc = rvlc_rl_intra.rl_vlc[0]; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3938 }else{ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3939 rl = &rl_intra; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3940 rl_vlc = rl_intra.rl_vlc[0]; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3941 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3942 if (s->ac_pred) { |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3943 if (dc_pred_dir == 0) |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3944 scan_table = s->intra_v_scantable.permutated; /* left */ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3945 else |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3946 scan_table = s->intra_h_scantable.permutated; /* top */ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3947 } else { |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3948 scan_table = s->intra_scantable.permutated; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3949 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3950 qmul=1; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3951 qadd=0; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3952 } else { |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3953 i = -1; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3954 if (!coded) { |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3955 s->block_last_index[n] = i; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3956 return 0; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3957 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3958 if(rvlc) rl = &rvlc_rl_inter; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3959 else rl = &rl_inter; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3960 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3961 scan_table = s->intra_scantable.permutated; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3962 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3963 if(s->mpeg_quant){ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3964 qmul=1; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3965 qadd=0; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3966 if(rvlc){ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3967 rl_vlc = rvlc_rl_inter.rl_vlc[0]; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3968 }else{ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3969 rl_vlc = rl_inter.rl_vlc[0]; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3970 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3971 }else{ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3972 qmul = s->qscale << 1; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3973 qadd = (s->qscale - 1) | 1; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3974 if(rvlc){ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3975 rl_vlc = rvlc_rl_inter.rl_vlc[s->qscale]; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3976 }else{ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3977 rl_vlc = rl_inter.rl_vlc[s->qscale]; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3978 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3979 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3980 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3981 { |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3982 OPEN_READER(re, &s->gb); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3983 for(;;) { |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3984 UPDATE_CACHE(re, &s->gb); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3985 GET_RL_VLC(level, run, re, &s->gb, rl_vlc, TEX_VLC_BITS, 2, 0); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3986 if (level==0) { |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3987 /* escape */ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3988 if(rvlc){ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3989 if(SHOW_UBITS(re, &s->gb, 1)==0){ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3990 av_log(s->avctx, AV_LOG_ERROR, "1. marker bit missing in rvlc esc\n"); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3991 return -1; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3992 }; SKIP_CACHE(re, &s->gb, 1); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3993 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3994 last= SHOW_UBITS(re, &s->gb, 1); SKIP_CACHE(re, &s->gb, 1); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3995 run= SHOW_UBITS(re, &s->gb, 6); LAST_SKIP_CACHE(re, &s->gb, 6); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3996 SKIP_COUNTER(re, &s->gb, 1+1+6); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3997 UPDATE_CACHE(re, &s->gb); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3998 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3999 if(SHOW_UBITS(re, &s->gb, 1)==0){ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4000 av_log(s->avctx, AV_LOG_ERROR, "2. marker bit missing in rvlc esc\n"); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4001 return -1; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4002 }; SKIP_CACHE(re, &s->gb, 1); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4003 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4004 level= SHOW_UBITS(re, &s->gb, 11); SKIP_CACHE(re, &s->gb, 11); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4005 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4006 if(SHOW_UBITS(re, &s->gb, 5)!=0x10){ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4007 av_log(s->avctx, AV_LOG_ERROR, "reverse esc missing\n"); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4008 return -1; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4009 }; SKIP_CACHE(re, &s->gb, 5); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4010 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4011 level= level * qmul + qadd; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4012 level = (level ^ SHOW_SBITS(re, &s->gb, 1)) - SHOW_SBITS(re, &s->gb, 1); LAST_SKIP_CACHE(re, &s->gb, 1); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4013 SKIP_COUNTER(re, &s->gb, 1+11+5+1); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4014 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4015 i+= run + 1; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4016 if(last) i+=192; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4017 }else{ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4018 int cache; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4019 cache= GET_CACHE(re, &s->gb); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4020 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4021 if(IS_3IV1) |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4022 cache ^= 0xC0000000; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4023 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4024 if (cache&0x80000000) { |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4025 if (cache&0x40000000) { |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4026 /* third escape */ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4027 SKIP_CACHE(re, &s->gb, 2); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4028 last= SHOW_UBITS(re, &s->gb, 1); SKIP_CACHE(re, &s->gb, 1); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4029 run= SHOW_UBITS(re, &s->gb, 6); LAST_SKIP_CACHE(re, &s->gb, 6); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4030 SKIP_COUNTER(re, &s->gb, 2+1+6); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4031 UPDATE_CACHE(re, &s->gb); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4032 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4033 if(IS_3IV1){ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4034 level= SHOW_SBITS(re, &s->gb, 12); LAST_SKIP_BITS(re, &s->gb, 12); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4035 }else{ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4036 if(SHOW_UBITS(re, &s->gb, 1)==0){ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4037 av_log(s->avctx, AV_LOG_ERROR, "1. marker bit missing in 3. esc\n"); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4038 return -1; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4039 }; SKIP_CACHE(re, &s->gb, 1); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4040 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4041 level= SHOW_SBITS(re, &s->gb, 12); SKIP_CACHE(re, &s->gb, 12); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4042 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4043 if(SHOW_UBITS(re, &s->gb, 1)==0){ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4044 av_log(s->avctx, AV_LOG_ERROR, "2. marker bit missing in 3. esc\n"); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4045 return -1; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4046 }; LAST_SKIP_CACHE(re, &s->gb, 1); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4047 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4048 SKIP_COUNTER(re, &s->gb, 1+12+1); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4049 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4050 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4051 #if 0 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4052 if(s->error_recognition >= FF_ER_COMPLIANT){ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4053 const int abs_level= FFABS(level); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4054 if(abs_level<=MAX_LEVEL && run<=MAX_RUN){ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4055 const int run1= run - rl->max_run[last][abs_level] - 1; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4056 if(abs_level <= rl->max_level[last][run]){ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4057 av_log(s->avctx, AV_LOG_ERROR, "illegal 3. esc, vlc encoding possible\n"); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4058 return -1; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4059 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4060 if(s->error_recognition > FF_ER_COMPLIANT){ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4061 if(abs_level <= rl->max_level[last][run]*2){ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4062 av_log(s->avctx, AV_LOG_ERROR, "illegal 3. esc, esc 1 encoding possible\n"); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4063 return -1; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4064 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4065 if(run1 >= 0 && abs_level <= rl->max_level[last][run1]){ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4066 av_log(s->avctx, AV_LOG_ERROR, "illegal 3. esc, esc 2 encoding possible\n"); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4067 return -1; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4068 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4069 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4070 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4071 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4072 #endif |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4073 if (level>0) level= level * qmul + qadd; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4074 else level= level * qmul - qadd; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4075 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4076 if((unsigned)(level + 2048) > 4095){ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4077 if(s->error_recognition > FF_ER_COMPLIANT){ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4078 if(level > 2560 || level<-2560){ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4079 av_log(s->avctx, AV_LOG_ERROR, "|level| overflow in 3. esc, qp=%d\n", s->qscale); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4080 return -1; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4081 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4082 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4083 level= level<0 ? -2048 : 2047; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4084 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4085 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4086 i+= run + 1; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4087 if(last) i+=192; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4088 } else { |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4089 /* second escape */ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4090 #if MIN_CACHE_BITS < 20 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4091 LAST_SKIP_BITS(re, &s->gb, 2); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4092 UPDATE_CACHE(re, &s->gb); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4093 #else |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4094 SKIP_BITS(re, &s->gb, 2); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4095 #endif |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4096 GET_RL_VLC(level, run, re, &s->gb, rl_vlc, TEX_VLC_BITS, 2, 1); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4097 i+= run + rl->max_run[run>>7][level/qmul] +1; //FIXME opt indexing |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4098 level = (level ^ SHOW_SBITS(re, &s->gb, 1)) - SHOW_SBITS(re, &s->gb, 1); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4099 LAST_SKIP_BITS(re, &s->gb, 1); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4100 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4101 } else { |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4102 /* first escape */ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4103 #if MIN_CACHE_BITS < 19 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4104 LAST_SKIP_BITS(re, &s->gb, 1); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4105 UPDATE_CACHE(re, &s->gb); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4106 #else |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4107 SKIP_BITS(re, &s->gb, 1); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4108 #endif |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4109 GET_RL_VLC(level, run, re, &s->gb, rl_vlc, TEX_VLC_BITS, 2, 1); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4110 i+= run; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4111 level = level + rl->max_level[run>>7][(run-1)&63] * qmul;//FIXME opt indexing |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4112 level = (level ^ SHOW_SBITS(re, &s->gb, 1)) - SHOW_SBITS(re, &s->gb, 1); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4113 LAST_SKIP_BITS(re, &s->gb, 1); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4114 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4115 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4116 } else { |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4117 i+= run; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4118 level = (level ^ SHOW_SBITS(re, &s->gb, 1)) - SHOW_SBITS(re, &s->gb, 1); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4119 LAST_SKIP_BITS(re, &s->gb, 1); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4120 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4121 if (i > 62){ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4122 i-= 192; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4123 if(i&(~63)){ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4124 av_log(s->avctx, AV_LOG_ERROR, "ac-tex damaged at %d %d\n", s->mb_x, s->mb_y); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4125 return -1; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4126 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4127 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4128 block[scan_table[i]] = level; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4129 break; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4130 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4131 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4132 block[scan_table[i]] = level; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4133 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4134 CLOSE_READER(re, &s->gb); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4135 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4136 not_coded: |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4137 if (intra) { |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4138 if(!s->use_intra_dc_vlc){ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4139 block[0] = ff_mpeg4_pred_dc(s, n, block[0], &dc_pred_dir, 0); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4140 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4141 i -= i>>31; //if(i == -1) i=0; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4142 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4143 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4144 mpeg4_pred_ac(s, block, n, dc_pred_dir); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4145 if (s->ac_pred) { |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4146 i = 63; /* XXX: not optimal */ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4147 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4148 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4149 s->block_last_index[n] = i; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4150 return 0; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4151 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4152 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4153 /** |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
4154 * decode partition C of one MB. |
6524 | 4155 * @return <0 if an error occurred |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
4156 */ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
4157 static int mpeg4_decode_partitioned_mb(MpegEncContext *s, DCTELEM block[6][64]) |
453 | 4158 { |
4159 int cbp, mb_type; | |
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:
1176
diff
changeset
|
4160 const int xy= s->mb_x + s->mb_y*s->mb_stride; |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1176
diff
changeset
|
4161 |
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:
1176
diff
changeset
|
4162 mb_type= s->current_picture.mb_type[xy]; |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
4163 cbp = s->cbp_table[xy]; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
4164 |
3282 | 4165 s->use_intra_dc_vlc= s->qscale < s->intra_dc_threshold; |
4166 | |
903 | 4167 if(s->current_picture.qscale_table[xy] != s->qscale){ |
1652 | 4168 ff_set_qscale(s, s->current_picture.qscale_table[xy] ); |
453 | 4169 } |
2967 | 4170 |
6481 | 4171 if (s->pict_type == FF_P_TYPE || s->pict_type==FF_S_TYPE) { |
453 | 4172 int i; |
4173 for(i=0; i<4; i++){ | |
1668
30746f429df6
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1666
diff
changeset
|
4174 s->mv[0][i][0] = s->current_picture.motion_val[0][ s->block_index[i] ][0]; |
30746f429df6
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1666
diff
changeset
|
4175 s->mv[0][i][1] = s->current_picture.motion_val[0][ s->block_index[i] ][1]; |
453 | 4176 } |
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:
1176
diff
changeset
|
4177 s->mb_intra = IS_INTRA(mb_type); |
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:
1176
diff
changeset
|
4178 |
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:
1176
diff
changeset
|
4179 if (IS_SKIP(mb_type)) { |
453 | 4180 /* skip mb */ |
4181 for(i=0;i<6;i++) | |
4182 s->block_last_index[i] = -1; | |
4183 s->mv_dir = MV_DIR_FORWARD; | |
4184 s->mv_type = MV_TYPE_16X16; | |
6481 | 4185 if(s->pict_type==FF_S_TYPE && s->vol_sprite_usage==GMC_SPRITE){ |
453 | 4186 s->mcsel=1; |
2628
511e3afc43e1
Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents:
2615
diff
changeset
|
4187 s->mb_skipped = 0; |
453 | 4188 }else{ |
4189 s->mcsel=0; | |
2628
511e3afc43e1
Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents:
2615
diff
changeset
|
4190 s->mb_skipped = 1; |
453 | 4191 } |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
4192 }else if(s->mb_intra){ |
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:
1176
diff
changeset
|
4193 s->ac_pred = IS_ACPRED(s->current_picture.mb_type[xy]); |
453 | 4194 }else if(!s->mb_intra){ |
4195 // s->mcsel= 0; //FIXME do we need to init that | |
2967 | 4196 |
453 | 4197 s->mv_dir = MV_DIR_FORWARD; |
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:
1176
diff
changeset
|
4198 if (IS_8X8(mb_type)) { |
453 | 4199 s->mv_type = MV_TYPE_8X8; |
4200 } else { | |
4201 s->mv_type = MV_TYPE_16X16; | |
4202 } | |
4203 } | |
4204 } else { /* I-Frame */ | |
4205 s->mb_intra = 1; | |
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:
1176
diff
changeset
|
4206 s->ac_pred = IS_ACPRED(s->current_picture.mb_type[xy]); |
1132 | 4207 } |
4208 | |
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:
1176
diff
changeset
|
4209 if (!IS_SKIP(mb_type)) { |
1132 | 4210 int i; |
2632 | 4211 s->dsp.clear_blocks(s->block[0]); |
453 | 4212 /* decode each block */ |
4213 for (i = 0; i < 6; i++) { | |
1132 | 4214 if(mpeg4_decode_block(s, block[i], i, cbp&32, s->mb_intra, s->rvlc) < 0){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
4215 av_log(s->avctx, AV_LOG_ERROR, "texture corrupted at %d %d %d\n", s->mb_x, s->mb_y, s->mb_intra); |
453 | 4216 return -1; |
4217 } | |
718 | 4218 cbp+=cbp; |
453 | 4219 } |
4220 } | |
290 | 4221 |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
4222 /* per-MB end of slice check */ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
4223 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
4224 if(--s->mb_num_left <= 0){ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
4225 if(mpeg4_is_resync(s)) |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
4226 return SLICE_END; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
4227 else |
2967 | 4228 return SLICE_NOEND; |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
4229 }else{ |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1176
diff
changeset
|
4230 if(mpeg4_is_resync(s)){ |
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:
1176
diff
changeset
|
4231 const int delta= s->mb_x + 1 == s->mb_width ? 2 : 1; |
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:
1176
diff
changeset
|
4232 if(s->cbp_table[xy+delta]) |
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:
1176
diff
changeset
|
4233 return SLICE_END; |
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:
1176
diff
changeset
|
4234 } |
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:
1176
diff
changeset
|
4235 return SLICE_OK; |
619
2be2cc8fd0a1
mpeg4 interlaced decoding support (not completly implemented/tested due to lack of samples)
michaelni
parents:
617
diff
changeset
|
4236 } |
2be2cc8fd0a1
mpeg4 interlaced decoding support (not completly implemented/tested due to lack of samples)
michaelni
parents:
617
diff
changeset
|
4237 } |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
4238 |
10752
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4239 /* Decodes RVLC of H.263+ UMV */ |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4240 static int h263p_decode_umotion(MpegEncContext * s, int pred) |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4241 { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4242 int code = 0, sign; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4243 |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4244 if (get_bits1(&s->gb)) /* Motion difference = 0 */ |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4245 return pred; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4246 |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4247 code = 2 + get_bits1(&s->gb); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4248 |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4249 while (get_bits1(&s->gb)) |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4250 { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4251 code <<= 1; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4252 code += get_bits1(&s->gb); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4253 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4254 sign = code & 1; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4255 code >>= 1; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4256 |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4257 code = (sign) ? (pred - code) : (pred + code); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4258 dprintf(s->avctx,"H.263+ UMV Motion = %d\n", code); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4259 return code; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4260 |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4261 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4262 |
1633 | 4263 /** |
4264 * read the next MVs for OBMC. yes this is a ugly hack, feel free to send a patch :) | |
4265 */ | |
4266 static void preview_obmc(MpegEncContext *s){ | |
4267 GetBitContext gb= s->gb; | |
2967 | 4268 |
1633 | 4269 int cbpc, i, pred_x, pred_y, mx, my; |
4270 int16_t *mot_val; | |
4271 const int xy= s->mb_x + 1 + s->mb_y * s->mb_stride; | |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1936
diff
changeset
|
4272 const int stride= s->b8_stride*2; |
2967 | 4273 |
1633 | 4274 for(i=0; i<4; i++) |
4275 s->block_index[i]+= 2; | |
4276 for(i=4; i<6; i++) | |
4277 s->block_index[i]+= 1; | |
4278 s->mb_x++; | |
2967 | 4279 |
6481 | 4280 assert(s->pict_type == FF_P_TYPE); |
1633 | 4281 |
4282 do{ | |
4283 if (get_bits1(&s->gb)) { | |
4284 /* skip mb */ | |
1668
30746f429df6
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1666
diff
changeset
|
4285 mot_val = s->current_picture.motion_val[0][ s->block_index[0] ]; |
2967 | 4286 mot_val[0 ]= mot_val[2 ]= |
1633 | 4287 mot_val[0+stride]= mot_val[2+stride]= 0; |
4288 mot_val[1 ]= mot_val[3 ]= | |
4289 mot_val[1+stride]= mot_val[3+stride]= 0; | |
2967 | 4290 |
1633 | 4291 s->current_picture.mb_type[xy]= MB_TYPE_SKIP | MB_TYPE_16x16 | MB_TYPE_L0; |
4292 goto end; | |
4293 } | |
4294 cbpc = get_vlc2(&s->gb, inter_MCBPC_vlc.table, INTER_MCBPC_VLC_BITS, 2); | |
4295 }while(cbpc == 20); | |
2967 | 4296 |
1633 | 4297 if(cbpc & 4){ |
4298 s->current_picture.mb_type[xy]= MB_TYPE_INTRA; | |
4299 }else{ | |
4300 get_vlc2(&s->gb, cbpy_vlc.table, CBPY_VLC_BITS, 1); | |
4301 if (cbpc & 8) { | |
1656 | 4302 if(s->modified_quant){ |
4303 if(get_bits1(&s->gb)) skip_bits(&s->gb, 1); | |
4304 else skip_bits(&s->gb, 5); | |
4305 }else | |
4306 skip_bits(&s->gb, 2); | |
1633 | 4307 } |
2967 | 4308 |
1633 | 4309 if ((cbpc & 16) == 0) { |
2967 | 4310 s->current_picture.mb_type[xy]= MB_TYPE_16x16 | MB_TYPE_L0; |
1633 | 4311 /* 16x16 motion prediction */ |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1936
diff
changeset
|
4312 mot_val= h263_pred_motion(s, 0, 0, &pred_x, &pred_y); |
1633 | 4313 if (s->umvplus) |
4314 mx = h263p_decode_umotion(s, pred_x); | |
4315 else | |
1655 | 4316 mx = h263_decode_motion(s, pred_x, 1); |
2967 | 4317 |
1633 | 4318 if (s->umvplus) |
4319 my = h263p_decode_umotion(s, pred_y); | |
4320 else | |
1655 | 4321 my = h263_decode_motion(s, pred_y, 1); |
2967 | 4322 |
4323 mot_val[0 ]= mot_val[2 ]= | |
1633 | 4324 mot_val[0+stride]= mot_val[2+stride]= mx; |
4325 mot_val[1 ]= mot_val[3 ]= | |
4326 mot_val[1+stride]= mot_val[3+stride]= my; | |
4327 } else { | |
2967 | 4328 s->current_picture.mb_type[xy]= MB_TYPE_8x8 | MB_TYPE_L0; |
1633 | 4329 for(i=0;i<4;i++) { |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1936
diff
changeset
|
4330 mot_val = h263_pred_motion(s, i, 0, &pred_x, &pred_y); |
1633 | 4331 if (s->umvplus) |
4332 mx = h263p_decode_umotion(s, pred_x); | |
4333 else | |
1655 | 4334 mx = h263_decode_motion(s, pred_x, 1); |
2967 | 4335 |
1633 | 4336 if (s->umvplus) |
4337 my = h263p_decode_umotion(s, pred_y); | |
2967 | 4338 else |
1655 | 4339 my = h263_decode_motion(s, pred_y, 1); |
1633 | 4340 if (s->umvplus && (mx - pred_x) == 1 && (my - pred_y) == 1) |
4341 skip_bits1(&s->gb); /* Bit stuffing to prevent PSC */ | |
4342 mot_val[0] = mx; | |
4343 mot_val[1] = my; | |
4344 } | |
4345 } | |
4346 } | |
4347 end: | |
2967 | 4348 |
1633 | 4349 for(i=0; i<4; i++) |
4350 s->block_index[i]-= 2; | |
4351 for(i=4; i<6; i++) | |
4352 s->block_index[i]-= 1; | |
4353 s->mb_x--; | |
4354 | |
4355 s->gb= gb; | |
4356 } | |
4357 | |
1656 | 4358 static void h263_decode_dquant(MpegEncContext *s){ |
4359 static const int8_t quant_tab[4] = { -1, -2, 1, 2 }; | |
4360 | |
4361 if(s->modified_quant){ | |
4362 if(get_bits1(&s->gb)) | |
4363 s->qscale= modified_quant_tab[get_bits1(&s->gb)][ s->qscale ]; | |
4364 else | |
4365 s->qscale= get_bits(&s->gb, 5); | |
4366 }else | |
4367 s->qscale += quant_tab[get_bits(&s->gb, 2)]; | |
4368 ff_set_qscale(s, s->qscale); | |
4369 } | |
4370 | |
10752
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4371 static int h263_decode_block(MpegEncContext * s, DCTELEM * block, |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4372 int n, int coded) |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4373 { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4374 int code, level, i, j, last, run; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4375 RLTable *rl = &rl_inter; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4376 const uint8_t *scan_table; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4377 GetBitContext gb= s->gb; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4378 |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4379 scan_table = s->intra_scantable.permutated; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4380 if (s->h263_aic && s->mb_intra) { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4381 rl = &rl_intra_aic; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4382 i = 0; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4383 if (s->ac_pred) { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4384 if (s->h263_aic_dir) |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4385 scan_table = s->intra_v_scantable.permutated; /* left */ |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4386 else |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4387 scan_table = s->intra_h_scantable.permutated; /* top */ |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4388 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4389 } else if (s->mb_intra) { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4390 /* DC coef */ |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4391 if(s->codec_id == CODEC_ID_RV10){ |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4392 #if CONFIG_RV10_DECODER |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4393 if (s->rv10_version == 3 && s->pict_type == FF_I_TYPE) { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4394 int component, diff; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4395 component = (n <= 3 ? 0 : n - 4 + 1); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4396 level = s->last_dc[component]; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4397 if (s->rv10_first_dc_coded[component]) { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4398 diff = rv_decode_dc(s, n); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4399 if (diff == 0xffff) |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4400 return -1; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4401 level += diff; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4402 level = level & 0xff; /* handle wrap round */ |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4403 s->last_dc[component] = level; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4404 } else { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4405 s->rv10_first_dc_coded[component] = 1; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4406 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4407 } else { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4408 level = get_bits(&s->gb, 8); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4409 if (level == 255) |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4410 level = 128; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4411 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4412 #endif |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4413 }else{ |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4414 level = get_bits(&s->gb, 8); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4415 if((level&0x7F) == 0){ |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4416 av_log(s->avctx, AV_LOG_ERROR, "illegal dc %d at %d %d\n", level, s->mb_x, s->mb_y); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4417 if(s->error_recognition >= FF_ER_COMPLIANT) |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4418 return -1; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4419 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4420 if (level == 255) |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4421 level = 128; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4422 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4423 block[0] = level; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4424 i = 1; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4425 } else { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4426 i = 0; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4427 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4428 if (!coded) { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4429 if (s->mb_intra && s->h263_aic) |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4430 goto not_coded; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4431 s->block_last_index[n] = i - 1; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4432 return 0; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4433 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4434 retry: |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4435 for(;;) { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4436 code = get_vlc2(&s->gb, rl->vlc.table, TEX_VLC_BITS, 2); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4437 if (code < 0){ |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4438 av_log(s->avctx, AV_LOG_ERROR, "illegal ac vlc code at %dx%d\n", s->mb_x, s->mb_y); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4439 return -1; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4440 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4441 if (code == rl->n) { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4442 /* escape */ |
10788 | 4443 if (CONFIG_FLV_DECODER && s->h263_flv > 1) { |
4444 ff_flv2_decode_ac_esc(&s->gb, &level, &run, &last); | |
10752
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4445 } else { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4446 last = get_bits1(&s->gb); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4447 run = get_bits(&s->gb, 6); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4448 level = (int8_t)get_bits(&s->gb, 8); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4449 if(level == -128){ |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4450 if (s->codec_id == CODEC_ID_RV10) { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4451 /* XXX: should patch encoder too */ |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4452 level = get_sbits(&s->gb, 12); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4453 }else{ |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4454 level = get_bits(&s->gb, 5); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4455 level |= get_sbits(&s->gb, 6)<<5; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4456 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4457 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4458 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4459 } else { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4460 run = rl->table_run[code]; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4461 level = rl->table_level[code]; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4462 last = code >= rl->last; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4463 if (get_bits1(&s->gb)) |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4464 level = -level; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4465 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4466 i += run; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4467 if (i >= 64){ |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4468 if(s->alt_inter_vlc && rl == &rl_inter && !s->mb_intra){ |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4469 //Looks like a hack but no, it's the way it is supposed to work ... |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4470 rl = &rl_intra_aic; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4471 i = 0; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4472 s->gb= gb; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4473 s->dsp.clear_block(block); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4474 goto retry; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4475 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4476 av_log(s->avctx, AV_LOG_ERROR, "run overflow at %dx%d i:%d\n", s->mb_x, s->mb_y, s->mb_intra); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4477 return -1; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4478 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4479 j = scan_table[i]; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4480 block[j] = level; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4481 if (last) |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4482 break; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4483 i++; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4484 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4485 not_coded: |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4486 if (s->mb_intra && s->h263_aic) { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4487 h263_pred_acdc(s, block, n); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4488 i = 63; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4489 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4490 s->block_last_index[n] = i; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4491 return 0; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4492 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4493 |
9103
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4494 static int h263_skip_b_part(MpegEncContext *s, int cbp) |
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4495 { |
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4496 DECLARE_ALIGNED(16, DCTELEM, dblock[64]); |
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4497 int i, mbi; |
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4498 |
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4499 /* we have to set s->mb_intra to zero to decode B-part of PB-frame correctly |
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4500 * but real value should be restored in order to be used later (in OBMC condition) |
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4501 */ |
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4502 mbi = s->mb_intra; |
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4503 s->mb_intra = 0; |
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4504 for (i = 0; i < 6; i++) { |
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4505 if (h263_decode_block(s, dblock, i, cbp&32) < 0) |
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4506 return -1; |
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4507 cbp+=cbp; |
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4508 } |
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4509 s->mb_intra = mbi; |
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4510 return 0; |
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4511 } |
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4512 |
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4513 static int h263_get_modb(GetBitContext *gb, int pb_frame, int *cbpb) |
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4514 { |
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4515 int c, mv = 1; |
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4516 |
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4517 if (pb_frame < 3) { // h.263 Annex G and i263 PB-frame |
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4518 c = get_bits1(gb); |
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4519 if (pb_frame == 2 && c) |
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4520 mv = !get_bits1(gb); |
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4521 } else { // h.263 Annex M improved PB-frame |
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4522 mv = get_unary(gb, 0, 4) + 1; |
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4523 c = mv & 1; |
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4524 mv = !!(mv & 2); |
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4525 } |
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4526 if(c) |
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4527 *cbpb = get_bits(gb, 6); |
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4528 return mv; |
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4529 } |
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4530 |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
4531 int ff_h263_decode_mb(MpegEncContext *s, |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
4532 DCTELEM block[6][64]) |
0 | 4533 { |
4534 int cbpc, cbpy, i, cbp, pred_x, pred_y, mx, my, dquant; | |
1064 | 4535 int16_t *mot_val; |
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:
1176
diff
changeset
|
4536 const int xy= s->mb_x + s->mb_y * s->mb_stride; |
9103
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4537 int cbpb = 0, pb_mv_count = 0; |
2967 | 4538 |
1649
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4539 assert(!s->h263_pred); |
2967 | 4540 |
6481 | 4541 if (s->pict_type == FF_P_TYPE) { |
1649
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4542 do{ |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4543 if (get_bits1(&s->gb)) { |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4544 /* skip mb */ |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4545 s->mb_intra = 0; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4546 for(i=0;i<6;i++) |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4547 s->block_last_index[i] = -1; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4548 s->mv_dir = MV_DIR_FORWARD; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4549 s->mv_type = MV_TYPE_16X16; |
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:
1176
diff
changeset
|
4550 s->current_picture.mb_type[xy]= MB_TYPE_SKIP | MB_TYPE_16x16 | MB_TYPE_L0; |
255 | 4551 s->mv[0][0][0] = 0; |
4552 s->mv[0][0][1] = 0; | |
2628
511e3afc43e1
Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents:
2615
diff
changeset
|
4553 s->mb_skipped = !(s->obmc | s->loop_filter); |
1649
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4554 goto end; |
255 | 4555 } |
1649
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4556 cbpc = get_vlc2(&s->gb, inter_MCBPC_vlc.table, INTER_MCBPC_VLC_BITS, 2); |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4557 if (cbpc < 0){ |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4558 av_log(s->avctx, AV_LOG_ERROR, "cbpc damaged at %d %d\n", s->mb_x, s->mb_y); |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4559 return -1; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4560 } |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4561 }while(cbpc == 20); |
2967 | 4562 |
2632 | 4563 s->dsp.clear_blocks(s->block[0]); |
2967 | 4564 |
0 | 4565 dquant = cbpc & 8; |
4566 s->mb_intra = ((cbpc & 4) != 0); | |
262 | 4567 if (s->mb_intra) goto intra; |
2967 | 4568 |
9103
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4569 if(s->pb_frame && get_bits1(&s->gb)) |
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4570 pb_mv_count = h263_get_modb(&s->gb, s->pb_frame, &cbpb); |
544 | 4571 cbpy = get_vlc2(&s->gb, cbpy_vlc.table, CBPY_VLC_BITS, 1); |
2967 | 4572 |
1637 | 4573 if(s->alt_inter_vlc==0 || (cbpc & 3)!=3) |
4574 cbpy ^= 0xF; | |
2967 | 4575 |
1637 | 4576 cbp = (cbpc & 3) | (cbpy << 2); |
0 | 4577 if (dquant) { |
1656 | 4578 h263_decode_dquant(s); |
0 | 4579 } |
2967 | 4580 |
1649
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4581 s->mv_dir = MV_DIR_FORWARD; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4582 if ((cbpc & 16) == 0) { |
2967 | 4583 s->current_picture.mb_type[xy]= MB_TYPE_16x16 | MB_TYPE_L0; |
1649
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4584 /* 16x16 motion prediction */ |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4585 s->mv_type = MV_TYPE_16X16; |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1936
diff
changeset
|
4586 h263_pred_motion(s, 0, 0, &pred_x, &pred_y); |
1649
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4587 if (s->umvplus) |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4588 mx = h263p_decode_umotion(s, pred_x); |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4589 else |
1655 | 4590 mx = h263_decode_motion(s, pred_x, 1); |
2967 | 4591 |
1649
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4592 if (mx >= 0xffff) |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4593 return -1; |
2967 | 4594 |
1649
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4595 if (s->umvplus) |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4596 my = h263p_decode_umotion(s, pred_y); |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4597 else |
1655 | 4598 my = h263_decode_motion(s, pred_y, 1); |
2967 | 4599 |
1649
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4600 if (my >= 0xffff) |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4601 return -1; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4602 s->mv[0][0][0] = mx; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4603 s->mv[0][0][1] = my; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4604 |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4605 if (s->umvplus && (mx - pred_x) == 1 && (my - pred_y) == 1) |
2967 | 4606 skip_bits1(&s->gb); /* Bit stuffing to prevent PSC */ |
1649
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4607 } else { |
2967 | 4608 s->current_picture.mb_type[xy]= MB_TYPE_8x8 | MB_TYPE_L0; |
1649
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4609 s->mv_type = MV_TYPE_8X8; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4610 for(i=0;i<4;i++) { |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1936
diff
changeset
|
4611 mot_val = h263_pred_motion(s, i, 0, &pred_x, &pred_y); |
1649
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4612 if (s->umvplus) |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4613 mx = h263p_decode_umotion(s, pred_x); |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4614 else |
1655 | 4615 mx = h263_decode_motion(s, pred_x, 1); |
1649
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4616 if (mx >= 0xffff) |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4617 return -1; |
2967 | 4618 |
1649
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4619 if (s->umvplus) |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4620 my = h263p_decode_umotion(s, pred_y); |
2967 | 4621 else |
1655 | 4622 my = h263_decode_motion(s, pred_y, 1); |
1649
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4623 if (my >= 0xffff) |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4624 return -1; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4625 s->mv[0][i][0] = mx; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4626 s->mv[0][i][1] = my; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4627 if (s->umvplus && (mx - pred_x) == 1 && (my - pred_y) == 1) |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4628 skip_bits1(&s->gb); /* Bit stuffing to prevent PSC */ |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4629 mot_val[0] = mx; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4630 mot_val[1] = my; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4631 } |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4632 } |
6481 | 4633 } else if(s->pict_type==FF_B_TYPE) { |
1655 | 4634 int mb_type; |
4635 const int stride= s->b8_stride; | |
1701 | 4636 int16_t *mot_val0 = s->current_picture.motion_val[0][ 2*(s->mb_x + s->mb_y*stride) ]; |
4637 int16_t *mot_val1 = s->current_picture.motion_val[1][ 2*(s->mb_x + s->mb_y*stride) ]; | |
1655 | 4638 // const int mv_xy= s->mb_x + 1 + s->mb_y * s->mb_stride; |
4639 | |
2967 | 4640 //FIXME ugly |
4641 mot_val0[0 ]= mot_val0[2 ]= mot_val0[0+2*stride]= mot_val0[2+2*stride]= | |
4642 mot_val0[1 ]= mot_val0[3 ]= mot_val0[1+2*stride]= mot_val0[3+2*stride]= | |
4643 mot_val1[0 ]= mot_val1[2 ]= mot_val1[0+2*stride]= mot_val1[2+2*stride]= | |
1701 | 4644 mot_val1[1 ]= mot_val1[3 ]= mot_val1[1+2*stride]= mot_val1[3+2*stride]= 0; |
1655 | 4645 |
4646 do{ | |
4647 mb_type= get_vlc2(&s->gb, h263_mbtype_b_vlc.table, H263_MBTYPE_B_VLC_BITS, 2); | |
4648 if (mb_type < 0){ | |
4649 av_log(s->avctx, AV_LOG_ERROR, "b mb_type damaged at %d %d\n", s->mb_x, s->mb_y); | |
4650 return -1; | |
4651 } | |
4652 | |
4653 mb_type= h263_mb_type_b_map[ mb_type ]; | |
4654 }while(!mb_type); | |
4655 | |
4656 s->mb_intra = IS_INTRA(mb_type); | |
4657 if(HAS_CBP(mb_type)){ | |
2632 | 4658 s->dsp.clear_blocks(s->block[0]); |
1655 | 4659 cbpc = get_vlc2(&s->gb, cbpc_b_vlc.table, CBPC_B_VLC_BITS, 1); |
4660 if(s->mb_intra){ | |
4661 dquant = IS_QUANT(mb_type); | |
4662 goto intra; | |
4663 } | |
4664 | |
4665 cbpy = get_vlc2(&s->gb, cbpy_vlc.table, CBPY_VLC_BITS, 1); | |
4666 | |
4667 if (cbpy < 0){ | |
4668 av_log(s->avctx, AV_LOG_ERROR, "b cbpy damaged at %d %d\n", s->mb_x, s->mb_y); | |
4669 return -1; | |
4670 } | |
2967 | 4671 |
1655 | 4672 if(s->alt_inter_vlc==0 || (cbpc & 3)!=3) |
4673 cbpy ^= 0xF; | |
2967 | 4674 |
1655 | 4675 cbp = (cbpc & 3) | (cbpy << 2); |
4676 }else | |
4677 cbp=0; | |
2967 | 4678 |
1655 | 4679 assert(!s->mb_intra); |
4680 | |
4681 if(IS_QUANT(mb_type)){ | |
1656 | 4682 h263_decode_dquant(s); |
1655 | 4683 } |
4684 | |
4685 if(IS_DIRECT(mb_type)){ | |
4686 s->mv_dir = MV_DIR_FORWARD | MV_DIR_BACKWARD | MV_DIRECT; | |
4687 mb_type |= ff_mpeg4_set_direct_mv(s, 0, 0); | |
4688 }else{ | |
4689 s->mv_dir = 0; | |
4690 s->mv_type= MV_TYPE_16X16; | |
4691 //FIXME UMV | |
4692 | |
4693 if(USES_LIST(mb_type, 0)){ | |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1936
diff
changeset
|
4694 int16_t *mot_val= h263_pred_motion(s, 0, 0, &mx, &my); |
1655 | 4695 s->mv_dir = MV_DIR_FORWARD; |
4696 | |
4697 mx = h263_decode_motion(s, mx, 1); | |
4698 my = h263_decode_motion(s, my, 1); | |
2967 | 4699 |
1655 | 4700 s->mv[0][0][0] = mx; |
4701 s->mv[0][0][1] = my; | |
1701 | 4702 mot_val[0 ]= mot_val[2 ]= mot_val[0+2*stride]= mot_val[2+2*stride]= mx; |
4703 mot_val[1 ]= mot_val[3 ]= mot_val[1+2*stride]= mot_val[3+2*stride]= my; | |
1655 | 4704 } |
2967 | 4705 |
1655 | 4706 if(USES_LIST(mb_type, 1)){ |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1936
diff
changeset
|
4707 int16_t *mot_val= h263_pred_motion(s, 0, 1, &mx, &my); |
1655 | 4708 s->mv_dir |= MV_DIR_BACKWARD; |
2967 | 4709 |
1655 | 4710 mx = h263_decode_motion(s, mx, 1); |
4711 my = h263_decode_motion(s, my, 1); | |
1701 | 4712 |
1655 | 4713 s->mv[1][0][0] = mx; |
4714 s->mv[1][0][1] = my; | |
1701 | 4715 mot_val[0 ]= mot_val[2 ]= mot_val[0+2*stride]= mot_val[2+2*stride]= mx; |
4716 mot_val[1 ]= mot_val[3 ]= mot_val[1+2*stride]= mot_val[3+2*stride]= my; | |
1655 | 4717 } |
4718 } | |
2967 | 4719 |
1655 | 4720 s->current_picture.mb_type[xy]= mb_type; |
1649
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4721 } else { /* I-Frame */ |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4722 do{ |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4723 cbpc = get_vlc2(&s->gb, intra_MCBPC_vlc.table, INTRA_MCBPC_VLC_BITS, 2); |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4724 if (cbpc < 0){ |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4725 av_log(s->avctx, AV_LOG_ERROR, "I cbpc damaged at %d %d\n", s->mb_x, s->mb_y); |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4726 return -1; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4727 } |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4728 }while(cbpc == 8); |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4729 |
2632 | 4730 s->dsp.clear_blocks(s->block[0]); |
4731 | |
1649
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4732 dquant = cbpc & 4; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4733 s->mb_intra = 1; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4734 intra: |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4735 s->current_picture.mb_type[xy]= MB_TYPE_INTRA; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4736 if (s->h263_aic) { |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4737 s->ac_pred = get_bits1(&s->gb); |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4738 if(s->ac_pred){ |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4739 s->current_picture.mb_type[xy]= MB_TYPE_INTRA | MB_TYPE_ACPRED; |
2967 | 4740 |
1649
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4741 s->h263_aic_dir = get_bits1(&s->gb); |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4742 } |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4743 }else |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4744 s->ac_pred = 0; |
2967 | 4745 |
9103
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4746 if(s->pb_frame && get_bits1(&s->gb)) |
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4747 pb_mv_count = h263_get_modb(&s->gb, s->pb_frame, &cbpb); |
1649
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4748 cbpy = get_vlc2(&s->gb, cbpy_vlc.table, CBPY_VLC_BITS, 1); |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4749 if(cbpy<0){ |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4750 av_log(s->avctx, AV_LOG_ERROR, "I cbpy damaged at %d %d\n", s->mb_x, s->mb_y); |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4751 return -1; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4752 } |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4753 cbp = (cbpc & 3) | (cbpy << 2); |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4754 if (dquant) { |
1656 | 4755 h263_decode_dquant(s); |
1649
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4756 } |
9103
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4757 |
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4758 pb_mv_count += !!s->pb_frame; |
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4759 } |
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4760 |
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4761 while(pb_mv_count--){ |
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4762 h263_decode_motion(s, 0, 1); |
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4763 h263_decode_motion(s, 0, 1); |
9093 | 4764 } |
4765 | |
4766 /* decode each block */ | |
4767 for (i = 0; i < 6; i++) { | |
4768 if (h263_decode_block(s, block[i], i, cbp&32) < 0) | |
4769 return -1; | |
4770 cbp+=cbp; | |
4771 } | |
4772 | |
9103
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4773 if(s->pb_frame && h263_skip_b_part(s, cbpb) < 0) |
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4774 return -1; |
9093 | 4775 if(s->obmc && !s->mb_intra){ |
4776 if(s->pict_type == FF_P_TYPE && s->mb_x+1<s->mb_width && s->mb_num_left != 1) | |
4777 preview_obmc(s); | |
1649
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4778 } |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4779 end: |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4780 |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4781 /* per-MB end of slice check */ |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4782 { |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4783 int v= show_bits(&s->gb, 16); |
2967 | 4784 |
1649
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4785 if(get_bits_count(&s->gb) + 16 > s->gb.size_in_bits){ |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4786 v>>= get_bits_count(&s->gb) + 16 - s->gb.size_in_bits; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4787 } |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4788 |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4789 if(v==0) |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4790 return SLICE_END; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4791 } |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4792 |
2967 | 4793 return SLICE_OK; |
1649
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4794 } |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4795 |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4796 int ff_mpeg4_decode_mb(MpegEncContext *s, |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4797 DCTELEM block[6][64]) |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4798 { |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4799 int cbpc, cbpy, i, cbp, pred_x, pred_y, mx, my, dquant; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4800 int16_t *mot_val; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4801 static int8_t quant_tab[4] = { -1, -2, 1, 2 }; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4802 const int xy= s->mb_x + s->mb_y * s->mb_stride; |
2967 | 4803 |
1649
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4804 assert(s->h263_pred); |
2967 | 4805 |
6481 | 4806 if (s->pict_type == FF_P_TYPE || s->pict_type==FF_S_TYPE) { |
1649
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4807 do{ |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4808 if (get_bits1(&s->gb)) { |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4809 /* skip mb */ |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4810 s->mb_intra = 0; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4811 for(i=0;i<6;i++) |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4812 s->block_last_index[i] = -1; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4813 s->mv_dir = MV_DIR_FORWARD; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4814 s->mv_type = MV_TYPE_16X16; |
6481 | 4815 if(s->pict_type==FF_S_TYPE && s->vol_sprite_usage==GMC_SPRITE){ |
1649
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4816 s->current_picture.mb_type[xy]= MB_TYPE_SKIP | MB_TYPE_GMC | MB_TYPE_16x16 | MB_TYPE_L0; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4817 s->mcsel=1; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4818 s->mv[0][0][0]= get_amv(s, 0); |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4819 s->mv[0][0][1]= get_amv(s, 1); |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4820 |
2628
511e3afc43e1
Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents:
2615
diff
changeset
|
4821 s->mb_skipped = 0; |
1649
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4822 }else{ |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4823 s->current_picture.mb_type[xy]= MB_TYPE_SKIP | MB_TYPE_16x16 | MB_TYPE_L0; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4824 s->mcsel=0; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4825 s->mv[0][0][0] = 0; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4826 s->mv[0][0][1] = 0; |
2628
511e3afc43e1
Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents:
2615
diff
changeset
|
4827 s->mb_skipped = 1; |
1649
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4828 } |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4829 goto end; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4830 } |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4831 cbpc = get_vlc2(&s->gb, inter_MCBPC_vlc.table, INTER_MCBPC_VLC_BITS, 2); |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4832 if (cbpc < 0){ |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4833 av_log(s->avctx, AV_LOG_ERROR, "cbpc damaged at %d %d\n", s->mb_x, s->mb_y); |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4834 return -1; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4835 } |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4836 }while(cbpc == 20); |
2967 | 4837 |
2632 | 4838 s->dsp.clear_blocks(s->block[0]); |
1649
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4839 dquant = cbpc & 8; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4840 s->mb_intra = ((cbpc & 4) != 0); |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4841 if (s->mb_intra) goto intra; |
2967 | 4842 |
6481 | 4843 if(s->pict_type==FF_S_TYPE && s->vol_sprite_usage==GMC_SPRITE && (cbpc & 16) == 0) |
1649
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4844 s->mcsel= get_bits1(&s->gb); |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4845 else s->mcsel= 0; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4846 cbpy = get_vlc2(&s->gb, cbpy_vlc.table, CBPY_VLC_BITS, 1) ^ 0x0F; |
2967 | 4847 |
1649
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4848 cbp = (cbpc & 3) | (cbpy << 2); |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4849 if (dquant) { |
1652 | 4850 ff_set_qscale(s, s->qscale + quant_tab[get_bits(&s->gb, 2)]); |
1649
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4851 } |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
4852 if((!s->progressive_sequence) && (cbp || (s->workaround_bugs&FF_BUG_XVID_ILACE))) |
619
2be2cc8fd0a1
mpeg4 interlaced decoding support (not completly implemented/tested due to lack of samples)
michaelni
parents:
617
diff
changeset
|
4853 s->interlaced_dct= get_bits1(&s->gb); |
2967 | 4854 |
0 | 4855 s->mv_dir = MV_DIR_FORWARD; |
4856 if ((cbpc & 16) == 0) { | |
619
2be2cc8fd0a1
mpeg4 interlaced decoding support (not completly implemented/tested due to lack of samples)
michaelni
parents:
617
diff
changeset
|
4857 if(s->mcsel){ |
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:
1176
diff
changeset
|
4858 s->current_picture.mb_type[xy]= MB_TYPE_GMC | MB_TYPE_16x16 | MB_TYPE_L0; |
619
2be2cc8fd0a1
mpeg4 interlaced decoding support (not completly implemented/tested due to lack of samples)
michaelni
parents:
617
diff
changeset
|
4859 /* 16x16 global motion prediction */ |
2be2cc8fd0a1
mpeg4 interlaced decoding support (not completly implemented/tested due to lack of samples)
michaelni
parents:
617
diff
changeset
|
4860 s->mv_type = MV_TYPE_16X16; |
753 | 4861 mx= get_amv(s, 0); |
4862 my= get_amv(s, 1); | |
619
2be2cc8fd0a1
mpeg4 interlaced decoding support (not completly implemented/tested due to lack of samples)
michaelni
parents:
617
diff
changeset
|
4863 s->mv[0][0][0] = mx; |
2be2cc8fd0a1
mpeg4 interlaced decoding support (not completly implemented/tested due to lack of samples)
michaelni
parents:
617
diff
changeset
|
4864 s->mv[0][0][1] = my; |
2be2cc8fd0a1
mpeg4 interlaced decoding support (not completly implemented/tested due to lack of samples)
michaelni
parents:
617
diff
changeset
|
4865 }else if((!s->progressive_sequence) && get_bits1(&s->gb)){ |
2967 | 4866 s->current_picture.mb_type[xy]= MB_TYPE_16x8 | MB_TYPE_L0 | MB_TYPE_INTERLACED; |
619
2be2cc8fd0a1
mpeg4 interlaced decoding support (not completly implemented/tested due to lack of samples)
michaelni
parents:
617
diff
changeset
|
4867 /* 16x8 field motion prediction */ |
2be2cc8fd0a1
mpeg4 interlaced decoding support (not completly implemented/tested due to lack of samples)
michaelni
parents:
617
diff
changeset
|
4868 s->mv_type= MV_TYPE_FIELD; |
2be2cc8fd0a1
mpeg4 interlaced decoding support (not completly implemented/tested due to lack of samples)
michaelni
parents:
617
diff
changeset
|
4869 |
2be2cc8fd0a1
mpeg4 interlaced decoding support (not completly implemented/tested due to lack of samples)
michaelni
parents:
617
diff
changeset
|
4870 s->field_select[0][0]= get_bits1(&s->gb); |
2be2cc8fd0a1
mpeg4 interlaced decoding support (not completly implemented/tested due to lack of samples)
michaelni
parents:
617
diff
changeset
|
4871 s->field_select[0][1]= get_bits1(&s->gb); |
2be2cc8fd0a1
mpeg4 interlaced decoding support (not completly implemented/tested due to lack of samples)
michaelni
parents:
617
diff
changeset
|
4872 |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1936
diff
changeset
|
4873 h263_pred_motion(s, 0, 0, &pred_x, &pred_y); |
2967 | 4874 |
619
2be2cc8fd0a1
mpeg4 interlaced decoding support (not completly implemented/tested due to lack of samples)
michaelni
parents:
617
diff
changeset
|
4875 for(i=0; i<2; i++){ |
2be2cc8fd0a1
mpeg4 interlaced decoding support (not completly implemented/tested due to lack of samples)
michaelni
parents:
617
diff
changeset
|
4876 mx = h263_decode_motion(s, pred_x, s->f_code); |
2be2cc8fd0a1
mpeg4 interlaced decoding support (not completly implemented/tested due to lack of samples)
michaelni
parents:
617
diff
changeset
|
4877 if (mx >= 0xffff) |
2be2cc8fd0a1
mpeg4 interlaced decoding support (not completly implemented/tested due to lack of samples)
michaelni
parents:
617
diff
changeset
|
4878 return -1; |
2967 | 4879 |
619
2be2cc8fd0a1
mpeg4 interlaced decoding support (not completly implemented/tested due to lack of samples)
michaelni
parents:
617
diff
changeset
|
4880 my = h263_decode_motion(s, pred_y/2, s->f_code); |
2be2cc8fd0a1
mpeg4 interlaced decoding support (not completly implemented/tested due to lack of samples)
michaelni
parents:
617
diff
changeset
|
4881 if (my >= 0xffff) |
2be2cc8fd0a1
mpeg4 interlaced decoding support (not completly implemented/tested due to lack of samples)
michaelni
parents:
617
diff
changeset
|
4882 return -1; |
2be2cc8fd0a1
mpeg4 interlaced decoding support (not completly implemented/tested due to lack of samples)
michaelni
parents:
617
diff
changeset
|
4883 |
2be2cc8fd0a1
mpeg4 interlaced decoding support (not completly implemented/tested due to lack of samples)
michaelni
parents:
617
diff
changeset
|
4884 s->mv[0][i][0] = mx; |
661 | 4885 s->mv[0][i][1] = my; |
619
2be2cc8fd0a1
mpeg4 interlaced decoding support (not completly implemented/tested due to lack of samples)
michaelni
parents:
617
diff
changeset
|
4886 } |
2be2cc8fd0a1
mpeg4 interlaced decoding support (not completly implemented/tested due to lack of samples)
michaelni
parents:
617
diff
changeset
|
4887 }else{ |
2967 | 4888 s->current_picture.mb_type[xy]= MB_TYPE_16x16 | MB_TYPE_L0; |
619
2be2cc8fd0a1
mpeg4 interlaced decoding support (not completly implemented/tested due to lack of samples)
michaelni
parents:
617
diff
changeset
|
4889 /* 16x16 motion prediction */ |
2be2cc8fd0a1
mpeg4 interlaced decoding support (not completly implemented/tested due to lack of samples)
michaelni
parents:
617
diff
changeset
|
4890 s->mv_type = MV_TYPE_16X16; |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1936
diff
changeset
|
4891 h263_pred_motion(s, 0, 0, &pred_x, &pred_y); |
1649
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4892 mx = h263_decode_motion(s, pred_x, s->f_code); |
2967 | 4893 |
619
2be2cc8fd0a1
mpeg4 interlaced decoding support (not completly implemented/tested due to lack of samples)
michaelni
parents:
617
diff
changeset
|
4894 if (mx >= 0xffff) |
2be2cc8fd0a1
mpeg4 interlaced decoding support (not completly implemented/tested due to lack of samples)
michaelni
parents:
617
diff
changeset
|
4895 return -1; |
2967 | 4896 |
1649
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4897 my = h263_decode_motion(s, pred_y, s->f_code); |
2967 | 4898 |
619
2be2cc8fd0a1
mpeg4 interlaced decoding support (not completly implemented/tested due to lack of samples)
michaelni
parents:
617
diff
changeset
|
4899 if (my >= 0xffff) |
2be2cc8fd0a1
mpeg4 interlaced decoding support (not completly implemented/tested due to lack of samples)
michaelni
parents:
617
diff
changeset
|
4900 return -1; |
2be2cc8fd0a1
mpeg4 interlaced decoding support (not completly implemented/tested due to lack of samples)
michaelni
parents:
617
diff
changeset
|
4901 s->mv[0][0][0] = mx; |
2be2cc8fd0a1
mpeg4 interlaced decoding support (not completly implemented/tested due to lack of samples)
michaelni
parents:
617
diff
changeset
|
4902 s->mv[0][0][1] = my; |
255 | 4903 } |
0 | 4904 } else { |
2967 | 4905 s->current_picture.mb_type[xy]= MB_TYPE_8x8 | MB_TYPE_L0; |
0 | 4906 s->mv_type = MV_TYPE_8X8; |
4907 for(i=0;i<4;i++) { | |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1936
diff
changeset
|
4908 mot_val = h263_pred_motion(s, i, 0, &pred_x, &pred_y); |
1649
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4909 mx = h263_decode_motion(s, pred_x, s->f_code); |
0 | 4910 if (mx >= 0xffff) |
4911 return -1; | |
2967 | 4912 |
1649
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4913 my = h263_decode_motion(s, pred_y, s->f_code); |
0 | 4914 if (my >= 0xffff) |
4915 return -1; | |
4916 s->mv[0][i][0] = mx; | |
4917 s->mv[0][i][1] = my; | |
4918 mot_val[0] = mx; | |
4919 mot_val[1] = my; | |
4920 } | |
4921 } | |
6481 | 4922 } else if(s->pict_type==FF_B_TYPE) { |
262 | 4923 int modb1; // first bit of modb |
4924 int modb2; // second bit of modb | |
4925 int mb_type; | |
4926 | |
4927 s->mb_intra = 0; //B-frames never contain intra blocks | |
4928 s->mcsel=0; // ... true gmc blocks | |
4929 | |
4930 if(s->mb_x==0){ | |
674 | 4931 for(i=0; i<2; i++){ |
2967 | 4932 s->last_mv[i][0][0]= |
4933 s->last_mv[i][0][1]= | |
4934 s->last_mv[i][1][0]= | |
674 | 4935 s->last_mv[i][1][1]= 0; |
4936 } | |
262 | 4937 } |
4938 | |
4939 /* if we skipped it in the future P Frame than skip it now too */ | |
2628
511e3afc43e1
Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents:
2615
diff
changeset
|
4940 s->mb_skipped= s->next_picture.mbskip_table[s->mb_y * s->mb_stride + s->mb_x]; // Note, skiptab=0 if last was GMC |
511e3afc43e1
Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents:
2615
diff
changeset
|
4941 |
511e3afc43e1
Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents:
2615
diff
changeset
|
4942 if(s->mb_skipped){ |
262 | 4943 /* skip mb */ |
4944 for(i=0;i<6;i++) | |
4945 s->block_last_index[i] = -1; | |
4946 | |
4947 s->mv_dir = MV_DIR_FORWARD; | |
4948 s->mv_type = MV_TYPE_16X16; | |
4949 s->mv[0][0][0] = 0; | |
4950 s->mv[0][0][1] = 0; | |
4951 s->mv[1][0][0] = 0; | |
4952 s->mv[1][0][1] = 0; | |
2967 | 4953 s->current_picture.mb_type[xy]= MB_TYPE_SKIP | MB_TYPE_16x16 | MB_TYPE_L0; |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
4954 goto end; |
262 | 4955 } |
4956 | |
2967 | 4957 modb1= get_bits1(&s->gb); |
666 | 4958 if(modb1){ |
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:
1176
diff
changeset
|
4959 mb_type= MB_TYPE_DIRECT2 | MB_TYPE_SKIP | MB_TYPE_L0L1; //like MB_TYPE_B_DIRECT but no vectors coded |
666 | 4960 cbp=0; |
4961 }else{ | |
262 | 4962 modb2= get_bits1(&s->gb); |
544 | 4963 mb_type= get_vlc2(&s->gb, mb_type_b_vlc.table, MB_TYPE_B_VLC_BITS, 1); |
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:
1176
diff
changeset
|
4964 if(mb_type<0){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
4965 av_log(s->avctx, AV_LOG_ERROR, "illegal MB_type\n"); |
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:
1176
diff
changeset
|
4966 return -1; |
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:
1176
diff
changeset
|
4967 } |
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:
1176
diff
changeset
|
4968 mb_type= mb_type_b_map[ mb_type ]; |
666 | 4969 if(modb2) cbp= 0; |
2632 | 4970 else{ |
4971 s->dsp.clear_blocks(s->block[0]); | |
4972 cbp= get_bits(&s->gb, 6); | |
4973 } | |
666 | 4974 |
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:
1176
diff
changeset
|
4975 if ((!IS_DIRECT(mb_type)) && cbp) { |
262 | 4976 if(get_bits1(&s->gb)){ |
1652 | 4977 ff_set_qscale(s, s->qscale + get_bits1(&s->gb)*4 - 2); |
262 | 4978 } |
4979 } | |
664 | 4980 |
4981 if(!s->progressive_sequence){ | |
4982 if(cbp) | |
4983 s->interlaced_dct= get_bits1(&s->gb); | |
4984 | |
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:
1176
diff
changeset
|
4985 if(!IS_DIRECT(mb_type) && get_bits1(&s->gb)){ |
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:
1176
diff
changeset
|
4986 mb_type |= MB_TYPE_16x8 | MB_TYPE_INTERLACED; |
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:
1176
diff
changeset
|
4987 mb_type &= ~MB_TYPE_16x16; |
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:
1176
diff
changeset
|
4988 |
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:
1176
diff
changeset
|
4989 if(USES_LIST(mb_type, 0)){ |
667 | 4990 s->field_select[0][0]= get_bits1(&s->gb); |
4991 s->field_select[0][1]= get_bits1(&s->gb); | |
4992 } | |
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:
1176
diff
changeset
|
4993 if(USES_LIST(mb_type, 1)){ |
667 | 4994 s->field_select[1][0]= get_bits1(&s->gb); |
4995 s->field_select[1][1]= get_bits1(&s->gb); | |
4996 } | |
4997 } | |
666 | 4998 } |
4999 | |
667 | 5000 s->mv_dir = 0; |
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:
1176
diff
changeset
|
5001 if((mb_type & (MB_TYPE_DIRECT2|MB_TYPE_INTERLACED)) == 0){ |
666 | 5002 s->mv_type= MV_TYPE_16X16; |
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:
1176
diff
changeset
|
5003 |
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:
1176
diff
changeset
|
5004 if(USES_LIST(mb_type, 0)){ |
666 | 5005 s->mv_dir = MV_DIR_FORWARD; |
5006 | |
5007 mx = h263_decode_motion(s, s->last_mv[0][0][0], s->f_code); | |
5008 my = h263_decode_motion(s, s->last_mv[0][0][1], s->f_code); | |
5009 s->last_mv[0][1][0]= s->last_mv[0][0][0]= s->mv[0][0][0] = mx; | |
5010 s->last_mv[0][1][1]= s->last_mv[0][0][1]= s->mv[0][0][1] = my; | |
667 | 5011 } |
2967 | 5012 |
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:
1176
diff
changeset
|
5013 if(USES_LIST(mb_type, 1)){ |
666 | 5014 s->mv_dir |= MV_DIR_BACKWARD; |
5015 | |
5016 mx = h263_decode_motion(s, s->last_mv[1][0][0], s->b_code); | |
5017 my = h263_decode_motion(s, s->last_mv[1][0][1], s->b_code); | |
5018 s->last_mv[1][1][0]= s->last_mv[1][0][0]= s->mv[1][0][0] = mx; | |
5019 s->last_mv[1][1][1]= s->last_mv[1][0][1]= s->mv[1][0][1] = my; | |
5020 } | |
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:
1176
diff
changeset
|
5021 }else if(!IS_DIRECT(mb_type)){ |
666 | 5022 s->mv_type= MV_TYPE_FIELD; |
667 | 5023 |
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:
1176
diff
changeset
|
5024 if(USES_LIST(mb_type, 0)){ |
666 | 5025 s->mv_dir = MV_DIR_FORWARD; |
2967 | 5026 |
666 | 5027 for(i=0; i<2; i++){ |
5028 mx = h263_decode_motion(s, s->last_mv[0][i][0] , s->f_code); | |
5029 my = h263_decode_motion(s, s->last_mv[0][i][1]/2, s->f_code); | |
5030 s->last_mv[0][i][0]= s->mv[0][i][0] = mx; | |
5031 s->last_mv[0][i][1]= (s->mv[0][i][1] = my)*2; | |
5032 } | |
667 | 5033 } |
2967 | 5034 |
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:
1176
diff
changeset
|
5035 if(USES_LIST(mb_type, 1)){ |
666 | 5036 s->mv_dir |= MV_DIR_BACKWARD; |
5037 | |
5038 for(i=0; i<2; i++){ | |
5039 mx = h263_decode_motion(s, s->last_mv[1][i][0] , s->b_code); | |
5040 my = h263_decode_motion(s, s->last_mv[1][i][1]/2, s->b_code); | |
5041 s->last_mv[1][i][0]= s->mv[1][i][0] = mx; | |
5042 s->last_mv[1][i][1]= (s->mv[1][i][1] = my)*2; | |
664 | 5043 } |
5044 } | |
5045 } | |
5046 } | |
2967 | 5047 |
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:
1176
diff
changeset
|
5048 if(IS_DIRECT(mb_type)){ |
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:
1176
diff
changeset
|
5049 if(IS_SKIP(mb_type)) |
666 | 5050 mx=my=0; |
5051 else{ | |
5052 mx = h263_decode_motion(s, 0, 1); | |
5053 my = h263_decode_motion(s, 0, 1); | |
5054 } | |
2967 | 5055 |
262 | 5056 s->mv_dir = MV_DIR_FORWARD | MV_DIR_BACKWARD | MV_DIRECT; |
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:
1176
diff
changeset
|
5057 mb_type |= ff_mpeg4_set_direct_mv(s, mx, my); |
664 | 5058 } |
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:
1176
diff
changeset
|
5059 s->current_picture.mb_type[xy]= mb_type; |
262 | 5060 } else { /* I-Frame */ |
1482 | 5061 do{ |
5062 cbpc = get_vlc2(&s->gb, intra_MCBPC_vlc.table, INTRA_MCBPC_VLC_BITS, 2); | |
5063 if (cbpc < 0){ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
5064 av_log(s->avctx, AV_LOG_ERROR, "I cbpc damaged at %d %d\n", s->mb_x, s->mb_y); |
1482 | 5065 return -1; |
5066 } | |
5067 }while(cbpc == 8); | |
5068 | |
262 | 5069 dquant = cbpc & 4; |
5070 s->mb_intra = 1; | |
5071 intra: | |
1649
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
5072 s->ac_pred = get_bits1(&s->gb); |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
5073 if(s->ac_pred) |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
5074 s->current_picture.mb_type[xy]= MB_TYPE_INTRA | MB_TYPE_ACPRED; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
5075 else |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
5076 s->current_picture.mb_type[xy]= MB_TYPE_INTRA; |
2967 | 5077 |
544 | 5078 cbpy = get_vlc2(&s->gb, cbpy_vlc.table, CBPY_VLC_BITS, 1); |
1482 | 5079 if(cbpy<0){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
5080 av_log(s->avctx, AV_LOG_ERROR, "I cbpy damaged at %d %d\n", s->mb_x, s->mb_y); |
1482 | 5081 return -1; |
5082 } | |
0 | 5083 cbp = (cbpc & 3) | (cbpy << 2); |
3282 | 5084 |
5085 s->use_intra_dc_vlc= s->qscale < s->intra_dc_threshold; | |
5086 | |
0 | 5087 if (dquant) { |
1652 | 5088 ff_set_qscale(s, s->qscale + quant_tab[get_bits(&s->gb, 2)]); |
0 | 5089 } |
2967 | 5090 |
619
2be2cc8fd0a1
mpeg4 interlaced decoding support (not completly implemented/tested due to lack of samples)
michaelni
parents:
617
diff
changeset
|
5091 if(!s->progressive_sequence) |
2be2cc8fd0a1
mpeg4 interlaced decoding support (not completly implemented/tested due to lack of samples)
michaelni
parents:
617
diff
changeset
|
5092 s->interlaced_dct= get_bits1(&s->gb); |
575 | 5093 |
2632 | 5094 s->dsp.clear_blocks(s->block[0]); |
575 | 5095 /* decode each block */ |
1649
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
5096 for (i = 0; i < 6; i++) { |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
5097 if (mpeg4_decode_block(s, block[i], i, cbp&32, 1, 0) < 0) |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
5098 return -1; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
5099 cbp+=cbp; |
575 | 5100 } |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
5101 goto end; |
0 | 5102 } |
5103 | |
5104 /* decode each block */ | |
1649
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
5105 for (i = 0; i < 6; i++) { |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
5106 if (mpeg4_decode_block(s, block[i], i, cbp&32, 0, 0) < 0) |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
5107 return -1; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
5108 cbp+=cbp; |
0 | 5109 } |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
5110 end: |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
5111 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
5112 /* per-MB end of slice check */ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
5113 if(s->codec_id==CODEC_ID_MPEG4){ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
5114 if(mpeg4_is_resync(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:
1176
diff
changeset
|
5115 const int delta= s->mb_x + 1 == s->mb_width ? 2 : 1; |
6481 | 5116 if(s->pict_type==FF_B_TYPE && s->next_picture.mbskip_table[xy + delta]) |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
5117 return SLICE_OK; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
5118 return SLICE_END; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
5119 } |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
5120 } |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
5121 |
2967 | 5122 return SLICE_OK; |
0 | 5123 } |
5124 | |
5125 /* most is hardcoded. should extend to handle all h263 streams */ | |
5126 int h263_decode_picture_header(MpegEncContext *s) | |
5127 { | |
1278
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1273
diff
changeset
|
5128 int format, width, height, i; |
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1273
diff
changeset
|
5129 uint32_t startcode; |
2967 | 5130 |
1278
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1273
diff
changeset
|
5131 align_get_bits(&s->gb); |
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1273
diff
changeset
|
5132 |
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1273
diff
changeset
|
5133 startcode= get_bits(&s->gb, 22-8); |
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1273
diff
changeset
|
5134 |
10535
95f3daa991a2
Use get_bits_left() instead of size_in_bits - get_bits_count().
rbultje
parents:
9999
diff
changeset
|
5135 for(i= get_bits_left(&s->gb); i>24; i-=8) { |
1278
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1273
diff
changeset
|
5136 startcode = ((startcode << 8) | get_bits(&s->gb, 8)) & 0x003FFFFF; |
2967 | 5137 |
1278
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1273
diff
changeset
|
5138 if(startcode == 0x20) |
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1273
diff
changeset
|
5139 break; |
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1273
diff
changeset
|
5140 } |
2967 | 5141 |
1278
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1273
diff
changeset
|
5142 if (startcode != 0x20) { |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
5143 av_log(s->avctx, AV_LOG_ERROR, "Bad picture start code\n"); |
0 | 5144 return -1; |
355 | 5145 } |
5146 /* temporal reference */ | |
1865 | 5147 i = get_bits(&s->gb, 8); /* picture timestamp */ |
5148 if( (s->picture_number&~0xFF)+i < s->picture_number) | |
5149 i+= 256; | |
2886 | 5150 s->current_picture_ptr->pts= |
1865 | 5151 s->picture_number= (s->picture_number&~0xFF) + i; |
355 | 5152 |
2967 | 5153 /* PTYPE starts here */ |
355 | 5154 if (get_bits1(&s->gb) != 1) { |
5155 /* marker */ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
5156 av_log(s->avctx, AV_LOG_ERROR, "Bad marker\n"); |
355 | 5157 return -1; |
5158 } | |
5159 if (get_bits1(&s->gb) != 0) { | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
5160 av_log(s->avctx, AV_LOG_ERROR, "Bad H263 id\n"); |
2979 | 5161 return -1; /* h263 id */ |
5162 } | |
5163 skip_bits1(&s->gb); /* split screen off */ | |
5164 skip_bits1(&s->gb); /* camera off */ | |
5165 skip_bits1(&s->gb); /* freeze picture release off */ | |
0 | 5166 |
5167 format = get_bits(&s->gb, 3); | |
355 | 5168 /* |
5169 0 forbidden | |
5170 1 sub-QCIF | |
5171 10 QCIF | |
2979 | 5172 7 extended PTYPE (PLUSPTYPE) |
355 | 5173 */ |
0 | 5174 |
161 | 5175 if (format != 7 && format != 6) { |
0 | 5176 s->h263_plus = 0; |
5177 /* H.263v1 */ | |
5178 width = h263_format[format][0]; | |
5179 height = h263_format[format][1]; | |
5180 if (!width) | |
5181 return -1; | |
2967 | 5182 |
6481 | 5183 s->pict_type = FF_I_TYPE + get_bits1(&s->gb); |
0 | 5184 |
2967 | 5185 s->h263_long_vectors = get_bits1(&s->gb); |
0 | 5186 |
355 | 5187 if (get_bits1(&s->gb) != 0) { |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
5188 av_log(s->avctx, AV_LOG_ERROR, "H263 SAC not supported\n"); |
2979 | 5189 return -1; /* SAC: off */ |
355 | 5190 } |
1633 | 5191 s->obmc= get_bits1(&s->gb); /* Advanced prediction mode */ |
5192 s->unrestricted_mv = s->h263_long_vectors || s->obmc; | |
2967 | 5193 |
9104 | 5194 s->pb_frame = get_bits1(&s->gb); |
1644 | 5195 s->chroma_qscale= s->qscale = get_bits(&s->gb, 5); |
2979 | 5196 skip_bits1(&s->gb); /* Continuous Presence Multipoint mode: off */ |
1393 | 5197 |
5198 s->width = width; | |
5199 s->height = height; | |
1865 | 5200 s->avctx->sample_aspect_ratio= (AVRational){12,11}; |
2637 | 5201 s->avctx->time_base= (AVRational){1001, 30000}; |
0 | 5202 } else { |
161 | 5203 int ufep; |
2967 | 5204 |
0 | 5205 /* H.263v2 */ |
161 | 5206 s->h263_plus = 1; |
5207 ufep = get_bits(&s->gb, 3); /* Update Full Extended PTYPE */ | |
355 | 5208 |
2967 | 5209 /* ufep other than 0 and 1 are reserved */ |
161 | 5210 if (ufep == 1) { |
2967 | 5211 /* OPPTYPE */ |
161 | 5212 format = get_bits(&s->gb, 3); |
4652 | 5213 dprintf(s->avctx, "ufep=1, format: %d\n", format); |
1872 | 5214 s->custom_pcf= get_bits1(&s->gb); |
5513 | 5215 s->umvplus = get_bits1(&s->gb); /* Unrestricted Motion Vector */ |
1644 | 5216 if (get_bits1(&s->gb) != 0) { |
5217 av_log(s->avctx, AV_LOG_ERROR, "Syntax-based Arithmetic Coding (SAC) not supported\n"); | |
5218 } | |
1633 | 5219 s->obmc= get_bits1(&s->gb); /* Advanced prediction mode */ |
5220 s->h263_aic = get_bits1(&s->gb); /* Advanced Intra Coding (AIC) */ | |
1644 | 5221 s->loop_filter= get_bits1(&s->gb); |
5222 s->unrestricted_mv = s->umvplus || s->obmc || s->loop_filter; | |
2967 | 5223 |
1661 | 5224 s->h263_slice_structured= get_bits1(&s->gb); |
1278
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1273
diff
changeset
|
5225 if (get_bits1(&s->gb) != 0) { |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
5226 av_log(s->avctx, AV_LOG_ERROR, "Reference Picture Selection not supported\n"); |
1278
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1273
diff
changeset
|
5227 } |
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1273
diff
changeset
|
5228 if (get_bits1(&s->gb) != 0) { |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
5229 av_log(s->avctx, AV_LOG_ERROR, "Independent Segment Decoding not supported\n"); |
1278
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1273
diff
changeset
|
5230 } |
1637 | 5231 s->alt_inter_vlc= get_bits1(&s->gb); |
1639 | 5232 s->modified_quant= get_bits1(&s->gb); |
1644 | 5233 if(s->modified_quant) |
5234 s->chroma_qscale_table= ff_h263_chroma_qscale_table; | |
2967 | 5235 |
1278
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1273
diff
changeset
|
5236 skip_bits(&s->gb, 1); /* Prevent start code emulation */ |
355 | 5237 |
161 | 5238 skip_bits(&s->gb, 3); /* Reserved */ |
355 | 5239 } else if (ufep != 0) { |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
5240 av_log(s->avctx, AV_LOG_ERROR, "Bad UFEP type (%d)\n", ufep); |
0 | 5241 return -1; |
355 | 5242 } |
2967 | 5243 |
78 | 5244 /* MPPTYPE */ |
1655 | 5245 s->pict_type = get_bits(&s->gb, 3); |
5246 switch(s->pict_type){ | |
6481 | 5247 case 0: s->pict_type= FF_I_TYPE;break; |
5248 case 1: s->pict_type= FF_P_TYPE;break; | |
9104 | 5249 case 2: s->pict_type= FF_P_TYPE;s->pb_frame = 3;break; |
6481 | 5250 case 3: s->pict_type= FF_B_TYPE;break; |
5251 case 7: s->pict_type= FF_I_TYPE;break; //ZYGO | |
1655 | 5252 default: |
0 | 5253 return -1; |
1655 | 5254 } |
250
3449316664b5
- Bug fix on RTYPE (rounding type) not being honoured by H.263+ decoder.
pulento
parents:
249
diff
changeset
|
5255 skip_bits(&s->gb, 2); |
3449316664b5
- Bug fix on RTYPE (rounding type) not being honoured by H.263+ decoder.
pulento
parents:
249
diff
changeset
|
5256 s->no_rounding = get_bits1(&s->gb); |
3449316664b5
- Bug fix on RTYPE (rounding type) not being honoured by H.263+ decoder.
pulento
parents:
249
diff
changeset
|
5257 skip_bits(&s->gb, 4); |
2967 | 5258 |
78 | 5259 /* Get the picture dimensions */ |
161 | 5260 if (ufep) { |
5261 if (format == 6) { | |
5262 /* Custom Picture Format (CPFMT) */ | |
355 | 5263 s->aspect_ratio_info = get_bits(&s->gb, 4); |
4652 | 5264 dprintf(s->avctx, "aspect: %d\n", s->aspect_ratio_info); |
355 | 5265 /* aspect ratios: |
5266 0 - forbidden | |
5267 1 - 1:1 | |
5268 2 - 12:11 (CIF 4:3) | |
5269 3 - 10:11 (525-type 4:3) | |
5270 4 - 16:11 (CIF 16:9) | |
5271 5 - 40:33 (525-type 16:9) | |
5272 6-14 - reserved | |
5273 */ | |
161 | 5274 width = (get_bits(&s->gb, 9) + 1) * 4; |
5275 skip_bits1(&s->gb); | |
5276 height = get_bits(&s->gb, 9) * 4; | |
4652 | 5277 dprintf(s->avctx, "\nH.263+ Custom picture: %dx%d\n",width,height); |
669
b4bddbde44f3
aspect (ext. par too) support for h263 and mpeg4 (inc. build becouse of new vars)
al3x
parents:
667
diff
changeset
|
5278 if (s->aspect_ratio_info == FF_ASPECT_EXTENDED) { |
355 | 5279 /* aspected dimensions */ |
1548 | 5280 s->avctx->sample_aspect_ratio.num= get_bits(&s->gb, 8); |
5281 s->avctx->sample_aspect_ratio.den= get_bits(&s->gb, 8); | |
887 | 5282 }else{ |
1548 | 5283 s->avctx->sample_aspect_ratio= pixel_aspect[s->aspect_ratio_info]; |
355 | 5284 } |
5285 } else { | |
161 | 5286 width = h263_format[format][0]; |
5287 height = h263_format[format][1]; | |
1865 | 5288 s->avctx->sample_aspect_ratio= (AVRational){12,11}; |
161 | 5289 } |
5290 if ((width == 0) || (height == 0)) | |
5291 return -1; | |
5292 s->width = width; | |
5293 s->height = height; | |
1872 | 5294 |
5295 if(s->custom_pcf){ | |
5296 int gcd; | |
2637 | 5297 s->avctx->time_base.den= 1800000; |
5298 s->avctx->time_base.num= 1000 + get_bits1(&s->gb); | |
5299 s->avctx->time_base.num*= get_bits(&s->gb, 7); | |
5300 if(s->avctx->time_base.num == 0){ | |
1872 | 5301 av_log(s, AV_LOG_ERROR, "zero framerate\n"); |
5302 return -1; | |
5303 } | |
8611 | 5304 gcd= av_gcd(s->avctx->time_base.den, s->avctx->time_base.num); |
2637 | 5305 s->avctx->time_base.den /= gcd; |
5306 s->avctx->time_base.num /= gcd; | |
1872 | 5307 }else{ |
2637 | 5308 s->avctx->time_base= (AVRational){1001, 30000}; |
1872 | 5309 } |
5310 } | |
2967 | 5311 |
1872 | 5312 if(s->custom_pcf){ |
5313 skip_bits(&s->gb, 2); //extended Temporal reference | |
5314 } | |
5315 | |
5316 if (ufep) { | |
1089 | 5317 if (s->umvplus) { |
5318 if(get_bits1(&s->gb)==0) /* Unlimited Unrestricted Motion Vectors Indicator (UUI) */ | |
2967 | 5319 skip_bits1(&s->gb); |
161 | 5320 } |
1661 | 5321 if(s->h263_slice_structured){ |
5322 if (get_bits1(&s->gb) != 0) { | |
5323 av_log(s->avctx, AV_LOG_ERROR, "rectangular slices not supported\n"); | |
5324 } | |
5325 if (get_bits1(&s->gb) != 0) { | |
5326 av_log(s->avctx, AV_LOG_ERROR, "unordered slices not supported\n"); | |
5327 } | |
5328 } | |
78 | 5329 } |
2967 | 5330 |
0 | 5331 s->qscale = get_bits(&s->gb, 5); |
5332 } | |
1670 | 5333 |
1896
ef87d53ca87a
h.263 ssm + aic fix by (Maarten Daniels <maarten dot daniels at student dot luc dot ac dot be>)
michael
parents:
1893
diff
changeset
|
5334 s->mb_width = (s->width + 15) / 16; |
ef87d53ca87a
h.263 ssm + aic fix by (Maarten Daniels <maarten dot daniels at student dot luc dot ac dot be>)
michael
parents:
1893
diff
changeset
|
5335 s->mb_height = (s->height + 15) / 16; |
ef87d53ca87a
h.263 ssm + aic fix by (Maarten Daniels <maarten dot daniels at student dot luc dot ac dot be>)
michael
parents:
1893
diff
changeset
|
5336 s->mb_num = s->mb_width * s->mb_height; |
ef87d53ca87a
h.263 ssm + aic fix by (Maarten Daniels <maarten dot daniels at student dot luc dot ac dot be>)
michael
parents:
1893
diff
changeset
|
5337 |
9104 | 5338 if (s->pb_frame) { |
5339 skip_bits(&s->gb, 3); /* Temporal reference for B-pictures */ | |
5340 if (s->custom_pcf) | |
5341 skip_bits(&s->gb, 2); //extended Temporal reference | |
5342 skip_bits(&s->gb, 2); /* Quantization information for B-pictures */ | |
5343 } | |
5344 | |
0 | 5345 /* PEI */ |
21 | 5346 while (get_bits1(&s->gb) != 0) { |
5347 skip_bits(&s->gb, 8); | |
0 | 5348 } |
1896
ef87d53ca87a
h.263 ssm + aic fix by (Maarten Daniels <maarten dot daniels at student dot luc dot ac dot be>)
michael
parents:
1893
diff
changeset
|
5349 |
1670 | 5350 if(s->h263_slice_structured){ |
5351 if (get_bits1(&s->gb) != 1) { | |
5352 av_log(s->avctx, AV_LOG_ERROR, "SEPB1 marker missing\n"); | |
5353 return -1; | |
5354 } | |
5355 | |
5356 ff_h263_decode_mba(s); | |
5357 | |
5358 if (get_bits1(&s->gb) != 1) { | |
5359 av_log(s->avctx, AV_LOG_ERROR, "SEPB2 marker missing\n"); | |
5360 return -1; | |
5361 } | |
5362 } | |
0 | 5363 s->f_code = 1; |
2967 | 5364 |
498 | 5365 if(s->h263_aic){ |
2967 | 5366 s->y_dc_scale_table= |
1639 | 5367 s->c_dc_scale_table= ff_aic_dc_scale_table; |
498 | 5368 }else{ |
5369 s->y_dc_scale_table= | |
5370 s->c_dc_scale_table= ff_mpeg1_dc_scale_table; | |
5371 } | |
5372 | |
10791 | 5373 ff_h263_show_pict_info(s); |
8612 | 5374 if (s->pict_type == FF_I_TYPE && s->codec_tag == AV_RL32("ZYGO")){ |
1584
3615999a7284
dumping funny numbers from first zygo i frame header
michael
parents:
1583
diff
changeset
|
5375 int i,j; |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
5376 for(i=0; i<85; i++) av_log(s->avctx, AV_LOG_DEBUG, "%d", get_bits1(&s->gb)); |
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
5377 av_log(s->avctx, AV_LOG_DEBUG, "\n"); |
1584
3615999a7284
dumping funny numbers from first zygo i frame header
michael
parents:
1583
diff
changeset
|
5378 for(i=0; i<13; i++){ |
3615999a7284
dumping funny numbers from first zygo i frame header
michael
parents:
1583
diff
changeset
|
5379 for(j=0; j<3; j++){ |
3615999a7284
dumping funny numbers from first zygo i frame header
michael
parents:
1583
diff
changeset
|
5380 int v= get_bits(&s->gb, 8); |
3615999a7284
dumping funny numbers from first zygo i frame header
michael
parents:
1583
diff
changeset
|
5381 v |= get_sbits(&s->gb, 8)<<8; |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
5382 av_log(s->avctx, AV_LOG_DEBUG, " %5d", v); |
1584
3615999a7284
dumping funny numbers from first zygo i frame header
michael
parents:
1583
diff
changeset
|
5383 } |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
5384 av_log(s->avctx, AV_LOG_DEBUG, "\n"); |
1584
3615999a7284
dumping funny numbers from first zygo i frame header
michael
parents:
1583
diff
changeset
|
5385 } |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
5386 for(i=0; i<50; i++) av_log(s->avctx, AV_LOG_DEBUG, "%d", get_bits1(&s->gb)); |
1584
3615999a7284
dumping funny numbers from first zygo i frame header
michael
parents:
1583
diff
changeset
|
5387 } |
3615999a7284
dumping funny numbers from first zygo i frame header
michael
parents:
1583
diff
changeset
|
5388 |
0 | 5389 return 0; |
5390 } | |
5391 | |
942 | 5392 static int mpeg4_decode_gop_header(MpegEncContext * s, GetBitContext *gb){ |
5393 int hours, minutes, seconds; | |
5394 | |
5395 hours= get_bits(gb, 5); | |
5396 minutes= get_bits(gb, 6); | |
5397 skip_bits1(gb); | |
5398 seconds= get_bits(gb, 6); | |
5399 | |
5400 s->time_base= seconds + 60*(minutes + 60*hours); | |
5401 | |
5402 skip_bits1(gb); | |
5403 skip_bits1(gb); | |
2967 | 5404 |
942 | 5405 return 0; |
5406 } | |
5407 | |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5408 static int decode_vol_header(MpegEncContext *s, GetBitContext *gb){ |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5409 int width, height, vo_ver_id; |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5410 |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5411 /* vol header */ |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5412 skip_bits(gb, 1); /* random access */ |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5413 s->vo_type= get_bits(gb, 8); |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5414 if (get_bits1(gb) != 0) { /* is_ol_id */ |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5415 vo_ver_id = get_bits(gb, 4); /* vo_ver_id */ |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5416 skip_bits(gb, 3); /* vo_priority */ |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5417 } else { |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5418 vo_ver_id = 1; |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5419 } |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5420 s->aspect_ratio_info= get_bits(gb, 4); |
2967 | 5421 if(s->aspect_ratio_info == FF_ASPECT_EXTENDED){ |
1548 | 5422 s->avctx->sample_aspect_ratio.num= get_bits(gb, 8); // par_width |
5423 s->avctx->sample_aspect_ratio.den= get_bits(gb, 8); // par_height | |
887 | 5424 }else{ |
1548 | 5425 s->avctx->sample_aspect_ratio= pixel_aspect[s->aspect_ratio_info]; |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5426 } |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5427 |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5428 if ((s->vol_control_parameters=get_bits1(gb))) { /* vol control parameter */ |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5429 int chroma_format= get_bits(gb, 2); |
8690 | 5430 if(chroma_format!=CHROMA_420){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
5431 av_log(s->avctx, AV_LOG_ERROR, "illegal chroma format\n"); |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5432 } |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5433 s->low_delay= get_bits1(gb); |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5434 if(get_bits1(gb)){ /* vbv parameters */ |
2979 | 5435 get_bits(gb, 15); /* first_half_bitrate */ |
5436 skip_bits1(gb); /* marker */ | |
5437 get_bits(gb, 15); /* latter_half_bitrate */ | |
5438 skip_bits1(gb); /* marker */ | |
5439 get_bits(gb, 15); /* first_half_vbv_buffer_size */ | |
5440 skip_bits1(gb); /* marker */ | |
5441 get_bits(gb, 3); /* latter_half_vbv_buffer_size */ | |
5442 get_bits(gb, 11); /* first_half_vbv_occupancy */ | |
5443 skip_bits1(gb); /* marker */ | |
5444 get_bits(gb, 15); /* latter_half_vbv_occupancy */ | |
5445 skip_bits1(gb); /* marker */ | |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5446 } |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5447 }else{ |
2646
c735e3e60ca7
Even More spelling errors. patch by (Kevin Baragona <kevinmb500 gawab com)
michael
parents:
2639
diff
changeset
|
5448 // set low delay flag only once the smartest? low delay detection won't be overriden |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5449 if(s->picture_number==0) |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5450 s->low_delay=0; |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5451 } |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5452 |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5453 s->shape = get_bits(gb, 2); /* vol shape */ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
5454 if(s->shape != RECT_SHAPE) av_log(s->avctx, AV_LOG_ERROR, "only rectangular vol supported\n"); |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5455 if(s->shape == GRAY_SHAPE && vo_ver_id != 1){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
5456 av_log(s->avctx, AV_LOG_ERROR, "Gray shape not supported\n"); |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5457 skip_bits(gb, 4); //video_object_layer_shape_extension |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5458 } |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5459 |
1411 | 5460 check_marker(gb, "before time_increment_resolution"); |
2967 | 5461 |
2637 | 5462 s->avctx->time_base.den = get_bits(gb, 16); |
2812 | 5463 if(!s->avctx->time_base.den){ |
5464 av_log(s->avctx, AV_LOG_ERROR, "time_base.den==0\n"); | |
5465 return -1; | |
5466 } | |
2967 | 5467 |
2637 | 5468 s->time_increment_bits = av_log2(s->avctx->time_base.den - 1) + 1; |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5469 if (s->time_increment_bits < 1) |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5470 s->time_increment_bits = 1; |
2967 | 5471 |
1411 | 5472 check_marker(gb, "before fixed_vop_rate"); |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5473 |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5474 if (get_bits1(gb) != 0) { /* fixed_vop_rate */ |
2637 | 5475 s->avctx->time_base.num = get_bits(gb, s->time_increment_bits); |
5476 }else | |
5477 s->avctx->time_base.num = 1; | |
5478 | |
2034 | 5479 s->t_frame=0; |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5480 |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5481 if (s->shape != BIN_ONLY_SHAPE) { |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5482 if (s->shape == RECT_SHAPE) { |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5483 skip_bits1(gb); /* marker */ |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5484 width = get_bits(gb, 13); |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5485 skip_bits1(gb); /* marker */ |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5486 height = get_bits(gb, 13); |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5487 skip_bits1(gb); /* marker */ |
8612 | 5488 if(width && height && !(s->width && s->codec_tag == AV_RL32("MP4S"))){ /* they should be non zero but who knows ... */ |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5489 s->width = width; |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5490 s->height = height; |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5491 } |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5492 } |
2967 | 5493 |
5494 s->progressive_sequence= | |
1659 | 5495 s->progressive_frame= get_bits1(gb)^1; |
3192 | 5496 s->interlaced_dct=0; |
2967 | 5497 if(!get_bits1(gb) && (s->avctx->debug & FF_DEBUG_PICT_INFO)) |
1644 | 5498 av_log(s->avctx, AV_LOG_INFO, "MPEG4 OBMC not supported (very likely buggy encoder)\n"); /* OBMC Disable */ |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5499 if (vo_ver_id == 1) { |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5500 s->vol_sprite_usage = get_bits1(gb); /* vol_sprite_usage */ |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5501 } else { |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5502 s->vol_sprite_usage = get_bits(gb, 2); /* vol_sprite_usage */ |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5503 } |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
5504 if(s->vol_sprite_usage==STATIC_SPRITE) av_log(s->avctx, AV_LOG_ERROR, "Static Sprites not supported\n"); |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5505 if(s->vol_sprite_usage==STATIC_SPRITE || s->vol_sprite_usage==GMC_SPRITE){ |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5506 if(s->vol_sprite_usage==STATIC_SPRITE){ |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5507 s->sprite_width = get_bits(gb, 13); |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5508 skip_bits1(gb); /* marker */ |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5509 s->sprite_height= get_bits(gb, 13); |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5510 skip_bits1(gb); /* marker */ |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5511 s->sprite_left = get_bits(gb, 13); |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5512 skip_bits1(gb); /* marker */ |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5513 s->sprite_top = get_bits(gb, 13); |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5514 skip_bits1(gb); /* marker */ |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5515 } |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5516 s->num_sprite_warping_points= get_bits(gb, 6); |
4930
655d25351bfc
fix possibly exploitable stack overflow with num_sprite_warping_points (found by reimar)
michael
parents:
4672
diff
changeset
|
5517 if(s->num_sprite_warping_points > 3){ |
655d25351bfc
fix possibly exploitable stack overflow with num_sprite_warping_points (found by reimar)
michael
parents:
4672
diff
changeset
|
5518 av_log(s->avctx, AV_LOG_ERROR, "%d sprite_warping_points\n", s->num_sprite_warping_points); |
655d25351bfc
fix possibly exploitable stack overflow with num_sprite_warping_points (found by reimar)
michael
parents:
4672
diff
changeset
|
5519 s->num_sprite_warping_points= 0; |
655d25351bfc
fix possibly exploitable stack overflow with num_sprite_warping_points (found by reimar)
michael
parents:
4672
diff
changeset
|
5520 return -1; |
655d25351bfc
fix possibly exploitable stack overflow with num_sprite_warping_points (found by reimar)
michael
parents:
4672
diff
changeset
|
5521 } |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5522 s->sprite_warping_accuracy = get_bits(gb, 2); |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5523 s->sprite_brightness_change= get_bits1(gb); |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5524 if(s->vol_sprite_usage==STATIC_SPRITE) |
2967 | 5525 s->low_latency_sprite= get_bits1(gb); |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5526 } |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5527 // FIXME sadct disable bit if verid!=1 && shape not rect |
2967 | 5528 |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5529 if (get_bits1(gb) == 1) { /* not_8_bit */ |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5530 s->quant_precision = get_bits(gb, 4); /* quant_precision */ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
5531 if(get_bits(gb, 4)!=8) av_log(s->avctx, AV_LOG_ERROR, "N-bit not supported\n"); /* bits_per_pixel */ |
2628
511e3afc43e1
Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents:
2615
diff
changeset
|
5532 if(s->quant_precision!=5) av_log(s->avctx, AV_LOG_ERROR, "quant precision %d\n", s->quant_precision); |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5533 } else { |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5534 s->quant_precision = 5; |
0 | 5535 } |
2967 | 5536 |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5537 // FIXME a bunch of grayscale shape things |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5538 |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5539 if((s->mpeg_quant=get_bits1(gb))){ /* vol_quant_type */ |
1057 | 5540 int i, v; |
2967 | 5541 |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5542 /* load default matrixes */ |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5543 for(i=0; i<64; i++){ |
1092 | 5544 int j= s->dsp.idct_permutation[i]; |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5545 v= ff_mpeg4_default_intra_matrix[i]; |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5546 s->intra_matrix[j]= v; |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5547 s->chroma_intra_matrix[j]= v; |
2967 | 5548 |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5549 v= ff_mpeg4_default_non_intra_matrix[i]; |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5550 s->inter_matrix[j]= v; |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5551 s->chroma_inter_matrix[j]= v; |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5552 } |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5553 |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5554 /* load custom intra matrix */ |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5555 if(get_bits1(gb)){ |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5556 int last=0; |
2979 | 5557 for(i=0; i<64; i++){ |
1057 | 5558 int j; |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5559 v= get_bits(gb, 8); |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5560 if(v==0) break; |
2967 | 5561 |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5562 last= v; |
1092 | 5563 j= s->dsp.idct_permutation[ ff_zigzag_direct[i] ]; |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5564 s->intra_matrix[j]= v; |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5565 s->chroma_intra_matrix[j]= v; |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5566 } |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5567 |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5568 /* replicate last value */ |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5569 for(; i<64; i++){ |
2979 | 5570 int j= s->dsp.idct_permutation[ ff_zigzag_direct[i] ]; |
1411 | 5571 s->intra_matrix[j]= last; |
5572 s->chroma_intra_matrix[j]= last; | |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5573 } |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5574 } |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5575 |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5576 /* load custom non intra matrix */ |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5577 if(get_bits1(gb)){ |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5578 int last=0; |
2979 | 5579 for(i=0; i<64; i++){ |
1057 | 5580 int j; |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5581 v= get_bits(gb, 8); |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5582 if(v==0) break; |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5583 |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5584 last= v; |
1092 | 5585 j= s->dsp.idct_permutation[ ff_zigzag_direct[i] ]; |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5586 s->inter_matrix[j]= v; |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5587 s->chroma_inter_matrix[j]= v; |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5588 } |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5589 |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5590 /* replicate last value */ |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5591 for(; i<64; i++){ |
2979 | 5592 int j= s->dsp.idct_permutation[ ff_zigzag_direct[i] ]; |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5593 s->inter_matrix[j]= last; |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5594 s->chroma_inter_matrix[j]= last; |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5595 } |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5596 } |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5597 |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5598 // FIXME a bunch of grayscale shape things |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5599 } |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5600 |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5601 if(vo_ver_id != 1) |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5602 s->quarter_sample= get_bits1(gb); |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5603 else s->quarter_sample=0; |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5604 |
8251
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5605 if(!get_bits1(gb)){ |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5606 int pos= get_bits_count(gb); |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5607 int estimation_method= get_bits(gb, 2); |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5608 if(estimation_method<2){ |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5609 if(!get_bits1(gb)){ |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5610 s->cplx_estimation_trash_i += 8*get_bits1(gb); //opaque |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5611 s->cplx_estimation_trash_i += 8*get_bits1(gb); //transparent |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5612 s->cplx_estimation_trash_i += 8*get_bits1(gb); //intra_cae |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5613 s->cplx_estimation_trash_i += 8*get_bits1(gb); //inter_cae |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5614 s->cplx_estimation_trash_i += 8*get_bits1(gb); //no_update |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5615 s->cplx_estimation_trash_i += 8*get_bits1(gb); //upampling |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5616 } |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5617 if(!get_bits1(gb)){ |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5618 s->cplx_estimation_trash_i += 8*get_bits1(gb); //intra_blocks |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5619 s->cplx_estimation_trash_p += 8*get_bits1(gb); //inter_blocks |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5620 s->cplx_estimation_trash_p += 8*get_bits1(gb); //inter4v_blocks |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5621 s->cplx_estimation_trash_i += 8*get_bits1(gb); //not coded blocks |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5622 } |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5623 if(!check_marker(gb, "in complexity estimation part 1")){ |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5624 skip_bits_long(gb, pos - get_bits_count(gb)); |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5625 goto no_cplx_est; |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5626 } |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5627 if(!get_bits1(gb)){ |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5628 s->cplx_estimation_trash_i += 8*get_bits1(gb); //dct_coeffs |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5629 s->cplx_estimation_trash_i += 8*get_bits1(gb); //dct_lines |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5630 s->cplx_estimation_trash_i += 8*get_bits1(gb); //vlc_syms |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5631 s->cplx_estimation_trash_i += 4*get_bits1(gb); //vlc_bits |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5632 } |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5633 if(!get_bits1(gb)){ |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5634 s->cplx_estimation_trash_p += 8*get_bits1(gb); //apm |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5635 s->cplx_estimation_trash_p += 8*get_bits1(gb); //npm |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5636 s->cplx_estimation_trash_b += 8*get_bits1(gb); //interpolate_mc_q |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5637 s->cplx_estimation_trash_p += 8*get_bits1(gb); //forwback_mc_q |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5638 s->cplx_estimation_trash_p += 8*get_bits1(gb); //halfpel2 |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5639 s->cplx_estimation_trash_p += 8*get_bits1(gb); //halfpel4 |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5640 } |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5641 if(!check_marker(gb, "in complexity estimation part 2")){ |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5642 skip_bits_long(gb, pos - get_bits_count(gb)); |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5643 goto no_cplx_est; |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5644 } |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5645 if(estimation_method==1){ |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5646 s->cplx_estimation_trash_i += 8*get_bits1(gb); //sadct |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5647 s->cplx_estimation_trash_p += 8*get_bits1(gb); //qpel |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5648 } |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5649 }else |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5650 av_log(s->avctx, AV_LOG_ERROR, "Invalid Complexity estimation method %d\n", estimation_method); |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5651 }else{ |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5652 no_cplx_est: |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5653 s->cplx_estimation_trash_i= |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5654 s->cplx_estimation_trash_p= |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5655 s->cplx_estimation_trash_b= 0; |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5656 } |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5657 |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5658 s->resync_marker= !get_bits1(gb); /* resync_marker_disabled */ |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5659 |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5660 s->data_partitioning= get_bits1(gb); |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5661 if(s->data_partitioning){ |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5662 s->rvlc= get_bits1(gb); |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5663 } |
2967 | 5664 |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5665 if(vo_ver_id != 1) { |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5666 s->new_pred= get_bits1(gb); |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5667 if(s->new_pred){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
5668 av_log(s->avctx, AV_LOG_ERROR, "new pred not supported\n"); |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5669 skip_bits(gb, 2); /* requested upstream message type */ |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5670 skip_bits1(gb); /* newpred segment type */ |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5671 } |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5672 s->reduced_res_vop= get_bits1(gb); |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
5673 if(s->reduced_res_vop) av_log(s->avctx, AV_LOG_ERROR, "reduced resolution VOP not supported\n"); |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5674 } |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5675 else{ |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5676 s->new_pred=0; |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5677 s->reduced_res_vop= 0; |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5678 } |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5679 |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5680 s->scalability= get_bits1(gb); |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5681 |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5682 if (s->scalability) { |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5683 GetBitContext bak= *gb; |
751 | 5684 int ref_layer_id; |
5685 int ref_layer_sampling_dir; | |
5686 int h_sampling_factor_n; | |
5687 int h_sampling_factor_m; | |
5688 int v_sampling_factor_n; | |
5689 int v_sampling_factor_m; | |
2967 | 5690 |
751 | 5691 s->hierachy_type= get_bits1(gb); |
5692 ref_layer_id= get_bits(gb, 4); | |
5693 ref_layer_sampling_dir= get_bits1(gb); | |
5694 h_sampling_factor_n= get_bits(gb, 5); | |
5695 h_sampling_factor_m= get_bits(gb, 5); | |
5696 v_sampling_factor_n= get_bits(gb, 5); | |
5697 v_sampling_factor_m= get_bits(gb, 5); | |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5698 s->enhancement_type= get_bits1(gb); |
2967 | 5699 |
5700 if( h_sampling_factor_n==0 || h_sampling_factor_m==0 | |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5701 || v_sampling_factor_n==0 || v_sampling_factor_m==0){ |
10775
35e175942ee2
Add a few explanatory comments to cornercase workarounds.
diego
parents:
10759
diff
changeset
|
5702 /* illegal scalability header (VERY broken encoder), |
35e175942ee2
Add a few explanatory comments to cornercase workarounds.
diego
parents:
10759
diff
changeset
|
5703 * trying to workaround */ |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5704 s->scalability=0; |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5705 *gb= bak; |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5706 }else |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
5707 av_log(s->avctx, AV_LOG_ERROR, "scalability not supported\n"); |
2967 | 5708 |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5709 // bin shape stuff FIXME |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5710 } |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5711 } |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5712 return 0; |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5713 } |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5714 |
1034 | 5715 /** |
5716 * decodes the user data stuff in the header. | |
6918 | 5717 * Also initializes divx/xvid/lavc_version/build. |
1034 | 5718 */ |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5719 static int decode_user_data(MpegEncContext *s, GetBitContext *gb){ |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5720 char buf[256]; |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5721 int i; |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5722 int e; |
2966
564788471dd4
bitstream related fixes from [PATCH] from DivX, Part 9: bitstream crashes by (Steve Lhomme | slhomme divxcorp com)
michael
parents:
2962
diff
changeset
|
5723 int ver = 0, build = 0, ver2 = 0, ver3 = 0; |
1145
79e8ed620b17
better non conformant divx packed bitstream detection, so unpacked (no b frames) divx MPEG4-ES streams can be read
michaelni
parents:
1144
diff
changeset
|
5724 char last; |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5725 |
3615 | 5726 for(i=0; i<255 && get_bits_count(gb) < gb->size_in_bits; i++){ |
2804 | 5727 if(show_bits(gb, 23) == 0) break; |
5728 buf[i]= get_bits(gb, 8); | |
5729 } | |
5730 buf[i]=0; | |
1145
79e8ed620b17
better non conformant divx packed bitstream detection, so unpacked (no b frames) divx MPEG4-ES streams can be read
michaelni
parents:
1144
diff
changeset
|
5731 |
761 | 5732 /* divx detection */ |
1145
79e8ed620b17
better non conformant divx packed bitstream detection, so unpacked (no b frames) divx MPEG4-ES streams can be read
michaelni
parents:
1144
diff
changeset
|
5733 e=sscanf(buf, "DivX%dBuild%d%c", &ver, &build, &last); |
79e8ed620b17
better non conformant divx packed bitstream detection, so unpacked (no b frames) divx MPEG4-ES streams can be read
michaelni
parents:
1144
diff
changeset
|
5734 if(e<2) |
79e8ed620b17
better non conformant divx packed bitstream detection, so unpacked (no b frames) divx MPEG4-ES streams can be read
michaelni
parents:
1144
diff
changeset
|
5735 e=sscanf(buf, "DivX%db%d%c", &ver, &build, &last); |
79e8ed620b17
better non conformant divx packed bitstream detection, so unpacked (no b frames) divx MPEG4-ES streams can be read
michaelni
parents:
1144
diff
changeset
|
5736 if(e>=2){ |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5737 s->divx_version= ver; |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5738 s->divx_build= build; |
1145
79e8ed620b17
better non conformant divx packed bitstream detection, so unpacked (no b frames) divx MPEG4-ES streams can be read
michaelni
parents:
1144
diff
changeset
|
5739 s->divx_packed= e==3 && last=='p'; |
8106
2f5101a67500
Only warn about "Invalid and inefficient vfw-avi packed B frames" once.
andoma
parents:
8042
diff
changeset
|
5740 if(s->divx_packed && !s->showed_packed_warning) { |
6893
72dafc993490
Warn about packed B-frames. (especially useful if the file in question is
michael
parents:
6655
diff
changeset
|
5741 av_log(s->avctx, AV_LOG_WARNING, "Invalid and inefficient vfw-avi packed B frames detected\n"); |
8106
2f5101a67500
Only warn about "Invalid and inefficient vfw-avi packed B frames" once.
andoma
parents:
8042
diff
changeset
|
5742 s->showed_packed_warning=1; |
2f5101a67500
Only warn about "Invalid and inefficient vfw-avi packed B frames" once.
andoma
parents:
8042
diff
changeset
|
5743 } |
0 | 5744 } |
2967 | 5745 |
761 | 5746 /* ffmpeg detection */ |
2805
55a6659fc2ee
fix user data parsing code so it suppors pre1 and cvs
michael
parents:
2804
diff
changeset
|
5747 e=sscanf(buf, "FFmpe%*[^b]b%d", &build)+3; |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5748 if(e!=4) |
2967 | 5749 e=sscanf(buf, "FFmpeg v%d.%d.%d / libavcodec build: %d", &ver, &ver2, &ver3, &build); |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5750 if(e!=4){ |
2814 | 5751 e=sscanf(buf, "Lavc%d.%d.%d", &ver, &ver2, &ver3)+1; |
2966
564788471dd4
bitstream related fixes from [PATCH] from DivX, Part 9: bitstream crashes by (Steve Lhomme | slhomme divxcorp com)
michael
parents:
2962
diff
changeset
|
5752 if (e>1) |
564788471dd4
bitstream related fixes from [PATCH] from DivX, Part 9: bitstream crashes by (Steve Lhomme | slhomme divxcorp com)
michael
parents:
2962
diff
changeset
|
5753 build= (ver<<16) + (ver2<<8) + ver3; |
2814 | 5754 } |
5755 if(e!=4){ | |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5756 if(strcmp(buf, "ffmpeg")==0){ |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5757 s->lavc_build= 4600; |
63 | 5758 } |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5759 } |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5760 if(e==4){ |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5761 s->lavc_build= build; |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5762 } |
2967 | 5763 |
6908 | 5764 /* Xvid detection */ |
761 | 5765 e=sscanf(buf, "XviD%d", &build); |
5766 if(e==1){ | |
5767 s->xvid_build= build; | |
5768 } | |
5769 | |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5770 return 0; |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5771 } |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5772 |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5773 static int decode_vop_header(MpegEncContext *s, GetBitContext *gb){ |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5774 int time_incr, time_increment; |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5775 |
6481 | 5776 s->pict_type = get_bits(gb, 2) + FF_I_TYPE; /* pict type: I = 0 , P = 1 */ |
5777 if(s->pict_type==FF_B_TYPE && s->low_delay && s->vol_control_parameters==0 && !(s->flags & CODEC_FLAG_LOW_DELAY)){ | |
2628
511e3afc43e1
Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents:
2615
diff
changeset
|
5778 av_log(s->avctx, AV_LOG_ERROR, "low_delay flag incorrectly, clearing it\n"); |
365
fdeec2834c79
there are divx5? encoded files without a userdata section but with b-frames :(
michaelni
parents:
364
diff
changeset
|
5779 s->low_delay=0; |
fdeec2834c79
there are divx5? encoded files without a userdata section but with b-frames :(
michaelni
parents:
364
diff
changeset
|
5780 } |
2967 | 5781 |
6481 | 5782 s->partitioned_frame= s->data_partitioning && s->pict_type!=FF_B_TYPE; |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
5783 if(s->partitioned_frame) |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
5784 s->decode_mb= mpeg4_decode_partitioned_mb; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
5785 else |
1649
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
5786 s->decode_mb= ff_mpeg4_decode_mb; |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
5787 |
262 | 5788 time_incr=0; |
2967 | 5789 while (get_bits1(gb) != 0) |
0 | 5790 time_incr++; |
5791 | |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5792 check_marker(gb, "before time_increment"); |
2666 | 5793 |
5794 if(s->time_increment_bits==0 || !(show_bits(gb, s->time_increment_bits+1)&1)){ | |
2628
511e3afc43e1
Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents:
2615
diff
changeset
|
5795 av_log(s->avctx, AV_LOG_ERROR, "hmm, seems the headers are not complete, trying to guess time_increment_bits\n"); |
1068 | 5796 |
5797 for(s->time_increment_bits=1 ;s->time_increment_bits<16; s->time_increment_bits++){ | |
10664 | 5798 if ( s->pict_type == FF_P_TYPE |
5799 || (s->pict_type == FF_S_TYPE && s->vol_sprite_usage==GMC_SPRITE)) { | |
5800 if((show_bits(gb, s->time_increment_bits+6)&0x37) == 0x30) break; | |
5801 }else | |
5802 if((show_bits(gb, s->time_increment_bits+5)&0x1F) == 0x18) break; | |
1068 | 5803 } |
1396 | 5804 |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
5805 av_log(s->avctx, AV_LOG_ERROR, "my guess is %d bits ;)\n",s->time_increment_bits); |
1068 | 5806 } |
2967 | 5807 |
1411 | 5808 if(IS_3IV1) time_increment= get_bits1(gb); //FIXME investigate further |
5809 else time_increment= get_bits(gb, s->time_increment_bits); | |
2967 | 5810 |
6481 | 5811 if(s->pict_type!=FF_B_TYPE){ |
324 | 5812 s->last_time_base= s->time_base; |
262 | 5813 s->time_base+= time_incr; |
2637 | 5814 s->time= s->time_base*s->avctx->time_base.den + time_increment; |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
5815 if(s->workaround_bugs&FF_BUG_UMP4){ |
700
0fb4c66527e1
autodetect UMP4 (by adding a fourcc field to AVCodecContext)
michaelni
parents:
699
diff
changeset
|
5816 if(s->time < s->last_non_b_time){ |
10775
35e175942ee2
Add a few explanatory comments to cornercase workarounds.
diego
parents:
10759
diff
changeset
|
5817 /* header is not mpeg-4-compatible, broken encoder, |
35e175942ee2
Add a few explanatory comments to cornercase workarounds.
diego
parents:
10759
diff
changeset
|
5818 * trying to workaround */ |
700
0fb4c66527e1
autodetect UMP4 (by adding a fourcc field to AVCodecContext)
michaelni
parents:
699
diff
changeset
|
5819 s->time_base++; |
2637 | 5820 s->time+= s->avctx->time_base.den; |
700
0fb4c66527e1
autodetect UMP4 (by adding a fourcc field to AVCodecContext)
michaelni
parents:
699
diff
changeset
|
5821 } |
664 | 5822 } |
324 | 5823 s->pp_time= s->time - s->last_non_b_time; |
5824 s->last_non_b_time= s->time; | |
262 | 5825 }else{ |
2637 | 5826 s->time= (s->last_time_base + time_incr)*s->avctx->time_base.den + time_increment; |
664 | 5827 s->pb_time= s->pp_time - (s->last_non_b_time - s->time); |
5828 if(s->pp_time <=s->pb_time || s->pp_time <= s->pp_time - s->pb_time || s->pp_time<=0){ | |
10775
35e175942ee2
Add a few explanatory comments to cornercase workarounds.
diego
parents:
10759
diff
changeset
|
5829 /* messed up order, maybe after seeking? skipping current b-frame */ |
2628
511e3afc43e1
Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents:
2615
diff
changeset
|
5830 return FRAME_SKIPPED; |
335 | 5831 } |
3247 | 5832 ff_mpeg4_init_direct_mv(s); |
2967 | 5833 |
2034 | 5834 if(s->t_frame==0) s->t_frame= s->pb_time; |
664 | 5835 if(s->t_frame==0) s->t_frame=1; // 1/0 protection |
2967 | 5836 s->pp_field_time= ( ROUNDED_DIV(s->last_non_b_time, s->t_frame) |
664 | 5837 - ROUNDED_DIV(s->last_non_b_time - s->pp_time, s->t_frame))*2; |
2967 | 5838 s->pb_field_time= ( ROUNDED_DIV(s->time, s->t_frame) |
664 | 5839 - ROUNDED_DIV(s->last_non_b_time - s->pp_time, s->t_frame))*2; |
4346 | 5840 if(!s->progressive_sequence){ |
5841 if(s->pp_field_time <= s->pb_field_time || s->pb_field_time <= 1) | |
5842 return FRAME_SKIPPED; | |
5843 } | |
262 | 5844 } |
2967 | 5845 |
2813
6fd9dbb8c385
try to check for nonsense time_base instead of setting fake one
michael
parents:
2812
diff
changeset
|
5846 if(s->avctx->time_base.num) |
6fd9dbb8c385
try to check for nonsense time_base instead of setting fake one
michael
parents:
2812
diff
changeset
|
5847 s->current_picture_ptr->pts= (s->time + s->avctx->time_base.num/2) / s->avctx->time_base.num; |
6fd9dbb8c385
try to check for nonsense time_base instead of setting fake one
michael
parents:
2812
diff
changeset
|
5848 else |
6fd9dbb8c385
try to check for nonsense time_base instead of setting fake one
michael
parents:
2812
diff
changeset
|
5849 s->current_picture_ptr->pts= AV_NOPTS_VALUE; |
942 | 5850 if(s->avctx->debug&FF_DEBUG_PTS) |
2962 | 5851 av_log(s->avctx, AV_LOG_DEBUG, "MPEG4 PTS: %"PRId64"\n", s->current_picture_ptr->pts); |
2034 | 5852 |
1068 | 5853 check_marker(gb, "before vop_coded"); |
2967 | 5854 |
0 | 5855 /* vop coded */ |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5856 if (get_bits1(gb) != 1){ |
2271 | 5857 if(s->avctx->debug&FF_DEBUG_PICT_INFO) |
5858 av_log(s->avctx, AV_LOG_ERROR, "vop not coded\n"); | |
2628
511e3afc43e1
Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents:
2615
diff
changeset
|
5859 return FRAME_SKIPPED; |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5860 } |
6481 | 5861 if (s->shape != BIN_ONLY_SHAPE && ( s->pict_type == FF_P_TYPE |
5862 || (s->pict_type == FF_S_TYPE && s->vol_sprite_usage==GMC_SPRITE))) { | |
0 | 5863 /* rounding type for motion estimation */ |
2979 | 5864 s->no_rounding = get_bits1(gb); |
63 | 5865 } else { |
2979 | 5866 s->no_rounding = 0; |
0 | 5867 } |
253
4448dd55d415
parsing more of the mpeg4 header & print some "not supported" stuff
michaelni
parents:
250
diff
changeset
|
5868 //FIXME reduced res stuff |
4448dd55d415
parsing more of the mpeg4 header & print some "not supported" stuff
michaelni
parents:
250
diff
changeset
|
5869 |
4448dd55d415
parsing more of the mpeg4 header & print some "not supported" stuff
michaelni
parents:
250
diff
changeset
|
5870 if (s->shape != RECT_SHAPE) { |
6481 | 5871 if (s->vol_sprite_usage != 1 || s->pict_type != FF_I_TYPE) { |
63 | 5872 int width, height, hor_spat_ref, ver_spat_ref; |
2967 | 5873 |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5874 width = get_bits(gb, 13); |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5875 skip_bits1(gb); /* marker */ |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5876 height = get_bits(gb, 13); |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5877 skip_bits1(gb); /* marker */ |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5878 hor_spat_ref = get_bits(gb, 13); /* hor_spat_ref */ |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5879 skip_bits1(gb); /* marker */ |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5880 ver_spat_ref = get_bits(gb, 13); /* ver_spat_ref */ |
63 | 5881 } |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5882 skip_bits1(gb); /* change_CR_disable */ |
2967 | 5883 |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5884 if (get_bits1(gb) != 0) { |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5885 skip_bits(gb, 8); /* constant_alpha_value */ |
63 | 5886 } |
5887 } | |
253
4448dd55d415
parsing more of the mpeg4 header & print some "not supported" stuff
michaelni
parents:
250
diff
changeset
|
5888 //FIXME complexity estimation stuff |
2967 | 5889 |
253
4448dd55d415
parsing more of the mpeg4 header & print some "not supported" stuff
michaelni
parents:
250
diff
changeset
|
5890 if (s->shape != BIN_ONLY_SHAPE) { |
8251
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5891 skip_bits_long(gb, s->cplx_estimation_trash_i); |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5892 if(s->pict_type != FF_I_TYPE) |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5893 skip_bits_long(gb, s->cplx_estimation_trash_p); |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5894 if(s->pict_type == FF_B_TYPE) |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5895 skip_bits_long(gb, s->cplx_estimation_trash_b); |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5896 |
1520 | 5897 s->intra_dc_threshold= mpeg4_dc_threshold[ get_bits(gb, 3) ]; |
619
2be2cc8fd0a1
mpeg4 interlaced decoding support (not completly implemented/tested due to lack of samples)
michaelni
parents:
617
diff
changeset
|
5898 if(!s->progressive_sequence){ |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5899 s->top_field_first= get_bits1(gb); |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5900 s->alternate_scan= get_bits1(gb); |
661 | 5901 }else |
5902 s->alternate_scan= 0; | |
253
4448dd55d415
parsing more of the mpeg4 header & print some "not supported" stuff
michaelni
parents:
250
diff
changeset
|
5903 } |
254
b4fed8b24e3a
gmc bitstream decoding support (the real motion compensation isnt implemnted yet)
michaelni
parents:
253
diff
changeset
|
5904 |
718 | 5905 if(s->alternate_scan){ |
1273 | 5906 ff_init_scantable(s->dsp.idct_permutation, &s->inter_scantable , ff_alternate_vertical_scan); |
5907 ff_init_scantable(s->dsp.idct_permutation, &s->intra_scantable , ff_alternate_vertical_scan); | |
5908 ff_init_scantable(s->dsp.idct_permutation, &s->intra_h_scantable, ff_alternate_vertical_scan); | |
5909 ff_init_scantable(s->dsp.idct_permutation, &s->intra_v_scantable, ff_alternate_vertical_scan); | |
718 | 5910 } else{ |
1273 | 5911 ff_init_scantable(s->dsp.idct_permutation, &s->inter_scantable , ff_zigzag_direct); |
5912 ff_init_scantable(s->dsp.idct_permutation, &s->intra_scantable , ff_zigzag_direct); | |
5913 ff_init_scantable(s->dsp.idct_permutation, &s->intra_h_scantable, ff_alternate_horizontal_scan); | |
5914 ff_init_scantable(s->dsp.idct_permutation, &s->intra_v_scantable, ff_alternate_vertical_scan); | |
718 | 5915 } |
2967 | 5916 |
6481 | 5917 if(s->pict_type == FF_S_TYPE && (s->vol_sprite_usage==STATIC_SPRITE || s->vol_sprite_usage==GMC_SPRITE)){ |
1914 | 5918 mpeg4_decode_sprite_trajectory(s, gb); |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
5919 if(s->sprite_brightness_change) av_log(s->avctx, AV_LOG_ERROR, "sprite_brightness_change not supported\n"); |
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
5920 if(s->vol_sprite_usage==STATIC_SPRITE) av_log(s->avctx, AV_LOG_ERROR, "static sprite not supported\n"); |
253
4448dd55d415
parsing more of the mpeg4 header & print some "not supported" stuff
michaelni
parents:
250
diff
changeset
|
5921 } |
254
b4fed8b24e3a
gmc bitstream decoding support (the real motion compensation isnt implemnted yet)
michaelni
parents:
253
diff
changeset
|
5922 |
253
4448dd55d415
parsing more of the mpeg4 header & print some "not supported" stuff
michaelni
parents:
250
diff
changeset
|
5923 if (s->shape != BIN_ONLY_SHAPE) { |
1644 | 5924 s->chroma_qscale= s->qscale = get_bits(gb, s->quant_precision); |
264
28c5c62b1c4c
support decoding (with mplayer) of 3 .mp4 files from mphq
michaelni
parents:
263
diff
changeset
|
5925 if(s->qscale==0){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
5926 av_log(s->avctx, AV_LOG_ERROR, "Error, header damaged or not MPEG4 header (qscale=0)\n"); |
264
28c5c62b1c4c
support decoding (with mplayer) of 3 .mp4 files from mphq
michaelni
parents:
263
diff
changeset
|
5927 return -1; // makes no sense to continue, as there is nothing left from the image then |
28c5c62b1c4c
support decoding (with mplayer) of 3 .mp4 files from mphq
michaelni
parents:
263
diff
changeset
|
5928 } |
2967 | 5929 |
6481 | 5930 if (s->pict_type != FF_I_TYPE) { |
2979 | 5931 s->f_code = get_bits(gb, 3); /* fcode_for */ |
264
28c5c62b1c4c
support decoding (with mplayer) of 3 .mp4 files from mphq
michaelni
parents:
263
diff
changeset
|
5932 if(s->f_code==0){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
5933 av_log(s->avctx, AV_LOG_ERROR, "Error, header damaged or not MPEG4 header (f_code=0)\n"); |
264
28c5c62b1c4c
support decoding (with mplayer) of 3 .mp4 files from mphq
michaelni
parents:
263
diff
changeset
|
5934 return -1; // makes no sense to continue, as the MV decoding will break very quickly |
28c5c62b1c4c
support decoding (with mplayer) of 3 .mp4 files from mphq
michaelni
parents:
263
diff
changeset
|
5935 } |
582
5132a4ee50cd
different edge positions fixed with edge emu / dr1
michaelni
parents:
575
diff
changeset
|
5936 }else |
5132a4ee50cd
different edge positions fixed with edge emu / dr1
michaelni
parents:
575
diff
changeset
|
5937 s->f_code=1; |
2967 | 5938 |
6481 | 5939 if (s->pict_type == FF_B_TYPE) { |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5940 s->b_code = get_bits(gb, 3); |
582
5132a4ee50cd
different edge positions fixed with edge emu / dr1
michaelni
parents:
575
diff
changeset
|
5941 }else |
5132a4ee50cd
different edge positions fixed with edge emu / dr1
michaelni
parents:
575
diff
changeset
|
5942 s->b_code=1; |
906 | 5943 |
5944 if(s->avctx->debug&FF_DEBUG_PICT_INFO){ | |
8251
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5945 av_log(s->avctx, AV_LOG_DEBUG, "qp:%d fc:%d,%d %s size:%d pro:%d alt:%d top:%d %spel part:%d resync:%d w:%d a:%d rnd:%d vot:%d%s dc:%d ce:%d/%d/%d\n", |
2967 | 5946 s->qscale, s->f_code, s->b_code, |
6481 | 5947 s->pict_type == FF_I_TYPE ? "I" : (s->pict_type == FF_P_TYPE ? "P" : (s->pict_type == FF_B_TYPE ? "B" : "S")), |
2967 | 5948 gb->size_in_bits,s->progressive_sequence, s->alternate_scan, s->top_field_first, |
930 | 5949 s->quarter_sample ? "q" : "h", s->data_partitioning, s->resync_marker, s->num_sprite_warping_points, |
8251
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5950 s->sprite_warping_accuracy, 1-s->no_rounding, s->vo_type, s->vol_control_parameters ? " VOLC" : " ", s->intra_dc_threshold, s->cplx_estimation_trash_i, s->cplx_estimation_trash_p, s->cplx_estimation_trash_b); |
906 | 5951 } |
5952 | |
253
4448dd55d415
parsing more of the mpeg4 header & print some "not supported" stuff
michaelni
parents:
250
diff
changeset
|
5953 if(!s->scalability){ |
6481 | 5954 if (s->shape!=RECT_SHAPE && s->pict_type!=FF_I_TYPE) { |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5955 skip_bits1(gb); // vop shape coding type |
253
4448dd55d415
parsing more of the mpeg4 header & print some "not supported" stuff
michaelni
parents:
250
diff
changeset
|
5956 } |
575 | 5957 }else{ |
5958 if(s->enhancement_type){ | |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5959 int load_backward_shape= get_bits1(gb); |
575 | 5960 if(load_backward_shape){ |
2646
c735e3e60ca7
Even More spelling errors. patch by (Kevin Baragona <kevinmb500 gawab com)
michael
parents:
2639
diff
changeset
|
5961 av_log(s->avctx, AV_LOG_ERROR, "load backward shape isn't supported\n"); |
575 | 5962 } |
5963 } | |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5964 skip_bits(gb, 2); //ref_select_code |
63 | 5965 } |
5966 } | |
2646
c735e3e60ca7
Even More spelling errors. patch by (Kevin Baragona <kevinmb500 gawab com)
michael
parents:
2639
diff
changeset
|
5967 /* detect buggy encoders which don't set the low_delay flag (divx4/xvid/opendivx)*/ |
c735e3e60ca7
Even More spelling errors. patch by (Kevin Baragona <kevinmb500 gawab com)
michael
parents:
2639
diff
changeset
|
5968 // note we cannot detect divx5 without b-frames easily (although it's buggy too) |
365
fdeec2834c79
there are divx5? encoded files without a userdata section but with b-frames :(
michaelni
parents:
364
diff
changeset
|
5969 if(s->vo_type==0 && s->vol_control_parameters==0 && s->divx_version==0 && s->picture_number==0){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
5970 av_log(s->avctx, AV_LOG_ERROR, "looks like this file was encoded with (divx4/(old)xvid/opendivx) -> forcing low_delay flag\n"); |
346
c2f789fe4945
detecting xvid/divx4/opendivx and set low_delay flag
michaelni
parents:
344
diff
changeset
|
5971 s->low_delay=1; |
c2f789fe4945
detecting xvid/divx4/opendivx and set low_delay flag
michaelni
parents:
344
diff
changeset
|
5972 } |
c2f789fe4945
detecting xvid/divx4/opendivx and set low_delay flag
michaelni
parents:
344
diff
changeset
|
5973 |
2646
c735e3e60ca7
Even More spelling errors. patch by (Kevin Baragona <kevinmb500 gawab com)
michael
parents:
2639
diff
changeset
|
5974 s->picture_number++; // better than pic number==0 always ;) |
346
c2f789fe4945
detecting xvid/divx4/opendivx and set low_delay flag
michaelni
parents:
344
diff
changeset
|
5975 |
2967 | 5976 s->y_dc_scale_table= ff_mpeg4_y_dc_scale_table; //FIXME add short header support |
498 | 5977 s->c_dc_scale_table= ff_mpeg4_c_dc_scale_table; |
5978 | |
1366
80067f8d6770
fix edge repeating bug for %16!=0 files, this fixes Quicktime mpeg4 (they arent buggy)
michaelni
parents:
1364
diff
changeset
|
5979 if(s->workaround_bugs&FF_BUG_EDGE){ |
582
5132a4ee50cd
different edge positions fixed with edge emu / dr1
michaelni
parents:
575
diff
changeset
|
5980 s->h_edge_pos= s->width; |
5132a4ee50cd
different edge positions fixed with edge emu / dr1
michaelni
parents:
575
diff
changeset
|
5981 s->v_edge_pos= s->height; |
5132a4ee50cd
different edge positions fixed with edge emu / dr1
michaelni
parents:
575
diff
changeset
|
5982 } |
63 | 5983 return 0; |
0 | 5984 } |
5985 | |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5986 /** |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5987 * decode mpeg4 headers |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5988 * @return <0 if no VOP found (or a damaged one) |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5989 * FRAME_SKIPPED if a not coded VOP is found |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5990 * 0 if a VOP is found |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5991 */ |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5992 int ff_mpeg4_decode_picture_header(MpegEncContext * s, GetBitContext *gb) |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5993 { |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5994 int startcode, v; |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5995 |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5996 /* search next start code */ |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5997 align_get_bits(gb); |
2406 | 5998 |
8612 | 5999 if(s->codec_tag == AV_RL32("WV1F") && show_bits(gb, 24) == 0x575630){ |
2406 | 6000 skip_bits(gb, 24); |
6001 if(get_bits(gb, 8) == 0xF0) | |
8417
ad4f10287633
Move CODEC_FLAG_LOW_DELAY into ff_mpeg4_decode_picture_header().
michael
parents:
8297
diff
changeset
|
6002 goto end; |
2406 | 6003 } |
6004 | |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
6005 startcode = 0xff; |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
6006 for(;;) { |
1025
1f9afd8b9131
GetBitContext.size is allways multiplied by 8 -> use size_in_bits to avoid useless *8 in a few inner loops
michaelni
parents:
1013
diff
changeset
|
6007 if(get_bits_count(gb) >= gb->size_in_bits){ |
2554
84a8f374bf63
fixing playback of xvid pretending to be divx (sample_vop_nc.avi)
michael
parents:
2522
diff
changeset
|
6008 if(gb->size_in_bits==8 && (s->divx_version || s->xvid_build)){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
6009 av_log(s->avctx, AV_LOG_ERROR, "frame skip %d\n", gb->size_in_bits); |
2628
511e3afc43e1
Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents:
2615
diff
changeset
|
6010 return FRAME_SKIPPED; //divx bug |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
6011 }else |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
6012 return -1; //end of stream |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
6013 } |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
6014 |
2966
564788471dd4
bitstream related fixes from [PATCH] from DivX, Part 9: bitstream crashes by (Steve Lhomme | slhomme divxcorp com)
michael
parents:
2962
diff
changeset
|
6015 /* use the bits after the test */ |
564788471dd4
bitstream related fixes from [PATCH] from DivX, Part 9: bitstream crashes by (Steve Lhomme | slhomme divxcorp com)
michael
parents:
2962
diff
changeset
|
6016 v = get_bits(gb, 8); |
564788471dd4
bitstream related fixes from [PATCH] from DivX, Part 9: bitstream crashes by (Steve Lhomme | slhomme divxcorp com)
michael
parents:
2962
diff
changeset
|
6017 startcode = ((startcode << 8) | v) & 0xffffffff; |
564788471dd4
bitstream related fixes from [PATCH] from DivX, Part 9: bitstream crashes by (Steve Lhomme | slhomme divxcorp com)
michael
parents:
2962
diff
changeset
|
6018 |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
6019 if((startcode&0xFFFFFF00) != 0x100) |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
6020 continue; //no startcode |
2967 | 6021 |
942 | 6022 if(s->avctx->debug&FF_DEBUG_STARTCODE){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
6023 av_log(s->avctx, AV_LOG_DEBUG, "startcode: %3X ", startcode); |
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
6024 if (startcode<=0x11F) av_log(s->avctx, AV_LOG_DEBUG, "Video Object Start"); |
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
6025 else if(startcode<=0x12F) av_log(s->avctx, AV_LOG_DEBUG, "Video Object Layer Start"); |
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
6026 else if(startcode<=0x13F) av_log(s->avctx, AV_LOG_DEBUG, "Reserved"); |
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
6027 else if(startcode<=0x15F) av_log(s->avctx, AV_LOG_DEBUG, "FGS bp start"); |
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
6028 else if(startcode<=0x1AF) av_log(s->avctx, AV_LOG_DEBUG, "Reserved"); |
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
6029 else if(startcode==0x1B0) av_log(s->avctx, AV_LOG_DEBUG, "Visual Object Seq Start"); |
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
6030 else if(startcode==0x1B1) av_log(s->avctx, AV_LOG_DEBUG, "Visual Object Seq End"); |
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
6031 else if(startcode==0x1B2) av_log(s->avctx, AV_LOG_DEBUG, "User Data"); |
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
6032 else if(startcode==0x1B3) av_log(s->avctx, AV_LOG_DEBUG, "Group of VOP start"); |
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
6033 else if(startcode==0x1B4) av_log(s->avctx, AV_LOG_DEBUG, "Video Session Error"); |
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
6034 else if(startcode==0x1B5) av_log(s->avctx, AV_LOG_DEBUG, "Visual Object Start"); |
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
6035 else if(startcode==0x1B6) av_log(s->avctx, AV_LOG_DEBUG, "Video Object Plane start"); |
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
6036 else if(startcode==0x1B7) av_log(s->avctx, AV_LOG_DEBUG, "slice start"); |
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
6037 else if(startcode==0x1B8) av_log(s->avctx, AV_LOG_DEBUG, "extension start"); |
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
6038 else if(startcode==0x1B9) av_log(s->avctx, AV_LOG_DEBUG, "fgs start"); |
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
6039 else if(startcode==0x1BA) av_log(s->avctx, AV_LOG_DEBUG, "FBA Object start"); |
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
6040 else if(startcode==0x1BB) av_log(s->avctx, AV_LOG_DEBUG, "FBA Object Plane start"); |
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
6041 else if(startcode==0x1BC) av_log(s->avctx, AV_LOG_DEBUG, "Mesh Object start"); |
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
6042 else if(startcode==0x1BD) av_log(s->avctx, AV_LOG_DEBUG, "Mesh Object Plane start"); |
2628
511e3afc43e1
Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents:
2615
diff
changeset
|
6043 else if(startcode==0x1BE) av_log(s->avctx, AV_LOG_DEBUG, "Still Texture Object start"); |
511e3afc43e1
Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents:
2615
diff
changeset
|
6044 else if(startcode==0x1BF) av_log(s->avctx, AV_LOG_DEBUG, "Texture Spatial Layer start"); |
511e3afc43e1
Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents:
2615
diff
changeset
|
6045 else if(startcode==0x1C0) av_log(s->avctx, AV_LOG_DEBUG, "Texture SNR Layer start"); |
511e3afc43e1
Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents:
2615
diff
changeset
|
6046 else if(startcode==0x1C1) av_log(s->avctx, AV_LOG_DEBUG, "Texture Tile start"); |
511e3afc43e1
Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents:
2615
diff
changeset
|
6047 else if(startcode==0x1C2) av_log(s->avctx, AV_LOG_DEBUG, "Texture Shape Layer start"); |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
6048 else if(startcode==0x1C3) av_log(s->avctx, AV_LOG_DEBUG, "stuffing start"); |
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
6049 else if(startcode<=0x1C5) av_log(s->avctx, AV_LOG_DEBUG, "reserved"); |
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
6050 else if(startcode<=0x1FF) av_log(s->avctx, AV_LOG_DEBUG, "System start"); |
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
6051 av_log(s->avctx, AV_LOG_DEBUG, " at %d\n", get_bits_count(gb)); |
942 | 6052 } |
6053 | |
1512 | 6054 if(startcode >= 0x120 && startcode <= 0x12F){ |
2967 | 6055 if(decode_vol_header(s, gb) < 0) |
1396 | 6056 return -1; |
1512 | 6057 } |
6058 else if(startcode == USER_DATA_STARTCODE){ | |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
6059 decode_user_data(s, gb); |
1512 | 6060 } |
6061 else if(startcode == GOP_STARTCODE){ | |
942 | 6062 mpeg4_decode_gop_header(s, gb); |
1512 | 6063 } |
6064 else if(startcode == VOP_STARTCODE){ | |
8417
ad4f10287633
Move CODEC_FLAG_LOW_DELAY into ff_mpeg4_decode_picture_header().
michael
parents:
8297
diff
changeset
|
6065 break; |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
6066 } |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
6067 |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
6068 align_get_bits(gb); |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
6069 startcode = 0xff; |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
6070 } |
8417
ad4f10287633
Move CODEC_FLAG_LOW_DELAY into ff_mpeg4_decode_picture_header().
michael
parents:
8297
diff
changeset
|
6071 end: |
ad4f10287633
Move CODEC_FLAG_LOW_DELAY into ff_mpeg4_decode_picture_header().
michael
parents:
8297
diff
changeset
|
6072 if(s->flags& CODEC_FLAG_LOW_DELAY) |
ad4f10287633
Move CODEC_FLAG_LOW_DELAY into ff_mpeg4_decode_picture_header().
michael
parents:
8297
diff
changeset
|
6073 s->low_delay=1; |
8418
f75be04312dc
Fix PTS returned by the demuxers for mpeg4 without a decoder.
michael
parents:
8417
diff
changeset
|
6074 s->avctx->has_b_frames= !s->low_delay; |
8417
ad4f10287633
Move CODEC_FLAG_LOW_DELAY into ff_mpeg4_decode_picture_header().
michael
parents:
8297
diff
changeset
|
6075 return decode_vop_header(s, gb); |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
6076 } |