Mercurial > libavcodec.hg
annotate h263.c @ 10799:00a3206c3e42 libavcodec
Add some const qualifiers.
author | michael |
---|---|
date | Thu, 07 Jan 2010 15:46:45 +0000 |
parents | 72de50743adf |
children | 4605bd2fdb7f |
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 | |
10798
72de50743adf
Document decide_ac_pred() and restore_ac_coeffs().
michael
parents:
10797
diff
changeset
|
371 |
72de50743adf
Document decide_ac_pred() and restore_ac_coeffs().
michael
parents:
10797
diff
changeset
|
372 /** |
72de50743adf
Document decide_ac_pred() and restore_ac_coeffs().
michael
parents:
10797
diff
changeset
|
373 * Restores the ac coefficients in block that have been changed by decide_ac_pred(). |
72de50743adf
Document decide_ac_pred() and restore_ac_coeffs().
michael
parents:
10797
diff
changeset
|
374 * This function also restores s->block_last_index. |
72de50743adf
Document decide_ac_pred() and restore_ac_coeffs().
michael
parents:
10797
diff
changeset
|
375 * @param[in,out] block MB coefficients, these will be restored |
72de50743adf
Document decide_ac_pred() and restore_ac_coeffs().
michael
parents:
10797
diff
changeset
|
376 * @param[in] dir ac prediction direction for each 8x8 block |
72de50743adf
Document decide_ac_pred() and restore_ac_coeffs().
michael
parents:
10797
diff
changeset
|
377 * @param[out] st scantable for each 8x8 block |
72de50743adf
Document decide_ac_pred() and restore_ac_coeffs().
michael
parents:
10797
diff
changeset
|
378 * @param[in] zigzag_last_index index refering to the last non zero coefficient in zigzag order |
72de50743adf
Document decide_ac_pred() and restore_ac_coeffs().
michael
parents:
10797
diff
changeset
|
379 */ |
10799 | 380 static inline void restore_ac_coeffs(MpegEncContext * s, DCTELEM block[6][64], const int dir[6], uint8_t *st[6], const int zigzag_last_index[6]) |
10796
3cebe9b3562d
Move restore_ac_coeffs() up so its declared before its use.
michael
parents:
10795
diff
changeset
|
381 { |
3cebe9b3562d
Move restore_ac_coeffs() up so its declared before its use.
michael
parents:
10795
diff
changeset
|
382 int i, n; |
3cebe9b3562d
Move restore_ac_coeffs() up so its declared before its use.
michael
parents:
10795
diff
changeset
|
383 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
|
384 |
3cebe9b3562d
Move restore_ac_coeffs() up so its declared before its use.
michael
parents:
10795
diff
changeset
|
385 for(n=0; n<6; n++){ |
3cebe9b3562d
Move restore_ac_coeffs() up so its declared before its use.
michael
parents:
10795
diff
changeset
|
386 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
|
387 |
3cebe9b3562d
Move restore_ac_coeffs() up so its declared before its use.
michael
parents:
10795
diff
changeset
|
388 st[n]= s->intra_scantable.permutated; |
3cebe9b3562d
Move restore_ac_coeffs() up so its declared before its use.
michael
parents:
10795
diff
changeset
|
389 if(dir[n]){ |
3cebe9b3562d
Move restore_ac_coeffs() up so its declared before its use.
michael
parents:
10795
diff
changeset
|
390 /* top prediction */ |
3cebe9b3562d
Move restore_ac_coeffs() up so its declared before its use.
michael
parents:
10795
diff
changeset
|
391 for(i=1; i<8; i++){ |
3cebe9b3562d
Move restore_ac_coeffs() up so its declared before its use.
michael
parents:
10795
diff
changeset
|
392 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
|
393 } |
3cebe9b3562d
Move restore_ac_coeffs() up so its declared before its use.
michael
parents:
10795
diff
changeset
|
394 }else{ |
3cebe9b3562d
Move restore_ac_coeffs() up so its declared before its use.
michael
parents:
10795
diff
changeset
|
395 /* left prediction */ |
3cebe9b3562d
Move restore_ac_coeffs() up so its declared before its use.
michael
parents:
10795
diff
changeset
|
396 for(i=1; i<8; i++){ |
3cebe9b3562d
Move restore_ac_coeffs() up so its declared before its use.
michael
parents:
10795
diff
changeset
|
397 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
|
398 } |
3cebe9b3562d
Move restore_ac_coeffs() up so its declared before its use.
michael
parents:
10795
diff
changeset
|
399 } |
3cebe9b3562d
Move restore_ac_coeffs() up so its declared before its use.
michael
parents:
10795
diff
changeset
|
400 } |
3cebe9b3562d
Move restore_ac_coeffs() up so its declared before its use.
michael
parents:
10795
diff
changeset
|
401 } |
3cebe9b3562d
Move restore_ac_coeffs() up so its declared before its use.
michael
parents:
10795
diff
changeset
|
402 |
10795 | 403 /** |
404 * Returns the optimal value (0 or 1) for the ac_pred element for the given MB in mpeg4. | |
10798
72de50743adf
Document decide_ac_pred() and restore_ac_coeffs().
michael
parents:
10797
diff
changeset
|
405 * This function will also update s->block_last_index and s->ac_val. |
72de50743adf
Document decide_ac_pred() and restore_ac_coeffs().
michael
parents:
10797
diff
changeset
|
406 * @param[in,out] block MB coefficients, these will be updated if 1 is returned |
72de50743adf
Document decide_ac_pred() and restore_ac_coeffs().
michael
parents:
10797
diff
changeset
|
407 * @param[in] dir ac prediction direction for each 8x8 block |
72de50743adf
Document decide_ac_pred() and restore_ac_coeffs().
michael
parents:
10797
diff
changeset
|
408 * @param[out] st scantable for each 8x8 block |
72de50743adf
Document decide_ac_pred() and restore_ac_coeffs().
michael
parents:
10797
diff
changeset
|
409 * @param[out] zigzag_last_index index refering to the last non zero coefficient in zigzag order |
10795 | 410 */ |
10799 | 411 static inline int decide_ac_pred(MpegEncContext * s, DCTELEM block[6][64], const 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
|
412 { |
1492 | 413 int score= 0; |
265
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
414 int i, n; |
903 | 415 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
|
416 |
1492 | 417 memcpy(zigzag_last_index, s->block_last_index, sizeof(int)*6); |
2967 | 418 |
265
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
419 for(n=0; n<6; n++){ |
1064 | 420 int16_t *ac_val, *ac_val1; |
2967 | 421 |
1492 | 422 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
|
423 |
266 | 424 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
|
425 ac_val1= ac_val; |
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
426 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
|
427 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
|
428 /* top prediction */ |
266 | 429 ac_val-= s->block_wrap[n]*16; |
903 | 430 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
|
431 /* same qscale */ |
852b5a416161
fixing ac prediction encoding with adaptive quantization
michaelni
parents:
690
diff
changeset
|
432 for(i=1; i<8; i++){ |
1092 | 433 const int level= block[n][s->dsp.idct_permutation[i ]]; |
1492 | 434 block[n][s->dsp.idct_permutation[i ]] = level - ac_val[i+8]; |
1092 | 435 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
|
436 ac_val1[i+8]= level; |
852b5a416161
fixing ac prediction encoding with adaptive quantization
michaelni
parents:
690
diff
changeset
|
437 } |
852b5a416161
fixing ac prediction encoding with adaptive quantization
michaelni
parents:
690
diff
changeset
|
438 }else{ |
852b5a416161
fixing ac prediction encoding with adaptive quantization
michaelni
parents:
690
diff
changeset
|
439 /* different qscale, we must rescale */ |
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 ]]; |
1492 | 442 block[n][s->dsp.idct_permutation[i ]] = level - ROUNDED_DIV(ac_val[i + 8]*qscale_table[xy], s->qscale); |
1092 | 443 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
|
444 ac_val1[i+8]= level; |
852b5a416161
fixing ac prediction encoding with adaptive quantization
michaelni
parents:
690
diff
changeset
|
445 } |
265
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
446 } |
1492 | 447 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
|
448 }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
|
449 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
|
450 /* left prediction */ |
265
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
451 ac_val-= 16; |
903 | 452 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
|
453 /* same qscale */ |
852b5a416161
fixing ac prediction encoding with adaptive quantization
michaelni
parents:
690
diff
changeset
|
454 for(i=1; i<8; i++){ |
1092 | 455 const int level= block[n][s->dsp.idct_permutation[i<<3]]; |
1492 | 456 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
|
457 ac_val1[i ]= level; |
1092 | 458 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
|
459 } |
852b5a416161
fixing ac prediction encoding with adaptive quantization
michaelni
parents:
690
diff
changeset
|
460 }else{ |
852b5a416161
fixing ac prediction encoding with adaptive quantization
michaelni
parents:
690
diff
changeset
|
461 /* different qscale, we must rescale */ |
852b5a416161
fixing ac prediction encoding with adaptive quantization
michaelni
parents:
690
diff
changeset
|
462 for(i=1; i<8; i++){ |
1092 | 463 const int level= block[n][s->dsp.idct_permutation[i<<3]]; |
1492 | 464 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
|
465 ac_val1[i ]= level; |
1092 | 466 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
|
467 } |
265
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
468 } |
1492 | 469 st[n]= s->intra_v_scantable.permutated; |
470 } | |
471 | |
472 for(i=63; i>0; i--) //FIXME optimize | |
473 if(block[n][ st[n][i] ]) break; | |
474 s->block_last_index[n]= i; | |
475 | |
476 score += get_block_rate(s, block[n], s->block_last_index[n], st[n]); | |
477 } | |
478 | |
10797
ab1844655871
Move restore_ac_coeffs() call into decode_ac_pred().
michael
parents:
10796
diff
changeset
|
479 if(score < 0){ |
ab1844655871
Move restore_ac_coeffs() call into decode_ac_pred().
michael
parents:
10796
diff
changeset
|
480 return 1; |
ab1844655871
Move restore_ac_coeffs() call into decode_ac_pred().
michael
parents:
10796
diff
changeset
|
481 }else{ |
ab1844655871
Move restore_ac_coeffs() call into decode_ac_pred().
michael
parents:
10796
diff
changeset
|
482 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
|
483 return 0; |
ab1844655871
Move restore_ac_coeffs() call into decode_ac_pred().
michael
parents:
10796
diff
changeset
|
484 } |
1492 | 485 } |
486 | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
487 /** |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
488 * 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
|
489 */ |
695 | 490 void ff_clean_h263_qscales(MpegEncContext *s){ |
690
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
491 int i; |
903 | 492 int8_t * const qscale_table= s->current_picture.qscale_table; |
2967 | 493 |
4316 | 494 ff_init_qscale_tab(s); |
495 | |
690
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
496 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
|
497 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
|
498 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
|
499 } |
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
500 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
|
501 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
|
502 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
|
503 } |
1983 | 504 |
505 if(s->codec_id != CODEC_ID_H263P){ | |
506 for(i=1; i<s->mb_num; i++){ | |
507 int mb_xy= s->mb_index2xy[i]; | |
2967 | 508 |
1983 | 509 if(qscale_table[mb_xy] != qscale_table[s->mb_index2xy[i-1]] && (s->mb_type[mb_xy]&CANDIDATE_MB_TYPE_INTER4V)){ |
510 s->mb_type[mb_xy]|= CANDIDATE_MB_TYPE_INTER; | |
511 } | |
512 } | |
513 } | |
695 | 514 } |
515 | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
516 /** |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
517 * 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
|
518 */ |
695 | 519 void ff_clean_mpeg4_qscales(MpegEncContext *s){ |
520 int i; | |
903 | 521 int8_t * const qscale_table= s->current_picture.qscale_table; |
522 | |
695 | 523 ff_clean_h263_qscales(s); |
2967 | 524 |
6481 | 525 if(s->pict_type== FF_B_TYPE){ |
690
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
526 int odd=0; |
2646
c735e3e60ca7
Even More spelling errors. patch by (Kevin Baragona <kevinmb500 gawab com)
michael
parents:
2639
diff
changeset
|
527 /* ok, come on, this isn't funny anymore, there's more code for handling this mpeg4 mess than for the actual adaptive quantization */ |
2967 | 528 |
690
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
529 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
|
530 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
|
531 odd += qscale_table[mb_xy]&1; |
690
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
532 } |
2967 | 533 |
690
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
534 if(2*odd > s->mb_num) odd=1; |
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
535 else odd=0; |
2967 | 536 |
690
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
537 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
|
538 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
|
539 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
|
540 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
|
541 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
|
542 qscale_table[mb_xy]= 31; |
2967 | 543 } |
544 | |
690
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
545 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
|
546 int mb_xy= s->mb_index2xy[i]; |
1708 | 547 if(qscale_table[mb_xy] != qscale_table[s->mb_index2xy[i-1]] && (s->mb_type[mb_xy]&CANDIDATE_MB_TYPE_DIRECT)){ |
548 s->mb_type[mb_xy]|= CANDIDATE_MB_TYPE_BIDIR; | |
690
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
549 } |
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
550 } |
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
551 } |
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
552 } |
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
553 |
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
|
554 #endif //CONFIG_ENCODERS |
3247 | 555 |
8042 | 556 #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
|
557 #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
|
558 |
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
|
559 void ff_mpeg4_init_direct_mv(MpegEncContext *s){ |
3247 | 560 int i; |
561 for(i=0; i<tab_size; i++){ | |
562 s->direct_scale_mv[0][i] = (i-tab_bias)*s->pb_time/s->pp_time; | |
563 s->direct_scale_mv[1][i] = (i-tab_bias)*(s->pb_time-s->pp_time)/s->pp_time; | |
564 } | |
565 } | |
566 | |
567 static inline void ff_mpeg4_set_one_direct_mv(MpegEncContext *s, int mx, int my, int i){ | |
568 int xy= s->block_index[i]; | |
569 uint16_t time_pp= s->pp_time; | |
570 uint16_t time_pb= s->pb_time; | |
571 int p_mx, p_my; | |
572 | |
573 p_mx= s->next_picture.motion_val[0][xy][0]; | |
574 if((unsigned)(p_mx + tab_bias) < tab_size){ | |
575 s->mv[0][i][0] = s->direct_scale_mv[0][p_mx + tab_bias] + mx; | |
576 s->mv[1][i][0] = mx ? s->mv[0][i][0] - p_mx | |
577 : s->direct_scale_mv[1][p_mx + tab_bias]; | |
578 }else{ | |
579 s->mv[0][i][0] = p_mx*time_pb/time_pp + mx; | |
580 s->mv[1][i][0] = mx ? s->mv[0][i][0] - p_mx | |
581 : p_mx*(time_pb - time_pp)/time_pp; | |
582 } | |
583 p_my= s->next_picture.motion_val[0][xy][1]; | |
584 if((unsigned)(p_my + tab_bias) < tab_size){ | |
585 s->mv[0][i][1] = s->direct_scale_mv[0][p_my + tab_bias] + my; | |
586 s->mv[1][i][1] = my ? s->mv[0][i][1] - p_my | |
587 : s->direct_scale_mv[1][p_my + tab_bias]; | |
588 }else{ | |
589 s->mv[0][i][1] = p_my*time_pb/time_pp + my; | |
590 s->mv[1][i][1] = my ? s->mv[0][i][1] - p_my | |
591 : p_my*(time_pb - time_pp)/time_pp; | |
592 } | |
593 } | |
594 | |
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
|
595 #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
|
596 #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
|
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 /** |
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
|
599 * |
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
|
600 * @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
|
601 */ |
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
|
602 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
|
603 const int mb_index= s->mb_x + s->mb_y*s->mb_stride; |
1708 | 604 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
|
605 uint16_t time_pp; |
fb240cb99bcf
Remove useless init from ff_mpeg4_set_direct_mv() found by CSA.
michael
parents:
9481
diff
changeset
|
606 uint16_t time_pb; |
936 | 607 int i; |
2967 | 608 |
936 | 609 //FIXME avoid divides |
3247 | 610 // try special case with shifts for 1 and 3 B-frames? |
2967 | 611 |
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
|
612 if(IS_8X8(colocated_mb_type)){ |
936 | 613 s->mv_type = MV_TYPE_8X8; |
614 for(i=0; i<4; i++){ | |
3247 | 615 ff_mpeg4_set_one_direct_mv(s, mx, my, i); |
936 | 616 } |
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
|
617 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
|
618 } else if(IS_INTERLACED(colocated_mb_type)){ |
936 | 619 s->mv_type = MV_TYPE_FIELD; |
620 for(i=0; i<2; i++){ | |
1948 | 621 int field_select= s->next_picture.ref_index[0][s->block_index[2*i]]; |
3205 | 622 s->field_select[0][i]= field_select; |
623 s->field_select[1][i]= i; | |
936 | 624 if(s->top_field_first){ |
1948 | 625 time_pp= s->pp_field_time - field_select + i; |
626 time_pb= s->pb_field_time - field_select + i; | |
936 | 627 }else{ |
1948 | 628 time_pp= s->pp_field_time + field_select - i; |
629 time_pb= s->pb_field_time + field_select - i; | |
936 | 630 } |
1708 | 631 s->mv[0][i][0] = s->p_field_mv_table[i][0][mb_index][0]*time_pb/time_pp + mx; |
632 s->mv[0][i][1] = s->p_field_mv_table[i][0][mb_index][1]*time_pb/time_pp + my; | |
633 s->mv[1][i][0] = mx ? s->mv[0][i][0] - s->p_field_mv_table[i][0][mb_index][0] | |
634 : s->p_field_mv_table[i][0][mb_index][0]*(time_pb - time_pp)/time_pp; | |
2967 | 635 s->mv[1][i][1] = my ? s->mv[0][i][1] - s->p_field_mv_table[i][0][mb_index][1] |
1708 | 636 : s->p_field_mv_table[i][0][mb_index][1]*(time_pb - time_pp)/time_pp; |
936 | 637 } |
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
|
638 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
|
639 }else{ |
3247 | 640 ff_mpeg4_set_one_direct_mv(s, mx, my, 0); |
641 s->mv[0][1][0] = s->mv[0][2][0] = s->mv[0][3][0] = s->mv[0][0][0]; | |
642 s->mv[0][1][1] = s->mv[0][2][1] = s->mv[0][3][1] = s->mv[0][0][1]; | |
643 s->mv[1][1][0] = s->mv[1][2][0] = s->mv[1][3][0] = s->mv[1][0][0]; | |
644 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
|
645 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
|
646 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
|
647 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
|
648 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
|
649 return MB_TYPE_DIRECT2 | MB_TYPE_16x16 | MB_TYPE_L0L1; //Note see prev line |
936 | 650 } |
651 } | |
652 | |
1389 | 653 void ff_h263_update_motion_val(MpegEncContext * s){ |
654 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
|
655 //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
|
656 const int wrap = s->b8_stride; |
1389 | 657 const int xy = s->block_index[0]; |
2967 | 658 |
659 s->current_picture.mbskip_table[mb_xy]= s->mb_skipped; | |
1389 | 660 |
661 if(s->mv_type != MV_TYPE_8X8){ | |
662 int motion_x, motion_y; | |
663 if (s->mb_intra) { | |
664 motion_x = 0; | |
665 motion_y = 0; | |
666 } else if (s->mv_type == MV_TYPE_16X16) { | |
667 motion_x = s->mv[0][0][0]; | |
668 motion_y = s->mv[0][0][1]; | |
669 } else /*if (s->mv_type == MV_TYPE_FIELD)*/ { | |
670 int i; | |
671 motion_x = s->mv[0][0][0] + s->mv[0][1][0]; | |
672 motion_y = s->mv[0][0][1] + s->mv[0][1][1]; | |
673 motion_x = (motion_x>>1) | (motion_x&1); | |
674 for(i=0; i<2; i++){ | |
1708 | 675 s->p_field_mv_table[i][0][mb_xy][0]= s->mv[0][i][0]; |
676 s->p_field_mv_table[i][0][mb_xy][1]= s->mv[0][i][1]; | |
1389 | 677 } |
1948 | 678 s->current_picture.ref_index[0][xy ]= |
679 s->current_picture.ref_index[0][xy + 1]= s->field_select[0][0]; | |
680 s->current_picture.ref_index[0][xy + wrap ]= | |
681 s->current_picture.ref_index[0][xy + wrap + 1]= s->field_select[0][1]; | |
1389 | 682 } |
1948 | 683 |
1389 | 684 /* 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
|
685 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
|
686 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
|
687 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
|
688 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
|
689 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
|
690 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
|
691 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
|
692 s->current_picture.motion_val[0][xy + 1 + wrap][1] = motion_y; |
1389 | 693 } |
694 | |
695 if(s->encoding){ //FIXME encoding MUST be cleaned up | |
2967 | 696 if (s->mv_type == MV_TYPE_8X8) |
1389 | 697 s->current_picture.mb_type[mb_xy]= MB_TYPE_L0 | MB_TYPE_8x8; |
1633 | 698 else if(s->mb_intra) |
699 s->current_picture.mb_type[mb_xy]= MB_TYPE_INTRA; | |
1389 | 700 else |
701 s->current_picture.mb_type[mb_xy]= MB_TYPE_L0 | MB_TYPE_16x16; | |
702 } | |
703 } | |
704 | |
10754
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
705 /** |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
706 * predicts the dc. |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
707 * encoding quantized level -> quantized diff |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
708 * decoding quantized diff -> quantized level |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
709 * @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
|
710 * @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
|
711 */ |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
712 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
|
713 { |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
714 int a, b, c, wrap, pred, scale, ret; |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
715 int16_t *dc_val; |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
716 |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
717 /* find prediction */ |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
718 if (n < 4) { |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
719 scale = s->y_dc_scale; |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
720 } else { |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
721 scale = s->c_dc_scale; |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
722 } |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
723 if(IS_3IV1) |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
724 scale= 8; |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
725 |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
726 wrap= s->block_wrap[n]; |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
727 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
|
728 |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
729 /* B C |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
730 * A X |
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 a = dc_val[ - 1]; |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
733 b = dc_val[ - 1 - wrap]; |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
734 c = dc_val[ - wrap]; |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
735 |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
736 /* 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
|
737 if(s->first_slice_line && n!=3){ |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
738 if(n!=2) b=c= 1024; |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
739 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
|
740 } |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
741 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
|
742 if(n==0 || n==4 || n==5) |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
743 b=1024; |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
744 } |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
745 |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
746 if (abs(a - b) < abs(b - c)) { |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
747 pred = c; |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
748 *dir_ptr = 1; /* top */ |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
749 } else { |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
750 pred = a; |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
751 *dir_ptr = 0; /* left */ |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
752 } |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
753 /* we assume pred is positive */ |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
754 pred = FASTDIV((pred + (scale >> 1)), scale); |
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 if(encoding){ |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
757 ret = level - pred; |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
758 }else{ |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
759 level += pred; |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
760 ret= level; |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
761 if(s->error_recognition>=3){ |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
762 if(level<0){ |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
763 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
|
764 return -1; |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
765 } |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
766 if(level*scale > 2048 + scale){ |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
767 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
|
768 return -1; |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
769 } |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
770 } |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
771 } |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
772 level *=scale; |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
773 if(level&(~2047)){ |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
774 if(level<0) |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
775 level=0; |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
776 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
|
777 level=2047; |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
778 } |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
779 dc_val[0]= level; |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
780 |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
781 return ret; |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
782 } |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
783 |
8590 | 784 #if CONFIG_ENCODERS |
1490
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
785 |
10755
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 * encodes the dc value. |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
788 * @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
|
789 */ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
790 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
|
791 { |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
792 #if 1 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
793 level+=256; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
794 if (n < 4) { |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
795 /* luminance */ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
796 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
|
797 } else { |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
798 /* chrominance */ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
799 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
|
800 } |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
801 #else |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
802 int size, v; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
803 /* find number of bits */ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
804 size = 0; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
805 v = abs(level); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
806 while (v) { |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
807 v >>= 1; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
808 size++; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
809 } |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
810 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
811 if (n < 4) { |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
812 /* luminance */ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
813 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
|
814 } else { |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
815 /* chrominance */ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
816 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
|
817 } |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
818 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
819 /* encode remaining bits */ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
820 if (size > 0) { |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
821 if (level < 0) |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
822 level = (-level) ^ ((1 << size) - 1); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
823 put_bits(&s->pb, size, level); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
824 if (size > 8) |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
825 put_bits(&s->pb, 1, 1); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
826 } |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
827 #endif |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
828 } |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
829 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
830 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
|
831 if (n < 4) { |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
832 return uni_DCtab_lum_len[level + 256]; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
833 } else { |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
834 return uni_DCtab_chrom_len[level + 256]; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
835 } |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
836 } |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
837 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
838 /** |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
839 * encodes a 8x8 block |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
840 * @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
|
841 */ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
842 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
|
843 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
|
844 { |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
845 int i, last_non_zero; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
846 #if 0 //variables for the outcommented version |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
847 int code, sign, last; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
848 #endif |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
849 const RLTable *rl; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
850 uint32_t *bits_tab; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
851 uint8_t *len_tab; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
852 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
|
853 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
854 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
|
855 /* mpeg4 based DC predictor */ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
856 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
|
857 if(last_index<1) return; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
858 i = 1; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
859 rl = &rl_intra; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
860 bits_tab= uni_mpeg4_intra_rl_bits; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
861 len_tab = uni_mpeg4_intra_rl_len; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
862 } else { |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
863 if(last_index<0) return; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
864 i = 0; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
865 rl = &rl_inter; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
866 bits_tab= uni_mpeg4_inter_rl_bits; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
867 len_tab = uni_mpeg4_inter_rl_len; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
868 } |
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 /* AC coefs */ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
871 last_non_zero = i - 1; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
872 #if 1 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
873 for (; i < last_index; i++) { |
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 if (level) { |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
876 int run = i - last_non_zero - 1; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
877 level+=64; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
878 if((level&(~127)) == 0){ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
879 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
|
880 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
|
881 }else{ //ESC3 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
882 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
|
883 } |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
884 last_non_zero = i; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
885 } |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
886 } |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
887 /*if(i<=last_index)*/{ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
888 int level = block[ scan_table[i] ]; |
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 level+=64; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
891 if((level&(~127)) == 0){ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
892 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
|
893 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
|
894 }else{ //ESC3 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
895 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
|
896 } |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
897 } |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
898 #else |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
899 for (; i <= last_index; i++) { |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
900 const int slevel = block[ scan_table[i] ]; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
901 if (slevel) { |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
902 int level; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
903 int run = i - last_non_zero - 1; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
904 last = (i == last_index); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
905 sign = 0; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
906 level = slevel; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
907 if (level < 0) { |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
908 sign = 1; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
909 level = -level; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
910 } |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
911 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
|
912 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
|
913 if (code == rl->n) { |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
914 int level1, run1; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
915 level1 = level - rl->max_level[last][run]; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
916 if (level1 < 1) |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
917 goto esc2; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
918 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
|
919 if (code == rl->n) { |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
920 esc2: |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
921 put_bits(ac_pb, 1, 1); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
922 if (level > MAX_LEVEL) |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
923 goto esc3; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
924 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
|
925 if (run1 < 0) |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
926 goto esc3; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
927 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
|
928 if (code == rl->n) { |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
929 esc3: |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
930 /* third escape */ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
931 put_bits(ac_pb, 1, 1); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
932 put_bits(ac_pb, 1, last); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
933 put_bits(ac_pb, 6, run); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
934 put_bits(ac_pb, 1, 1); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
935 put_sbits(ac_pb, 12, slevel); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
936 put_bits(ac_pb, 1, 1); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
937 } else { |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
938 /* second escape */ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
939 put_bits(ac_pb, 1, 0); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
940 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
|
941 put_bits(ac_pb, 1, sign); |
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 } else { |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
944 /* first escape */ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
945 put_bits(ac_pb, 1, 0); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
946 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
|
947 put_bits(ac_pb, 1, sign); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
948 } |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
949 } else { |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
950 put_bits(ac_pb, 1, sign); |
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 last_non_zero = i; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
953 } |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
954 } |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
955 #endif |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
956 } |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
957 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
958 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
|
959 uint8_t *scan_table) |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
960 { |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
961 int i, last_non_zero; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
962 uint8_t *len_tab; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
963 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
|
964 int len=0; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
965 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
966 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
|
967 /* mpeg4 based DC predictor */ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
968 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
|
969 if(last_index<1) return len; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
970 i = 1; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
971 len_tab = uni_mpeg4_intra_rl_len; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
972 } else { |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
973 if(last_index<0) return 0; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
974 i = 0; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
975 len_tab = uni_mpeg4_inter_rl_len; |
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 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
978 /* AC coefs */ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
979 last_non_zero = i - 1; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
980 for (; i < last_index; i++) { |
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 if (level) { |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
983 int run = i - last_non_zero - 1; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
984 level+=64; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
985 if((level&(~127)) == 0){ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
986 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
|
987 len += len_tab[index]; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
988 }else{ //ESC3 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
989 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
|
990 } |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
991 last_non_zero = i; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
992 } |
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 /*if(i<=last_index)*/{ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
995 int level = block[ scan_table[i] ]; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
996 int run = i - last_non_zero - 1; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
997 level+=64; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
998 if((level&(~127)) == 0){ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
999 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
|
1000 len += len_tab[index]; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
1001 }else{ //ESC3 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
1002 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
|
1003 } |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
1004 } |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
1005 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
1006 return len; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
1007 } |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
1008 |
2502 | 1009 static inline int h263_get_motion_length(MpegEncContext * s, int val, int f_code){ |
1010 int l, bit_size, code; | |
1011 | |
1012 if (val == 0) { | |
1013 return mvtab[0][1]; | |
1014 } else { | |
1015 bit_size = f_code - 1; | |
1016 /* modulo encoding */ | |
1017 l= INT_BIT - 6 - bit_size; | |
1018 val = (val<<l)>>l; | |
1019 val--; | |
1020 code = (val >> bit_size) + 1; | |
1021 | |
1022 return mvtab[code][1] + 1 + bit_size; | |
1023 } | |
1024 } | |
1025 | |
1026 static inline void ff_h263_encode_motion_vector(MpegEncContext * s, int x, int y, int f_code){ | |
1027 if(s->flags2 & CODEC_FLAG2_NO_OUTPUT){ | |
2967 | 1028 skip_put_bits(&s->pb, |
2502 | 1029 h263_get_motion_length(s, x, f_code) |
1030 +h263_get_motion_length(s, y, f_code)); | |
1031 }else{ | |
1032 ff_h263_encode_motion(s, x, f_code); | |
1033 ff_h263_encode_motion(s, y, f_code); | |
1034 } | |
1035 } | |
1036 | |
1490
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1037 static inline int get_p_cbp(MpegEncContext * s, |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1038 DCTELEM block[6][64], |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1039 int motion_x, int motion_y){ |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1040 int cbp, i; |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1041 |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1042 if(s->flags & CODEC_FLAG_CBP_RD){ |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1043 int best_cbpy_score= INT_MAX; |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1044 int best_cbpc_score= INT_MAX; |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
1045 int cbpc = (-1), cbpy= (-1); |
1490
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1046 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
|
1047 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
|
1048 |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1049 for(i=0; i<4; i++){ |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1050 int score= inter_MCBPC_bits[i + offset] * lambda; |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1051 if(i&1) score += s->coded_score[5]; |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1052 if(i&2) score += s->coded_score[4]; |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1053 |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1054 if(score < best_cbpc_score){ |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1055 best_cbpc_score= score; |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1056 cbpc= i; |
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 } |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1059 |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1060 for(i=0; i<16; i++){ |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1061 int score= cbpy_tab[i ^ 0xF][1] * lambda; |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1062 if(i&1) score += s->coded_score[3]; |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1063 if(i&2) score += s->coded_score[2]; |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1064 if(i&4) score += s->coded_score[1]; |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1065 if(i&8) score += s->coded_score[0]; |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1066 |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1067 if(score < best_cbpy_score){ |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1068 best_cbpy_score= score; |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1069 cbpy= i; |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1070 } |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1071 } |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1072 cbp= cbpc + 4*cbpy; |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1073 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
|
1074 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
|
1075 cbp= 0; |
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 |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1078 for (i = 0; i < 6; i++) { |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1079 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
|
1080 s->block_last_index[i]= -1; |
8288 | 1081 s->dsp.clear_block(s->block[i]); |
1490
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1082 } |
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 }else{ |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1085 cbp= 0; |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1086 for (i = 0; i < 6; i++) { |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1087 if (s->block_last_index[i] >= 0) |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1088 cbp |= 1 << (5 - i); |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1089 } |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1090 } |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1091 return cbp; |
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 |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1094 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
|
1095 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
|
1096 int cbp=0, i; |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1097 |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1098 if(s->flags & CODEC_FLAG_CBP_RD){ |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1099 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
|
1100 const int lambda= s->lambda2 >> (FF_LAMBDA_SHIFT - 6); |
2967 | 1101 |
1490
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1102 for(i=0; i<6; i++){ |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1103 if(s->coded_score[i] < 0){ |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1104 score += s->coded_score[i]; |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1105 cbp |= 1 << (5 - i); |
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 } |
2967 | 1108 |
1490
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1109 if(cbp){ |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1110 int zero_score= -6; |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1111 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
|
1112 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
|
1113 } |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1114 |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1115 zero_score*= lambda; |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1116 if(zero_score <= score){ |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1117 cbp=0; |
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 } |
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 for (i = 0; i < 6; i++) { |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1122 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
|
1123 s->block_last_index[i]= -1; |
8288 | 1124 s->dsp.clear_block(s->block[i]); |
1490
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1125 } |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1126 } |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1127 }else{ |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1128 for (i = 0; i < 6; i++) { |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1129 if (s->block_last_index[i] >= 0) |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1130 cbp |= 1 << (5 - i); |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1131 } |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1132 } |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1133 return cbp; |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1134 } |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1135 |
2967 | 1136 static inline void mpeg4_encode_blocks(MpegEncContext * s, DCTELEM block[6][64], int intra_dc[6], |
2502 | 1137 uint8_t **scan_table, PutBitContext *dc_pb, PutBitContext *ac_pb){ |
1138 int i; | |
2967 | 1139 |
2502 | 1140 if(scan_table){ |
1141 if(s->flags2 & CODEC_FLAG2_NO_OUTPUT){ | |
1142 for (i = 0; i < 6; i++) { | |
1143 skip_put_bits(&s->pb, mpeg4_get_block_length(s, block[i], i, intra_dc[i], scan_table[i])); | |
1144 } | |
1145 }else{ | |
1146 /* encode each block */ | |
1147 for (i = 0; i < 6; i++) { | |
1148 mpeg4_encode_block(s, block[i], i, intra_dc[i], scan_table[i], dc_pb, ac_pb); | |
1149 } | |
1150 } | |
1151 }else{ | |
1152 if(s->flags2 & CODEC_FLAG2_NO_OUTPUT){ | |
1153 for (i = 0; i < 6; i++) { | |
1154 skip_put_bits(&s->pb, mpeg4_get_block_length(s, block[i], i, 0, s->intra_scantable.permutated)); | |
1155 } | |
1156 }else{ | |
1157 /* encode each block */ | |
1158 for (i = 0; i < 6; i++) { | |
1159 mpeg4_encode_block(s, block[i], i, 0, s->intra_scantable.permutated, dc_pb, ac_pb); | |
1160 } | |
1161 } | |
1162 } | |
1163 } | |
1164 | |
8644 | 1165 static const int dquant_code[5]= {1,0,9,2,3}; |
1166 | |
265
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
1167 void mpeg4_encode_mb(MpegEncContext * s, |
2979 | 1168 DCTELEM block[6][64], |
1169 int motion_x, int motion_y) | |
265
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
1170 { |
1057 | 1171 int cbpc, cbpy, pred_x, pred_y; |
453 | 1172 PutBitContext * const pb2 = s->data_partitioning ? &s->pb2 : &s->pb; |
6481 | 1173 PutBitContext * const tex_pb = s->data_partitioning && s->pict_type!=FF_B_TYPE ? &s->tex_pb : &s->pb; |
1174 PutBitContext * const dc_pb = s->data_partitioning && s->pict_type!=FF_I_TYPE ? &s->pb2 : &s->pb; | |
453 | 1175 const int interleaved_stats= (s->flags&CODEC_FLAG_PASS1) && !s->data_partitioning ? 1 : 0; |
2967 | 1176 |
265
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
1177 if (!s->mb_intra) { |
1490
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1178 int i, cbp; |
2967 | 1179 |
6481 | 1180 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
|
1181 static const int mb_type_table[8]= {-1, 3, 2, 1,-1,-1,-1, 0}; /* convert from mv_dir to type */ |
324 | 1182 int mb_type= mb_type_table[s->mv_dir]; |
1708 | 1183 |
324 | 1184 if(s->mb_x==0){ |
1708 | 1185 for(i=0; i<2; i++){ |
2967 | 1186 s->last_mv[i][0][0]= |
1187 s->last_mv[i][0][1]= | |
1188 s->last_mv[i][1][0]= | |
1708 | 1189 s->last_mv[i][1][1]= 0; |
1190 } | |
324 | 1191 } |
2967 | 1192 |
690
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
1193 assert(s->dquant>=-2 && s->dquant<=2); |
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
1194 assert((s->dquant&1)==0); |
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
1195 assert(mb_type>=0); |
265
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
1196 |
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
|
1197 /* 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
|
1198 if(s->next_picture.mbskip_table[s->mb_y * s->mb_stride + s->mb_x]){ //FIXME avoid DCT & ... |
324 | 1199 s->skip_count++; |
2967 | 1200 s->mv[0][0][0]= |
1201 s->mv[0][0][1]= | |
1202 s->mv[1][0][0]= | |
324 | 1203 s->mv[1][0][1]= 0; |
2646
c735e3e60ca7
Even More spelling errors. patch by (Kevin Baragona <kevinmb500 gawab com)
michael
parents:
2639
diff
changeset
|
1204 s->mv_dir= MV_DIR_FORWARD; //doesn't matter |
690
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
1205 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
|
1206 // s->mb_skipped=1; |
903 | 1207 |
324 | 1208 return; |
1209 } | |
2967 | 1210 |
1490
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1211 cbp= get_b_cbp(s, block, motion_x, motion_y, mb_type); |
2967 | 1212 |
324 | 1213 if ((cbp | motion_x | motion_y | mb_type) ==0) { |
1214 /* direct MB with MV={0,0} */ | |
690
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
1215 assert(s->dquant==0); |
2967 | 1216 |
324 | 1217 put_bits(&s->pb, 1, 1); /* mb not coded modb1=1 */ |
453 | 1218 |
1219 if(interleaved_stats){ | |
1220 s->misc_bits++; | |
1221 s->last_bits++; | |
1222 } | |
324 | 1223 s->skip_count++; |
1224 return; | |
1225 } | |
2967 | 1226 |
2979 | 1227 put_bits(&s->pb, 1, 0); /* mb coded modb1=0 */ |
324 | 1228 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
|
1229 put_bits(&s->pb, mb_type+1, 1); // this table is so simple that we don't need it :) |
324 | 1230 if(cbp) put_bits(&s->pb, 6, cbp); |
2967 | 1231 |
690
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
1232 if(cbp && mb_type){ |
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
1233 if(s->dquant) |
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
1234 put_bits(&s->pb, 2, (s->dquant>>2)+3); |
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
1235 else |
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
1236 put_bits(&s->pb, 1, 0); |
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
1237 }else |
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
1238 s->qscale -= s->dquant; |
2967 | 1239 |
697 | 1240 if(!s->progressive_sequence){ |
1241 if(cbp) | |
1242 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
|
1243 if(mb_type) // not direct mode |
1708 | 1244 put_bits(&s->pb, 1, s->mv_type == MV_TYPE_FIELD); |
697 | 1245 } |
265
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
1246 |
453 | 1247 if(interleaved_stats){ |
1164 | 1248 s->misc_bits+= get_bits_diff(s); |
453 | 1249 } |
295 | 1250 |
1708 | 1251 if(mb_type == 0){ |
1252 assert(s->mv_dir & MV_DIRECT); | |
2502 | 1253 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
|
1254 s->b_count++; |
e47fa3e3f2d5
statistics for forw & back p-MBs instead of just one counter for both
michaelni
parents:
654
diff
changeset
|
1255 s->f_count++; |
1708 | 1256 }else{ |
1257 assert(mb_type > 0 && mb_type < 4); | |
1258 if(s->mv_type != MV_TYPE_FIELD){ | |
1259 if(s->mv_dir & MV_DIR_FORWARD){ | |
2502 | 1260 ff_h263_encode_motion_vector(s, s->mv[0][0][0] - s->last_mv[0][0][0], |
1261 s->mv[0][0][1] - s->last_mv[0][0][1], s->f_code); | |
1708 | 1262 s->last_mv[0][0][0]= s->last_mv[0][1][0]= s->mv[0][0][0]; |
1263 s->last_mv[0][0][1]= s->last_mv[0][1][1]= s->mv[0][0][1]; | |
1264 s->f_count++; | |
1265 } | |
1266 if(s->mv_dir & MV_DIR_BACKWARD){ | |
2502 | 1267 ff_h263_encode_motion_vector(s, s->mv[1][0][0] - s->last_mv[1][0][0], |
1268 s->mv[1][0][1] - s->last_mv[1][0][1], s->b_code); | |
1708 | 1269 s->last_mv[1][0][0]= s->last_mv[1][1][0]= s->mv[1][0][0]; |
1270 s->last_mv[1][0][1]= s->last_mv[1][1][1]= s->mv[1][0][1]; | |
1271 s->b_count++; | |
1272 } | |
1273 }else{ | |
1274 if(s->mv_dir & MV_DIR_FORWARD){ | |
1275 put_bits(&s->pb, 1, s->field_select[0][0]); | |
1276 put_bits(&s->pb, 1, s->field_select[0][1]); | |
1277 } | |
1278 if(s->mv_dir & MV_DIR_BACKWARD){ | |
1279 put_bits(&s->pb, 1, s->field_select[1][0]); | |
1280 put_bits(&s->pb, 1, s->field_select[1][1]); | |
1281 } | |
1282 if(s->mv_dir & MV_DIR_FORWARD){ | |
1283 for(i=0; i<2; i++){ | |
2502 | 1284 ff_h263_encode_motion_vector(s, s->mv[0][i][0] - s->last_mv[0][i][0] , |
1285 s->mv[0][i][1] - s->last_mv[0][i][1]/2, s->f_code); | |
1708 | 1286 s->last_mv[0][i][0]= s->mv[0][i][0]; |
1287 s->last_mv[0][i][1]= s->mv[0][i][1]*2; | |
1288 } | |
1289 s->f_count++; | |
1290 } | |
1291 if(s->mv_dir & MV_DIR_BACKWARD){ | |
1292 for(i=0; i<2; i++){ | |
2502 | 1293 ff_h263_encode_motion_vector(s, s->mv[1][i][0] - s->last_mv[1][i][0] , |
1294 s->mv[1][i][1] - s->last_mv[1][i][1]/2, s->b_code); | |
1708 | 1295 s->last_mv[1][i][0]= s->mv[1][i][0]; |
1296 s->last_mv[1][i][1]= s->mv[1][i][1]*2; | |
1297 } | |
1298 s->b_count++; | |
1299 } | |
1300 } | |
324 | 1301 } |
453 | 1302 |
1303 if(interleaved_stats){ | |
1164 | 1304 s->mv_bits+= get_bits_diff(s); |
453 | 1305 } |
295 | 1306 |
2502 | 1307 mpeg4_encode_blocks(s, block, NULL, NULL, NULL, &s->pb); |
453 | 1308 |
1309 if(interleaved_stats){ | |
1164 | 1310 s->p_tex_bits+= get_bits_diff(s); |
453 | 1311 } |
1708 | 1312 |
6481 | 1313 }else{ /* s->pict_type==FF_B_TYPE */ |
1490
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1314 cbp= get_p_cbp(s, block, motion_x, motion_y); |
2967 | 1315 |
690
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
1316 if ((cbp | motion_x | motion_y | s->dquant) == 0 && s->mv_type==MV_TYPE_16X16) { |
2967 | 1317 /* 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
|
1318 why didn't they just compress the skip-mb bits instead of reusing them ?! */ |
331 | 1319 if(s->max_b_frames>0){ |
1320 int i; | |
364
6b6332e7008a
segfault fix for b-frame encoding with height%16!=0
michaelni
parents:
360
diff
changeset
|
1321 int x,y, offset; |
6b6332e7008a
segfault fix for b-frame encoding with height%16!=0
michaelni
parents:
360
diff
changeset
|
1322 uint8_t *p_pic; |
6b6332e7008a
segfault fix for b-frame encoding with height%16!=0
michaelni
parents:
360
diff
changeset
|
1323 |
6b6332e7008a
segfault fix for b-frame encoding with height%16!=0
michaelni
parents:
360
diff
changeset
|
1324 x= s->mb_x*16; |
6b6332e7008a
segfault fix for b-frame encoding with height%16!=0
michaelni
parents:
360
diff
changeset
|
1325 y= s->mb_y*16; |
6b6332e7008a
segfault fix for b-frame encoding with height%16!=0
michaelni
parents:
360
diff
changeset
|
1326 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
|
1327 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
|
1328 |
6b6332e7008a
segfault fix for b-frame encoding with height%16!=0
michaelni
parents:
360
diff
changeset
|
1329 offset= x + y*s->linesize; |
903 | 1330 p_pic= s->new_picture.data[0] + offset; |
2967 | 1331 |
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
|
1332 s->mb_skipped=1; |
331 | 1333 for(i=0; i<s->max_b_frames; i++){ |
339 | 1334 uint8_t *b_pic; |
1335 int diff; | |
903 | 1336 Picture *pic= s->reordered_input_picture[i+1]; |
1337 | |
6481 | 1338 if(pic==NULL || pic->pict_type!=FF_B_TYPE) break; |
903 | 1339 |
3068 | 1340 b_pic= pic->data[0] + offset; |
1341 if(pic->type != FF_BUFFER_TYPE_SHARED) | |
1342 b_pic+= INPLACE_OFFSET; | |
2979 | 1343 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
|
1344 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
|
1345 s->mb_skipped=0; |
331 | 1346 break; |
1347 } | |
1348 } | |
1349 }else | |
2967 | 1350 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
|
1351 |
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
|
1352 if(s->mb_skipped==1){ |
331 | 1353 /* skip macroblock */ |
1354 put_bits(&s->pb, 1, 1); | |
453 | 1355 |
1356 if(interleaved_stats){ | |
1357 s->misc_bits++; | |
1358 s->last_bits++; | |
1359 } | |
331 | 1360 s->skip_count++; |
2967 | 1361 |
331 | 1362 return; |
1363 } | |
295 | 1364 } |
364
6b6332e7008a
segfault fix for b-frame encoding with height%16!=0
michaelni
parents:
360
diff
changeset
|
1365 |
2979 | 1366 put_bits(&s->pb, 1, 0); /* mb coded */ |
1633 | 1367 cbpc = cbp & 3; |
1368 cbpy = cbp >> 2; | |
1369 cbpy ^= 0xf; | |
324 | 1370 if(s->mv_type==MV_TYPE_16X16){ |
690
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
1371 if(s->dquant) cbpc+= 8; |
324 | 1372 put_bits(&s->pb, |
1373 inter_MCBPC_bits[cbpc], | |
1374 inter_MCBPC_code[cbpc]); | |
690
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
1375 |
453 | 1376 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
|
1377 if(s->dquant) |
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
1378 put_bits(pb2, 2, dquant_code[s->dquant+2]); |
697 | 1379 |
1380 if(!s->progressive_sequence){ | |
1381 if(cbp) | |
1382 put_bits(pb2, 1, s->interlaced_dct); | |
1708 | 1383 put_bits(pb2, 1, 0); |
697 | 1384 } |
2967 | 1385 |
453 | 1386 if(interleaved_stats){ |
1164 | 1387 s->misc_bits+= get_bits_diff(s); |
453 | 1388 } |
324 | 1389 |
1390 /* motion vectors: 16x16 mode */ | |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1936
diff
changeset
|
1391 h263_pred_motion(s, 0, 0, &pred_x, &pred_y); |
2967 | 1392 |
2502 | 1393 ff_h263_encode_motion_vector(s, motion_x - pred_x, |
1394 motion_y - pred_y, s->f_code); | |
1708 | 1395 }else if(s->mv_type==MV_TYPE_FIELD){ |
1396 if(s->dquant) cbpc+= 8; | |
1397 put_bits(&s->pb, | |
1398 inter_MCBPC_bits[cbpc], | |
1399 inter_MCBPC_code[cbpc]); | |
1400 | |
1401 put_bits(pb2, cbpy_tab[cbpy][1], cbpy_tab[cbpy][0]); | |
1402 if(s->dquant) | |
1403 put_bits(pb2, 2, dquant_code[s->dquant+2]); | |
1404 | |
1405 assert(!s->progressive_sequence); | |
1406 if(cbp) | |
1407 put_bits(pb2, 1, s->interlaced_dct); | |
1408 put_bits(pb2, 1, 1); | |
2967 | 1409 |
1708 | 1410 if(interleaved_stats){ |
1411 s->misc_bits+= get_bits_diff(s); | |
1412 } | |
1413 | |
1414 /* motion vectors: 16x8 interlaced mode */ | |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1936
diff
changeset
|
1415 h263_pred_motion(s, 0, 0, &pred_x, &pred_y); |
1708 | 1416 pred_y /=2; |
2967 | 1417 |
1708 | 1418 put_bits(&s->pb, 1, s->field_select[0][0]); |
1419 put_bits(&s->pb, 1, s->field_select[0][1]); | |
2967 | 1420 |
2502 | 1421 ff_h263_encode_motion_vector(s, s->mv[0][0][0] - pred_x, |
1422 s->mv[0][0][1] - pred_y, s->f_code); | |
1423 ff_h263_encode_motion_vector(s, s->mv[0][1][0] - pred_x, | |
1424 s->mv[0][1][1] - pred_y, s->f_code); | |
324 | 1425 }else{ |
1708 | 1426 assert(s->mv_type==MV_TYPE_8X8); |
324 | 1427 put_bits(&s->pb, |
1633 | 1428 inter_MCBPC_bits[cbpc+16], |
1429 inter_MCBPC_code[cbpc+16]); | |
453 | 1430 put_bits(pb2, cbpy_tab[cbpy][1], cbpy_tab[cbpy][0]); |
1431 | |
757 | 1432 if(!s->progressive_sequence){ |
1433 if(cbp) | |
1434 put_bits(pb2, 1, s->interlaced_dct); | |
1435 } | |
2967 | 1436 |
453 | 1437 if(interleaved_stats){ |
1164 | 1438 s->misc_bits+= get_bits_diff(s); |
453 | 1439 } |
324 | 1440 |
1441 for(i=0; i<4; i++){ | |
1442 /* motion vectors: 8x8 mode*/ | |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1936
diff
changeset
|
1443 h263_pred_motion(s, i, 0, &pred_x, &pred_y); |
324 | 1444 |
2502 | 1445 ff_h263_encode_motion_vector(s, s->current_picture.motion_val[0][ s->block_index[i] ][0] - pred_x, |
1446 s->current_picture.motion_val[0][ s->block_index[i] ][1] - pred_y, s->f_code); | |
324 | 1447 } |
1448 } | |
453 | 1449 |
2967 | 1450 if(interleaved_stats){ |
1164 | 1451 s->mv_bits+= get_bits_diff(s); |
453 | 1452 } |
324 | 1453 |
2502 | 1454 mpeg4_encode_blocks(s, block, NULL, NULL, NULL, tex_pb); |
453 | 1455 |
1456 if(interleaved_stats){ | |
1164 | 1457 s->p_tex_bits+= get_bits_diff(s); |
453 | 1458 } |
656
e47fa3e3f2d5
statistics for forw & back p-MBs instead of just one counter for both
michaelni
parents:
654
diff
changeset
|
1459 s->f_count++; |
295 | 1460 } |
265
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
1461 } else { |
324 | 1462 int cbp; |
2967 | 1463 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
|
1464 int dir[6]; //prediction direction |
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
1465 int zigzag_last_index[6]; |
2979 | 1466 uint8_t *scan_table[6]; |
1057 | 1467 int i; |
265
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
1468 |
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
1469 for(i=0; i<6; i++){ |
2003 | 1470 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
|
1471 } |
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
1472 |
1492 | 1473 if(s->flags & CODEC_FLAG_AC_PRED){ |
1474 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
|
1475 }else{ |
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
1476 for(i=0; i<6; i++) |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
702
diff
changeset
|
1477 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
|
1478 } |
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
1479 |
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
1480 /* compute cbp */ |
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
1481 cbp = 0; |
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
1482 for (i = 0; i < 6; i++) { |
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
1483 if (s->block_last_index[i] >= 1) |
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
1484 cbp |= 1 << (5 - i); |
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
1485 } |
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
1486 |
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
1487 cbpc = cbp & 3; |
6481 | 1488 if (s->pict_type == FF_I_TYPE) { |
690
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
1489 if(s->dquant) cbpc+=4; |
265
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
1490 put_bits(&s->pb, |
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
1491 intra_MCBPC_bits[cbpc], |
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
1492 intra_MCBPC_code[cbpc]); |
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
1493 } else { |
690
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
1494 if(s->dquant) cbpc+=8; |
2979 | 1495 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
|
1496 put_bits(&s->pb, |
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
1497 inter_MCBPC_bits[cbpc + 4], |
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
1498 inter_MCBPC_code[cbpc + 4]); |
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
1499 } |
453 | 1500 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
|
1501 cbpy = cbp >> 2; |
453 | 1502 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
|
1503 if(s->dquant) |
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
1504 put_bits(dc_pb, 2, dquant_code[s->dquant+2]); |
453 | 1505 |
697 | 1506 if(!s->progressive_sequence){ |
1507 put_bits(dc_pb, 1, s->interlaced_dct); | |
1508 } | |
1509 | |
453 | 1510 if(interleaved_stats){ |
1164 | 1511 s->misc_bits+= get_bits_diff(s); |
453 | 1512 } |
286 | 1513 |
2502 | 1514 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
|
1515 |
453 | 1516 if(interleaved_stats){ |
1164 | 1517 s->i_tex_bits+= get_bits_diff(s); |
453 | 1518 } |
286 | 1519 s->i_count++; |
1520 | |
265
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
1521 /* restore ac coeffs & last_index stuff if we messed them up with the prediction */ |
1492 | 1522 if(s->ac_pred) |
1523 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
|
1524 } |
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
1525 } |
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
1526 |
10752
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1527 /** |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1528 * encodes a 8x8 block. |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1529 * @param block the 8x8 block |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1530 * @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
|
1531 */ |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1532 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
|
1533 { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1534 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
|
1535 RLTable *rl; |
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 rl = &rl_inter; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1538 if (s->mb_intra && !s->h263_aic) { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1539 /* DC coef */ |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1540 level = block[0]; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1541 /* 255 cannot be represented, so we clamp */ |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1542 if (level > 254) { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1543 level = 254; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1544 block[0] = 254; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1545 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1546 /* 0 cannot be represented also */ |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1547 else if (level < 1) { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1548 level = 1; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1549 block[0] = 1; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1550 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1551 if (level == 128) //FIXME check rv10 |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1552 put_bits(&s->pb, 8, 0xff); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1553 else |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1554 put_bits(&s->pb, 8, level); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1555 i = 1; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1556 } else { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1557 i = 0; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1558 if (s->h263_aic && s->mb_intra) |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1559 rl = &rl_intra_aic; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1560 |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1561 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
|
1562 int aic_vlc_bits=0; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1563 int inter_vlc_bits=0; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1564 int wrong_pos=-1; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1565 int aic_code; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1566 |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1567 last_index = s->block_last_index[n]; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1568 last_non_zero = i - 1; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1569 for (; i <= last_index; i++) { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1570 j = s->intra_scantable.permutated[i]; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1571 level = block[j]; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1572 if (level) { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1573 run = i - last_non_zero - 1; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1574 last = (i == last_index); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1575 |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1576 if(level<0) level= -level; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1577 |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1578 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
|
1579 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
|
1580 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
|
1581 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
|
1582 |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1583 if (code == rl->n) { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1584 inter_vlc_bits += 1+6+8-1; |
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 if (aic_code == rl_intra_aic.n) { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1587 aic_vlc_bits += 1+6+8-1; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1588 wrong_pos += run + 1; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1589 }else |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1590 wrong_pos += wrong_run[aic_code]; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1591 last_non_zero = i; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1592 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1593 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1594 i = 0; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1595 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
|
1596 rl = &rl_intra_aic; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1597 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1598 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1599 |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1600 /* AC coefs */ |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1601 last_index = s->block_last_index[n]; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1602 last_non_zero = i - 1; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1603 for (; i <= last_index; i++) { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1604 j = s->intra_scantable.permutated[i]; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1605 level = block[j]; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1606 if (level) { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1607 run = i - last_non_zero - 1; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1608 last = (i == last_index); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1609 sign = 0; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1610 slevel = level; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1611 if (level < 0) { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1612 sign = 1; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1613 level = -level; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1614 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1615 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
|
1616 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
|
1617 if (code == rl->n) { |
10787 | 1618 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
|
1619 put_bits(&s->pb, 1, last); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1620 put_bits(&s->pb, 6, run); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1621 |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1622 assert(slevel != 0); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1623 |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1624 if(level < 128) |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1625 put_sbits(&s->pb, 8, slevel); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1626 else{ |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1627 put_bits(&s->pb, 8, 128); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1628 put_sbits(&s->pb, 5, slevel); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1629 put_sbits(&s->pb, 6, slevel>>5); |
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 }else{ |
10787 | 1632 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
|
1633 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1634 } else { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1635 put_bits(&s->pb, 1, sign); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1636 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1637 last_non_zero = i; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1638 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1639 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1640 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1641 |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1642 /* 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
|
1643 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
|
1644 { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1645 short sval = 0; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1646 short i = 0; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1647 short n_bits = 0; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1648 short temp_val; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1649 int code = 0; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1650 int tcode; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1651 |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1652 if ( val == 0) |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1653 put_bits(&s->pb, 1, 1); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1654 else if (val == 1) |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1655 put_bits(&s->pb, 3, 0); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1656 else if (val == -1) |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1657 put_bits(&s->pb, 3, 2); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1658 else { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1659 |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1660 sval = ((val < 0) ? (short)(-val):(short)val); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1661 temp_val = sval; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1662 |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1663 while (temp_val != 0) { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1664 temp_val = temp_val >> 1; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1665 n_bits++; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1666 } |
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 i = n_bits - 1; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1669 while (i > 0) { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1670 tcode = (sval & (1 << (i-1))) >> (i-1); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1671 tcode = (tcode << 1) | 1; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1672 code = (code << 2) | tcode; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1673 i--; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1674 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1675 code = ((code << 1) | (val < 0)) << 1; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1676 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
|
1677 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1678 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1679 |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1680 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
|
1681 { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1682 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
|
1683 int16_t *dc_val; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1684 |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1685 /* find prediction */ |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1686 if (n < 4) { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1687 x = 2 * s->mb_x + (n & 1); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1688 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
|
1689 wrap = s->b8_stride; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1690 dc_val = s->dc_val[0]; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1691 } else { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1692 x = s->mb_x; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1693 y = s->mb_y; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1694 wrap = s->mb_stride; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1695 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
|
1696 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1697 /* B C |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1698 * A X |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1699 */ |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1700 a = dc_val[(x - 1) + (y) * wrap]; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1701 c = dc_val[(x) + (y - 1) * wrap]; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1702 |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1703 /* No prediction outside GOB boundary */ |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1704 if(s->first_slice_line && n!=3){ |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1705 if(n!=2) c= 1024; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1706 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
|
1707 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1708 /* just DC prediction */ |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1709 if (a != 1024 && c != 1024) |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1710 pred_dc = (a + c) >> 1; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1711 else if (a != 1024) |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1712 pred_dc = a; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1713 else |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1714 pred_dc = c; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1715 |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1716 /* we assume pred is positive */ |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1717 *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
|
1718 return pred_dc; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1719 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1720 |
0 | 1721 void h263_encode_mb(MpegEncContext * s, |
2979 | 1722 DCTELEM block[6][64], |
1723 int motion_x, int motion_y) | |
0 | 1724 { |
1725 int cbpc, cbpy, i, cbp, pred_x, pred_y; | |
1064 | 1726 int16_t pred_dc; |
1727 int16_t rec_intradc[6]; | |
3781 | 1728 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
|
1729 const int interleaved_stats= (s->flags&CODEC_FLAG_PASS1); |
2967 | 1730 |
324 | 1731 if (!s->mb_intra) { |
350
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1732 /* compute cbp */ |
1490
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1733 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
|
1734 |
1789 | 1735 if ((cbp | motion_x | motion_y | s->dquant | (s->mv_type - MV_TYPE_16X16)) == 0) { |
324 | 1736 /* skip macroblock */ |
1737 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
|
1738 if(interleaved_stats){ |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
1739 s->misc_bits++; |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
1740 s->last_bits++; |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
1741 } |
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
|
1742 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
|
1743 |
324 | 1744 return; |
1745 } | |
2979 | 1746 put_bits(&s->pb, 1, 0); /* mb coded */ |
2967 | 1747 |
324 | 1748 cbpc = cbp & 3; |
1637 | 1749 cbpy = cbp >> 2; |
1750 if(s->alt_inter_vlc==0 || cbpc!=3) | |
1751 cbpy ^= 0xF; | |
695 | 1752 if(s->dquant) cbpc+= 8; |
1633 | 1753 if(s->mv_type==MV_TYPE_16X16){ |
1754 put_bits(&s->pb, | |
1755 inter_MCBPC_bits[cbpc], | |
1756 inter_MCBPC_code[cbpc]); | |
1757 | |
1758 put_bits(&s->pb, cbpy_tab[cbpy][1], cbpy_tab[cbpy][0]); | |
1759 if(s->dquant) | |
1760 put_bits(&s->pb, 2, dquant_code[s->dquant+2]); | |
2967 | 1761 |
1633 | 1762 if(interleaved_stats){ |
1763 s->misc_bits+= get_bits_diff(s); | |
1764 } | |
1765 | |
1766 /* motion vectors: 16x16 mode */ | |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1936
diff
changeset
|
1767 h263_pred_motion(s, 0, 0, &pred_x, &pred_y); |
2967 | 1768 |
1769 if (!s->umvplus) { | |
2502 | 1770 ff_h263_encode_motion_vector(s, motion_x - pred_x, |
1771 motion_y - pred_y, 1); | |
1633 | 1772 } |
1773 else { | |
1774 h263p_encode_umotion(s, motion_x - pred_x); | |
1775 h263p_encode_umotion(s, motion_y - pred_y); | |
1776 if (((motion_x - pred_x) == 1) && ((motion_y - pred_y) == 1)) | |
1777 /* To prevent Start Code emulation */ | |
1778 put_bits(&s->pb,1,1); | |
1779 } | |
1780 }else{ | |
1781 put_bits(&s->pb, | |
1782 inter_MCBPC_bits[cbpc+16], | |
1783 inter_MCBPC_code[cbpc+16]); | |
1784 put_bits(&s->pb, cbpy_tab[cbpy][1], cbpy_tab[cbpy][0]); | |
1785 if(s->dquant) | |
1786 put_bits(&s->pb, 2, dquant_code[s->dquant+2]); | |
1787 | |
1788 if(interleaved_stats){ | |
1789 s->misc_bits+= get_bits_diff(s); | |
1790 } | |
1791 | |
1792 for(i=0; i<4; i++){ | |
1793 /* motion vectors: 8x8 mode*/ | |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1936
diff
changeset
|
1794 h263_pred_motion(s, i, 0, &pred_x, &pred_y); |
1633 | 1795 |
1668
30746f429df6
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1666
diff
changeset
|
1796 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
|
1797 motion_y= s->current_picture.motion_val[0][ s->block_index[i] ][1]; |
2967 | 1798 if (!s->umvplus) { |
2502 | 1799 ff_h263_encode_motion_vector(s, motion_x - pred_x, |
1800 motion_y - pred_y, 1); | |
1633 | 1801 } |
1802 else { | |
1803 h263p_encode_umotion(s, motion_x - pred_x); | |
1804 h263p_encode_umotion(s, motion_y - pred_y); | |
1805 if (((motion_x - pred_x) == 1) && ((motion_y - pred_y) == 1)) | |
1806 /* To prevent Start Code emulation */ | |
1807 put_bits(&s->pb,1,1); | |
1808 } | |
1809 } | |
324 | 1810 } |
1353
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
1811 |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
1812 if(interleaved_stats){ |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
1813 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
|
1814 } |
350
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1815 } else { |
1639 | 1816 assert(s->mb_intra); |
2967 | 1817 |
350
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1818 cbp = 0; |
1666 | 1819 if (s->h263_aic) { |
350
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1820 /* Predict DC */ |
1666 | 1821 for(i=0; i<6; i++) { |
1064 | 1822 int16_t level = block[i][0]; |
1666 | 1823 int scale; |
2967 | 1824 |
1666 | 1825 if(i<4) scale= s->y_dc_scale; |
1826 else scale= s->c_dc_scale; | |
1827 | |
350
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1828 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
|
1829 level -= pred_dc; |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1830 /* Quant */ |
1666 | 1831 if (level >= 0) |
1832 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
|
1833 else |
1666 | 1834 level = (level - (scale>>1))/scale; |
2967 | 1835 |
350
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1836 /* AIC can change CBP */ |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1837 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
|
1838 s->block_last_index[i] = -1; |
1666 | 1839 |
1840 if(!s->modified_quant){ | |
1841 if (level < -127) | |
1842 level = -127; | |
1843 else if (level > 127) | |
1844 level = 127; | |
1845 } | |
1846 | |
350
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1847 block[i][0] = level; |
2967 | 1848 /* Reconstruction */ |
1666 | 1849 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
|
1850 /* Oddify */ |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1851 rec_intradc[i] |= 1; |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1852 //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
|
1853 // rec_intradc[i]++; |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1854 /* Clipping */ |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1855 if (rec_intradc[i] < 0) |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1856 rec_intradc[i] = 0; |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1857 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
|
1858 rec_intradc[i] = 2047; |
2967 | 1859 |
350
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1860 /* Update AC/DC tables */ |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1861 *dc_ptr[i] = rec_intradc[i]; |
1666 | 1862 if (s->block_last_index[i] >= 0) |
1863 cbp |= 1 << (5 - i); | |
350
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1864 } |
1666 | 1865 }else{ |
1866 for(i=0; i<6; i++) { | |
1867 /* compute cbp */ | |
1868 if (s->block_last_index[i] >= 1) | |
1869 cbp |= 1 << (5 - i); | |
1870 } | |
350
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1871 } |
0 | 1872 |
350
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1873 cbpc = cbp & 3; |
6481 | 1874 if (s->pict_type == FF_I_TYPE) { |
695 | 1875 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
|
1876 put_bits(&s->pb, |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1877 intra_MCBPC_bits[cbpc], |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1878 intra_MCBPC_code[cbpc]); |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1879 } else { |
695 | 1880 if(s->dquant) cbpc+=8; |
2979 | 1881 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
|
1882 put_bits(&s->pb, |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1883 inter_MCBPC_bits[cbpc + 4], |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1884 inter_MCBPC_code[cbpc + 4]); |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1885 } |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1886 if (s->h263_aic) { |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1887 /* XXX: currently, we do not try to use ac prediction */ |
2979 | 1888 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
|
1889 } |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1890 cbpy = cbp >> 2; |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1891 put_bits(&s->pb, cbpy_tab[cbpy][1], cbpy_tab[cbpy][0]); |
695 | 1892 if(s->dquant) |
1893 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
|
1894 |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
1895 if(interleaved_stats){ |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
1896 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
|
1897 } |
0 | 1898 } |
1899 | |
350
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1900 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
|
1901 /* encode each block */ |
1354 | 1902 h263_encode_block(s, block[i], i); |
2967 | 1903 |
350
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1904 /* Update INTRADC for decoding */ |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1905 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
|
1906 block[i][0] = rec_intradc[i]; |
2967 | 1907 |
350
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1908 } |
0 | 1909 } |
1353
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
1910 |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
1911 if(interleaved_stats){ |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
1912 if (!s->mb_intra) { |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
1913 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
|
1914 s->f_count++; |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
1915 }else{ |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
1916 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
|
1917 s->i_count++; |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
1918 } |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
1919 } |
0 | 1920 } |
815
78accc54493b
put a few large tables under #ifdef CONFIG_ENCODERS or dynamically allocate them
michaelni
parents:
770
diff
changeset
|
1921 #endif |
0 | 1922 |
1656 | 1923 void ff_h263_loop_filter(MpegEncContext * s){ |
1644 | 1924 int qp_c; |
1925 const int linesize = s->linesize; | |
1926 const int uvlinesize= s->uvlinesize; | |
1927 const int xy = s->mb_y * s->mb_stride + s->mb_x; | |
1928 uint8_t *dest_y = s->dest[0]; | |
1929 uint8_t *dest_cb= s->dest[1]; | |
1930 uint8_t *dest_cr= s->dest[2]; | |
2967 | 1931 |
6481 | 1932 // if(s->pict_type==FF_B_TYPE && !s->readable) return; |
1644 | 1933 |
1934 /* | |
1935 Diag Top | |
1936 Left Center | |
1937 */ | |
1938 if(!IS_SKIP(s->current_picture.mb_type[xy])){ | |
1939 qp_c= s->qscale; | |
1940 s->dsp.h263_v_loop_filter(dest_y+8*linesize , linesize, qp_c); | |
1941 s->dsp.h263_v_loop_filter(dest_y+8*linesize+8, linesize, qp_c); | |
1942 }else | |
1943 qp_c= 0; | |
1944 | |
1945 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
|
1946 int qp_dt, qp_tt, qp_tc; |
1644 | 1947 |
1948 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
|
1949 qp_tt=0; |
2967 | 1950 else |
8297
20e0f0809b27
s/qp_t/qp_tt/ to avoid bad examples that could lead to issues with reserved
michael
parents:
8288
diff
changeset
|
1951 qp_tt= s->current_picture.qscale_table[xy-s->mb_stride]; |
1644 | 1952 |
2967 | 1953 if(qp_c) |
1644 | 1954 qp_tc= qp_c; |
1955 else | |
8297
20e0f0809b27
s/qp_t/qp_tt/ to avoid bad examples that could lead to issues with reserved
michael
parents:
8288
diff
changeset
|
1956 qp_tc= qp_tt; |
2967 | 1957 |
1644 | 1958 if(qp_tc){ |
1959 const int chroma_qp= s->chroma_qscale_table[qp_tc]; | |
1960 s->dsp.h263_v_loop_filter(dest_y , linesize, qp_tc); | |
1961 s->dsp.h263_v_loop_filter(dest_y+8, linesize, qp_tc); | |
2967 | 1962 |
1644 | 1963 s->dsp.h263_v_loop_filter(dest_cb , uvlinesize, chroma_qp); |
1964 s->dsp.h263_v_loop_filter(dest_cr , uvlinesize, chroma_qp); | |
1965 } | |
2967 | 1966 |
8297
20e0f0809b27
s/qp_t/qp_tt/ to avoid bad examples that could lead to issues with reserved
michael
parents:
8288
diff
changeset
|
1967 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
|
1968 s->dsp.h263_h_loop_filter(dest_y-8*linesize+8 , linesize, qp_tt); |
2967 | 1969 |
1644 | 1970 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
|
1971 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
|
1972 qp_dt= qp_tt; |
1644 | 1973 else |
1974 qp_dt= s->current_picture.qscale_table[xy-1-s->mb_stride]; | |
2967 | 1975 |
1644 | 1976 if(qp_dt){ |
1977 const int chroma_qp= s->chroma_qscale_table[qp_dt]; | |
1978 s->dsp.h263_h_loop_filter(dest_y -8*linesize , linesize, qp_dt); | |
1979 s->dsp.h263_h_loop_filter(dest_cb-8*uvlinesize, uvlinesize, chroma_qp); | |
2178 | 1980 s->dsp.h263_h_loop_filter(dest_cr-8*uvlinesize, uvlinesize, chroma_qp); |
1644 | 1981 } |
1982 } | |
1983 } | |
1984 | |
1985 if(qp_c){ | |
1986 s->dsp.h263_h_loop_filter(dest_y +8, linesize, qp_c); | |
1987 if(s->mb_y + 1 == s->mb_height) | |
1988 s->dsp.h263_h_loop_filter(dest_y+8*linesize+8, linesize, qp_c); | |
1989 } | |
2967 | 1990 |
1644 | 1991 if(s->mb_x){ |
1992 int qp_lc; | |
1993 if(qp_c || IS_SKIP(s->current_picture.mb_type[xy-1])) | |
1994 qp_lc= qp_c; | |
1995 else | |
1996 qp_lc= s->current_picture.qscale_table[xy-1]; | |
2967 | 1997 |
1644 | 1998 if(qp_lc){ |
1999 s->dsp.h263_h_loop_filter(dest_y, linesize, qp_lc); | |
2000 if(s->mb_y + 1 == s->mb_height){ | |
2001 const int chroma_qp= s->chroma_qscale_table[qp_lc]; | |
2002 s->dsp.h263_h_loop_filter(dest_y +8* linesize, linesize, qp_lc); | |
2003 s->dsp.h263_h_loop_filter(dest_cb , uvlinesize, chroma_qp); | |
2004 s->dsp.h263_h_loop_filter(dest_cr , uvlinesize, chroma_qp); | |
2005 } | |
2006 } | |
2007 } | |
2008 } | |
2009 | |
1057 | 2010 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
|
2011 { |
249
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
2012 int x, y, wrap, a, c, pred_dc, scale, i; |
3781 | 2013 int16_t *dc_val, *ac_val, *ac_val1; |
248
56ee684c48bb
- H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents:
245
diff
changeset
|
2014 |
56ee684c48bb
- H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents:
245
diff
changeset
|
2015 /* find prediction */ |
56ee684c48bb
- H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents:
245
diff
changeset
|
2016 if (n < 4) { |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1936
diff
changeset
|
2017 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
|
2018 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
|
2019 wrap = s->b8_stride; |
248
56ee684c48bb
- H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents:
245
diff
changeset
|
2020 dc_val = s->dc_val[0]; |
249
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
2021 ac_val = s->ac_val[0][0]; |
248
56ee684c48bb
- H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents:
245
diff
changeset
|
2022 scale = s->y_dc_scale; |
56ee684c48bb
- H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents:
245
diff
changeset
|
2023 } else { |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1936
diff
changeset
|
2024 x = s->mb_x; |
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1936
diff
changeset
|
2025 y = s->mb_y; |
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1936
diff
changeset
|
2026 wrap = s->mb_stride; |
248
56ee684c48bb
- H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents:
245
diff
changeset
|
2027 dc_val = s->dc_val[n - 4 + 1]; |
249
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
2028 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
|
2029 scale = s->c_dc_scale; |
56ee684c48bb
- H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents:
245
diff
changeset
|
2030 } |
2967 | 2031 |
249
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
2032 ac_val += ((y) * wrap + (x)) * 16; |
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
2033 ac_val1 = ac_val; |
2967 | 2034 |
248
56ee684c48bb
- H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents:
245
diff
changeset
|
2035 /* B C |
2967 | 2036 * A X |
248
56ee684c48bb
- H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents:
245
diff
changeset
|
2037 */ |
56ee684c48bb
- H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents:
245
diff
changeset
|
2038 a = dc_val[(x - 1) + (y) * wrap]; |
56ee684c48bb
- H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents:
245
diff
changeset
|
2039 c = dc_val[(x) + (y - 1) * wrap]; |
2967 | 2040 |
350
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
2041 /* No prediction outside GOB boundary */ |
1639 | 2042 if(s->first_slice_line && n!=3){ |
2043 if(n!=2) c= 1024; | |
2044 if(n!=1 && s->mb_x == s->resync_mb_x) a= 1024; | |
2045 } | |
2967 | 2046 |
248
56ee684c48bb
- H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents:
245
diff
changeset
|
2047 if (s->ac_pred) { |
1639 | 2048 pred_dc = 1024; |
248
56ee684c48bb
- H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents:
245
diff
changeset
|
2049 if (s->h263_aic_dir) { |
56ee684c48bb
- H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents:
245
diff
changeset
|
2050 /* left prediction */ |
249
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
2051 if (a != 1024) { |
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
2052 ac_val -= 16; |
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
2053 for(i=1;i<8;i++) { |
1092 | 2054 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
|
2055 } |
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
2056 pred_dc = a; |
248
56ee684c48bb
- H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents:
245
diff
changeset
|
2057 } |
56ee684c48bb
- H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents:
245
diff
changeset
|
2058 } else { |
56ee684c48bb
- H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents:
245
diff
changeset
|
2059 /* top prediction */ |
249
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
2060 if (c != 1024) { |
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
2061 ac_val -= 16 * wrap; |
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
2062 for(i=1;i<8;i++) { |
1092 | 2063 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
|
2064 } |
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
2065 pred_dc = c; |
248
56ee684c48bb
- H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents:
245
diff
changeset
|
2066 } |
56ee684c48bb
- H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents:
245
diff
changeset
|
2067 } |
249
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
2068 } else { |
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
2069 /* just DC prediction */ |
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
2070 if (a != 1024 && c != 1024) |
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
2071 pred_dc = (a + c) >> 1; |
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
2072 else if (a != 1024) |
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
2073 pred_dc = a; |
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
2074 else |
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
2075 pred_dc = c; |
248
56ee684c48bb
- H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents:
245
diff
changeset
|
2076 } |
2967 | 2077 |
249
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
2078 /* we assume pred is positive */ |
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
2079 block[0]=block[0]*scale + pred_dc; |
2967 | 2080 |
249
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
2081 if (block[0] < 0) |
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
2082 block[0] = 0; |
2967 | 2083 else |
1639 | 2084 block[0] |= 1; |
2967 | 2085 |
249
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
2086 /* Update AC/DC tables */ |
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
2087 dc_val[(x) + (y) * wrap] = block[0]; |
2967 | 2088 |
248
56ee684c48bb
- H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents:
245
diff
changeset
|
2089 /* left copy */ |
56ee684c48bb
- H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents:
245
diff
changeset
|
2090 for(i=1;i<8;i++) |
1092 | 2091 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
|
2092 /* top copy */ |
56ee684c48bb
- H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents:
245
diff
changeset
|
2093 for(i=1;i<8;i++) |
1092 | 2094 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
|
2095 } |
56ee684c48bb
- H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents:
245
diff
changeset
|
2096 |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1936
diff
changeset
|
2097 int16_t *h263_pred_motion(MpegEncContext * s, int block, int dir, |
0 | 2098 int *px, int *py) |
2099 { | |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1936
diff
changeset
|
2100 int wrap; |
1655 | 2101 int16_t *A, *B, *C, (*mot_val)[2]; |
2102 static const int off[4]= {2, 1, 1, -1}; | |
2103 | |
2104 wrap = s->b8_stride; | |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1936
diff
changeset
|
2105 mot_val = s->current_picture.motion_val[dir] + s->block_index[block]; |
1655 | 2106 |
2107 A = mot_val[ - 1]; | |
2108 /* special case for first (slice) line */ | |
2109 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
|
2110 // we can't just change some MVs to simulate that as we need them for the B frames (and ME) |
1655 | 2111 // and if we ever support non rectangular objects than we need to do a few ifs here anyway :( |
2112 if(block==0){ //most common case | |
2113 if(s->mb_x == s->resync_mb_x){ //rare | |
2114 *px= *py = 0; | |
2115 }else if(s->mb_x + 1 == s->resync_mb_x && s->h263_pred){ //rare | |
2116 C = mot_val[off[block] - wrap]; | |
2117 if(s->mb_x==0){ | |
2118 *px = C[0]; | |
2119 *py = C[1]; | |
2120 }else{ | |
2121 *px = mid_pred(A[0], 0, C[0]); | |
2122 *py = mid_pred(A[1], 0, C[1]); | |
2123 } | |
2124 }else{ | |
2125 *px = A[0]; | |
2126 *py = A[1]; | |
2127 } | |
2128 }else if(block==1){ | |
2129 if(s->mb_x + 1 == s->resync_mb_x && s->h263_pred){ //rare | |
2130 C = mot_val[off[block] - wrap]; | |
2131 *px = mid_pred(A[0], 0, C[0]); | |
2132 *py = mid_pred(A[1], 0, C[1]); | |
2133 }else{ | |
2134 *px = A[0]; | |
2135 *py = A[1]; | |
2136 } | |
2137 }else{ /* block==2*/ | |
2138 B = mot_val[ - wrap]; | |
2139 C = mot_val[off[block] - wrap]; | |
2140 if(s->mb_x == s->resync_mb_x) //rare | |
2141 A[0]=A[1]=0; | |
2967 | 2142 |
1655 | 2143 *px = mid_pred(A[0], B[0], C[0]); |
2144 *py = mid_pred(A[1], B[1], C[1]); | |
2145 } | |
2146 } else { | |
2147 B = mot_val[ - wrap]; | |
2148 C = mot_val[off[block] - wrap]; | |
2149 *px = mid_pred(A[0], B[0], C[0]); | |
2150 *py = mid_pred(A[1], B[1], C[1]); | |
2151 } | |
2152 return *mot_val; | |
2153 } | |
2154 | |
8590 | 2155 #if CONFIG_ENCODERS |
10755
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2156 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2157 /***************************************************/ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2158 /** |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2159 * add mpeg4 stuffing bits (01...1) |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2160 */ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2161 void ff_mpeg4_stuffing(PutBitContext * pbc) |
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 int length; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2164 put_bits(pbc, 1, 0); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2165 length= (-put_bits_count(pbc))&7; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2166 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
|
2167 } |
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 /* must be called before writing the header */ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2170 void ff_set_mpeg4_time(MpegEncContext * s){ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2171 if(s->pict_type==FF_B_TYPE){ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2172 ff_mpeg4_init_direct_mv(s); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2173 }else{ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2174 s->last_time_base= s->time_base; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2175 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
|
2176 } |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2177 } |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2178 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2179 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
|
2180 int hours, minutes, seconds; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2181 int64_t time; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2182 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2183 put_bits(&s->pb, 16, 0); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2184 put_bits(&s->pb, 16, GOP_STARTCODE); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2185 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2186 time= s->current_picture_ptr->pts; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2187 if(s->reordered_input_picture[1]) |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2188 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
|
2189 time= time*s->avctx->time_base.num; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2190 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2191 seconds= time/s->avctx->time_base.den; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2192 minutes= seconds/60; seconds %= 60; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2193 hours= minutes/60; minutes %= 60; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2194 hours%=24; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2195 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2196 put_bits(&s->pb, 5, hours); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2197 put_bits(&s->pb, 6, minutes); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2198 put_bits(&s->pb, 1, 1); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2199 put_bits(&s->pb, 6, seconds); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2200 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2201 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
|
2202 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
|
2203 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2204 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
|
2205 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2206 ff_mpeg4_stuffing(&s->pb); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2207 } |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2208 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2209 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
|
2210 int profile_and_level_indication; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2211 int vo_ver_id; |
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(s->avctx->profile != FF_PROFILE_UNKNOWN){ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2214 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
|
2215 }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
|
2216 profile_and_level_indication= 0xF0; // adv simple |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2217 }else{ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2218 profile_and_level_indication= 0x00; // simple |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2219 } |
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 if(s->avctx->level != FF_LEVEL_UNKNOWN){ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2222 profile_and_level_indication |= s->avctx->level; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2223 }else{ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2224 profile_and_level_indication |= 1; //level 1 |
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 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2227 if(profile_and_level_indication>>4 == 0xF){ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2228 vo_ver_id= 5; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2229 }else{ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2230 vo_ver_id= 1; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2231 } |
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 //FIXME levels |
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, 16, 0); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2236 put_bits(&s->pb, 16, VOS_STARTCODE); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2237 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2238 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
|
2239 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2240 put_bits(&s->pb, 16, 0); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2241 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
|
2242 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2243 put_bits(&s->pb, 1, 1); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2244 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
|
2245 put_bits(&s->pb, 3, 1); //priority |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2246 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2247 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
|
2248 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2249 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
|
2250 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2251 ff_mpeg4_stuffing(&s->pb); |
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 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
|
2255 { |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2256 int vo_ver_id; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2257 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2258 if (!CONFIG_MPEG4_ENCODER) return; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2259 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2260 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
|
2261 vo_ver_id= 5; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2262 s->vo_type= ADV_SIMPLE_VO_TYPE; |
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 vo_ver_id= 1; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2265 s->vo_type= SIMPLE_VO_TYPE; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2266 } |
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 put_bits(&s->pb, 16, 0); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2269 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
|
2270 put_bits(&s->pb, 16, 0); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2271 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
|
2272 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2273 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
|
2274 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
|
2275 if(s->workaround_bugs & FF_BUG_MS) { |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2276 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
|
2277 } else { |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2278 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
|
2279 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
|
2280 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
|
2281 } |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2282 |
10785 | 2283 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
|
2284 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2285 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
|
2286 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
|
2287 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
|
2288 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
|
2289 } |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2290 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2291 if(s->workaround_bugs & FF_BUG_MS) { // |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2292 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
|
2293 } else { |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2294 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
|
2295 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
|
2296 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
|
2297 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
|
2298 } |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2299 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2300 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
|
2301 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
|
2302 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2303 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
|
2304 if (s->time_increment_bits < 1) |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2305 s->time_increment_bits = 1; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2306 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
|
2307 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
|
2308 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
|
2309 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
|
2310 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
|
2311 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
|
2312 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
|
2313 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
|
2314 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
|
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->vol_sprite_usage); /* sprite enable */ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2317 }else{ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2318 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
|
2319 } |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2320 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2321 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
|
2322 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
|
2323 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2324 if(s->mpeg_quant){ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2325 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
|
2326 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
|
2327 } |
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 if (vo_ver_id != 1) |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2330 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
|
2331 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
|
2332 s->resync_marker= s->rtp_mode; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2333 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
|
2334 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
|
2335 if(s->data_partitioning){ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2336 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
|
2337 } |
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 if (vo_ver_id != 1){ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2340 put_bits(&s->pb, 1, 0); /* newpred */ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2341 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
|
2342 } |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2343 put_bits(&s->pb, 1, 0); /* scalability */ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2344 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2345 ff_mpeg4_stuffing(&s->pb); |
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 /* user data */ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2348 if(!(s->flags & CODEC_FLAG_BITEXACT)){ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2349 put_bits(&s->pb, 16, 0); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2350 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
|
2351 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
|
2352 } |
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 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2355 /* write mpeg4 VOP header */ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2356 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
|
2357 { |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2358 int time_incr; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2359 int time_div, time_mod; |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2360 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2361 if(s->pict_type==FF_I_TYPE){ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2362 if(!(s->flags&CODEC_FLAG_GLOBAL_HEADER)){ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2363 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
|
2364 mpeg4_encode_visual_object_header(s); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2365 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
|
2366 mpeg4_encode_vol_header(s, 0, 0); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2367 } |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2368 if(!(s->workaround_bugs & FF_BUG_MS)) |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2369 mpeg4_encode_gop_header(s); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2370 } |
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 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
|
2373 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2374 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
|
2375 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
|
2376 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
|
2377 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2378 assert(s->time>=0); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2379 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
|
2380 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
|
2381 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
|
2382 assert(time_incr >= 0); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2383 while(time_incr--) |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2384 put_bits(&s->pb, 1, 1); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2385 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2386 put_bits(&s->pb, 1, 0); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2387 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2388 put_bits(&s->pb, 1, 1); /* marker */ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2389 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
|
2390 put_bits(&s->pb, 1, 1); /* marker */ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2391 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
|
2392 if ( s->pict_type == FF_P_TYPE |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2393 || (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
|
2394 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
|
2395 } |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2396 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
|
2397 if(!s->progressive_sequence){ |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2398 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
|
2399 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
|
2400 } |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2401 //FIXME sprite stuff |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2402 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2403 put_bits(&s->pb, 5, s->qscale); |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2404 |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2405 if (s->pict_type != FF_I_TYPE) |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2406 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
|
2407 if (s->pict_type == FF_B_TYPE) |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2408 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
|
2409 } |
465c9e1cad02
cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents:
10754
diff
changeset
|
2410 |
2017 | 2411 void ff_h263_encode_motion(MpegEncContext * s, int val, int f_code) |
0 | 2412 { |
702 | 2413 int range, l, bit_size, sign, code, bits; |
0 | 2414 |
2415 if (val == 0) { | |
2416 /* zero vector */ | |
2417 code = 0; | |
2418 put_bits(&s->pb, mvtab[code][1], mvtab[code][0]); | |
2419 } else { | |
324 | 2420 bit_size = f_code - 1; |
0 | 2421 range = 1 << bit_size; |
2422 /* modulo encoding */ | |
2093 | 2423 l= INT_BIT - 6 - bit_size; |
2424 val = (val<<l)>>l; | |
702 | 2425 sign = val>>31; |
2426 val= (val^sign)-sign; | |
2427 sign&=1; | |
2093 | 2428 |
312 | 2429 val--; |
2430 code = (val >> bit_size) + 1; | |
2431 bits = val & (range - 1); | |
0 | 2432 |
2967 | 2433 put_bits(&s->pb, mvtab[code][1] + 1, (mvtab[code][0] << 1) | sign); |
0 | 2434 if (bit_size > 0) { |
2435 put_bits(&s->pb, bit_size, bits); | |
2436 } | |
2437 } | |
2438 } | |
2439 | |
277
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
274
diff
changeset
|
2440 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
|
2441 { |
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
274
diff
changeset
|
2442 int f_code; |
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
274
diff
changeset
|
2443 int mv; |
2967 | 2444 |
277
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
274
diff
changeset
|
2445 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
|
2446 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
|
2447 int len; |
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
274
diff
changeset
|
2448 |
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
274
diff
changeset
|
2449 if(mv==0) len= mvtab[0][1]; |
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
274
diff
changeset
|
2450 else{ |
9465
9dcb191f1df3
Remove unused variable in init_mv_penalty_and_fcode() found by CSA.
michael
parents:
9458
diff
changeset
|
2451 int val, bit_size, code; |
277
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
274
diff
changeset
|
2452 |
1893
779bdf5063ce
1000000l (using uninitalized variable for initalizing bits per MV table)
michael
parents:
1873
diff
changeset
|
2453 bit_size = f_code - 1; |
277
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 val=mv; |
2967 | 2456 if (val < 0) |
277
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
274
diff
changeset
|
2457 val = -val; |
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
274
diff
changeset
|
2458 val--; |
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
274
diff
changeset
|
2459 code = (val >> bit_size) + 1; |
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
274
diff
changeset
|
2460 if(code<33){ |
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
274
diff
changeset
|
2461 len= mvtab[code][1] + 1 + bit_size; |
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
274
diff
changeset
|
2462 }else{ |
2985 | 2463 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
|
2464 } |
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
274
diff
changeset
|
2465 } |
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
274
diff
changeset
|
2466 |
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
274
diff
changeset
|
2467 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
|
2468 } |
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
274
diff
changeset
|
2469 } |
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
274
diff
changeset
|
2470 |
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
274
diff
changeset
|
2471 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
|
2472 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
|
2473 fcode_tab[mv+MAX_MV]= f_code; |
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
274
diff
changeset
|
2474 } |
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
274
diff
changeset
|
2475 } |
287 | 2476 |
2477 for(mv=0; mv<MAX_MV*2+1; mv++){ | |
2478 umv_fcode_tab[mv]= 1; | |
2479 } | |
277
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
274
diff
changeset
|
2480 } |
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
|
2481 |
468 | 2482 static void init_uni_dc_tab(void) |
293 | 2483 { |
2484 int level, uni_code, uni_len; | |
2485 | |
312 | 2486 for(level=-256; level<256; level++){ |
293 | 2487 int size, v, l; |
2488 /* find number of bits */ | |
2489 size = 0; | |
2490 v = abs(level); | |
2491 while (v) { | |
2492 v >>= 1; | |
2979 | 2493 size++; |
293 | 2494 } |
2495 | |
2496 if (level < 0) | |
2497 l= (-level) ^ ((1 << size) - 1); | |
2498 else | |
2499 l= level; | |
2500 | |
2501 /* luminance */ | |
2502 uni_code= DCtab_lum[size][0]; | |
2503 uni_len = DCtab_lum[size][1]; | |
2504 | |
2505 if (size > 0) { | |
2506 uni_code<<=size; uni_code|=l; | |
2507 uni_len+=size; | |
2508 if (size > 8){ | |
2509 uni_code<<=1; uni_code|=1; | |
2510 uni_len++; | |
2511 } | |
2512 } | |
1013 | 2513 uni_DCtab_lum_bits[level+256]= uni_code; |
2514 uni_DCtab_lum_len [level+256]= uni_len; | |
293 | 2515 |
2516 /* chrominance */ | |
2517 uni_code= DCtab_chrom[size][0]; | |
2518 uni_len = DCtab_chrom[size][1]; | |
2967 | 2519 |
293 | 2520 if (size > 0) { |
2521 uni_code<<=size; uni_code|=l; | |
2522 uni_len+=size; | |
2523 if (size > 8){ | |
2524 uni_code<<=1; uni_code|=1; | |
2525 uni_len++; | |
2526 } | |
2527 } | |
1013 | 2528 uni_DCtab_chrom_bits[level+256]= uni_code; |
2529 uni_DCtab_chrom_len [level+256]= uni_len; | |
293 | 2530 |
2531 } | |
2532 } | |
2533 | |
1064 | 2534 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
|
2535 int slevel, run, last; |
2967 | 2536 |
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
|
2537 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
|
2538 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
|
2539 |
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 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
|
2541 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
|
2542 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
|
2543 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
|
2544 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
|
2545 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
|
2546 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
|
2547 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
|
2548 int level1, run1; |
2967 | 2549 |
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
|
2550 len_tab[index]= 100; |
2967 | 2551 |
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
|
2552 /* 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
|
2553 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
|
2554 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
|
2555 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
|
2556 bits=bits*2+sign; len++; |
2967 | 2557 |
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
|
2558 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
|
2559 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
|
2560 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
|
2561 } |
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 /* 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
|
2563 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
|
2564 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
|
2565 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
|
2566 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
|
2567 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
|
2568 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
|
2569 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
|
2570 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
|
2571 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
|
2572 bits=bits*2+sign; len++; |
2967 | 2573 |
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
|
2574 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
|
2575 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
|
2576 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
|
2577 } |
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 } |
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 /* 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
|
2580 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
|
2581 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
|
2582 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
|
2583 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
|
2584 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
|
2585 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
|
2586 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
|
2587 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
|
2588 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
|
2589 bits=bits*2+sign; len++; |
2967 | 2590 |
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
|
2591 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
|
2592 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
|
2593 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
|
2594 } |
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 } |
2967 | 2596 /* 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
|
2597 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
|
2598 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
|
2599 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
|
2600 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
|
2601 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
|
2602 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
|
2603 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
|
2604 bits=bits*2+1; len++; //marker |
2967 | 2605 |
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
|
2606 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
|
2607 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
|
2608 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
|
2609 } |
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
|
2610 } |
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
|
2611 } |
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
|
2612 } |
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
|
2613 } |
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
|
2614 |
2253 | 2615 static void init_uni_h263_rl_tab(RLTable *rl, uint32_t *bits_tab, uint8_t *len_tab){ |
2616 int slevel, run, last; | |
2967 | 2617 |
2253 | 2618 assert(MAX_LEVEL >= 64); |
2619 assert(MAX_RUN >= 63); | |
2620 | |
2621 for(slevel=-64; slevel<64; slevel++){ | |
2622 if(slevel==0) continue; | |
2623 for(run=0; run<64; run++){ | |
2624 for(last=0; last<=1; last++){ | |
2625 const int index= UNI_MPEG4_ENC_INDEX(last, run, slevel+64); | |
2626 int level= slevel < 0 ? -slevel : slevel; | |
2627 int sign= slevel < 0 ? 1 : 0; | |
2628 int bits, len, code; | |
2967 | 2629 |
2253 | 2630 len_tab[index]= 100; |
2967 | 2631 |
2253 | 2632 /* ESC0 */ |
2633 code= get_rl_index(rl, last, run, level); | |
2634 bits= rl->table_vlc[code][0]; | |
2635 len= rl->table_vlc[code][1]; | |
2636 bits=bits*2+sign; len++; | |
2967 | 2637 |
2253 | 2638 if(code!=rl->n && len < len_tab[index]){ |
2639 if(bits_tab) bits_tab[index]= bits; | |
2640 len_tab [index]= len; | |
2641 } | |
2642 /* ESC */ | |
2643 bits= rl->table_vlc[rl->n][0]; | |
2644 len = rl->table_vlc[rl->n][1]; | |
2645 bits=bits*2+last; len++; | |
2646 bits=bits*64+run; len+=6; | |
2647 bits=bits*256+(level&0xff); len+=8; | |
2967 | 2648 |
2253 | 2649 if(len < len_tab[index]){ |
2650 if(bits_tab) bits_tab[index]= bits; | |
2651 len_tab [index]= len; | |
2652 } | |
2653 } | |
2654 } | |
2655 } | |
2656 } | |
2657 | |
277
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
274
diff
changeset
|
2658 void h263_encode_init(MpegEncContext *s) |
0 | 2659 { |
2660 static int done = 0; | |
2661 | |
2662 if (!done) { | |
2663 done = 1; | |
293 | 2664 |
2665 init_uni_dc_tab(); | |
2666 | |
4668 | 2667 init_rl(&rl_inter, static_rl_table_store[0]); |
2668 init_rl(&rl_intra, static_rl_table_store[1]); | |
2669 init_rl(&rl_intra_aic, static_rl_table_store[2]); | |
2967 | 2670 |
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
|
2671 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
|
2672 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
|
2673 |
2253 | 2674 init_uni_h263_rl_tab(&rl_intra_aic, NULL, uni_h263_intra_aic_rl_len); |
2675 init_uni_h263_rl_tab(&rl_inter , NULL, uni_h263_inter_rl_len); | |
2676 | |
277
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
274
diff
changeset
|
2677 init_mv_penalty_and_fcode(s); |
0 | 2678 } |
936 | 2679 s->me.mv_penalty= mv_penalty; //FIXME exact table for msmpeg4 & h263p |
2967 | 2680 |
2253 | 2681 s->intra_ac_vlc_length =s->inter_ac_vlc_length = uni_h263_inter_rl_len; |
2682 s->intra_ac_vlc_last_length=s->inter_ac_vlc_last_length= uni_h263_inter_rl_len + 128*64; | |
2683 if(s->h263_aic){ | |
2684 s->intra_ac_vlc_length = uni_h263_intra_aic_rl_len; | |
2685 s->intra_ac_vlc_last_length= uni_h263_intra_aic_rl_len + 128*64; | |
2686 } | |
2687 s->ac_esc_length= 7+1+6+8; | |
2688 | |
287 | 2689 // use fcodes >1 only for mpeg4 & h263 & h263p FIXME |
344 | 2690 switch(s->codec_id){ |
2691 case CODEC_ID_MPEG4: | |
2692 s->fcode_tab= fcode_tab; | |
2693 s->min_qcoeff= -2048; | |
2694 s->max_qcoeff= 2047; | |
945 | 2695 s->intra_ac_vlc_length = uni_mpeg4_intra_rl_len; |
2696 s->intra_ac_vlc_last_length= uni_mpeg4_intra_rl_len + 128*64; | |
2697 s->inter_ac_vlc_length = uni_mpeg4_inter_rl_len; | |
2698 s->inter_ac_vlc_last_length= uni_mpeg4_inter_rl_len + 128*64; | |
1013 | 2699 s->luma_dc_vlc_length= uni_DCtab_lum_len; |
2700 s->chroma_dc_vlc_length= uni_DCtab_chrom_len; | |
945 | 2701 s->ac_esc_length= 7+2+1+6+1+12+1; |
1799 | 2702 s->y_dc_scale_table= ff_mpeg4_y_dc_scale_table; |
2703 s->c_dc_scale_table= ff_mpeg4_c_dc_scale_table; | |
2704 | |
1424 | 2705 if(s->flags & CODEC_FLAG_GLOBAL_HEADER){ |
1483 | 2706 |
1424 | 2707 s->avctx->extradata= av_malloc(1024); |
1522
79dddc5cd990
removed the obsolete and unused parameters of init_put_bits
alex
parents:
1521
diff
changeset
|
2708 init_put_bits(&s->pb, s->avctx->extradata, 1024); |
2967 | 2709 |
2572
c22ad129a91b
support omiting various headers in mpeg4 as WMP seems to have difficulty with them
michael
parents:
2554
diff
changeset
|
2710 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
|
2711 mpeg4_encode_visual_object_header(s); |
1424 | 2712 mpeg4_encode_vol_header(s, 0, 0); |
2713 | |
2714 // ff_mpeg4_stuffing(&s->pb); ? | |
2715 flush_put_bits(&s->pb); | |
1786 | 2716 s->avctx->extradata_size= (put_bits_count(&s->pb)+7)>>3; |
1424 | 2717 } |
2967 | 2718 |
344 | 2719 break; |
2720 case CODEC_ID_H263P: | |
1666 | 2721 if(s->umvplus) |
2722 s->fcode_tab= umv_fcode_tab; | |
2723 if(s->modified_quant){ | |
2724 s->min_qcoeff= -2047; | |
2725 s->max_qcoeff= 2047; | |
2726 }else{ | |
2727 s->min_qcoeff= -127; | |
2728 s->max_qcoeff= 127; | |
2729 } | |
344 | 2730 break; |
2967 | 2731 //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
|
2732 case CODEC_ID_FLV1: |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
2733 if (s->h263_flv > 1) { |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
2734 s->min_qcoeff= -1023; |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
2735 s->max_qcoeff= 1023; |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
2736 } else { |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
2737 s->min_qcoeff= -127; |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
2738 s->max_qcoeff= 127; |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
2739 } |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
2740 s->y_dc_scale_table= |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
2741 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
|
2742 break; |
2646
c735e3e60ca7
Even More spelling errors. patch by (Kevin Baragona <kevinmb500 gawab com)
michael
parents:
2639
diff
changeset
|
2743 default: //nothing needed - default table already set in mpegvideo.c |
1089 | 2744 s->min_qcoeff= -127; |
344 | 2745 s->max_qcoeff= 127; |
498 | 2746 s->y_dc_scale_table= |
2747 s->c_dc_scale_table= ff_mpeg1_dc_scale_table; | |
344 | 2748 } |
0 | 2749 } |
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
|
2750 #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
|
2751 |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
2752 /** |
1034 | 2753 * predicts the ac. |
2754 * @param n block index (0-3 are luma, 4-5 are chroma) | |
2755 * @param dir the ac prediction direction | |
2756 */ | |
1008 | 2757 void mpeg4_pred_ac(MpegEncContext * s, DCTELEM *block, int n, |
0 | 2758 int dir) |
2759 { | |
266 | 2760 int i; |
1064 | 2761 int16_t *ac_val, *ac_val1; |
903 | 2762 int8_t * const qscale_table= s->current_picture.qscale_table; |
0 | 2763 |
2764 /* find prediction */ | |
266 | 2765 ac_val = s->ac_val[0][0] + s->block_index[n] * 16; |
0 | 2766 ac_val1 = ac_val; |
2767 if (s->ac_pred) { | |
2768 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
|
2769 const int xy= s->mb_x-1 + s->mb_y*s->mb_stride; |
0 | 2770 /* left prediction */ |
2771 ac_val -= 16; | |
2967 | 2772 |
903 | 2773 if(s->mb_x==0 || s->qscale == qscale_table[xy] || n==1 || n==3){ |
575 | 2774 /* same qscale */ |
2775 for(i=1;i<8;i++) { | |
1092 | 2776 block[s->dsp.idct_permutation[i<<3]] += ac_val[i]; |
575 | 2777 } |
2778 }else{ | |
2779 /* different qscale, we must rescale */ | |
2780 for(i=1;i<8;i++) { | |
1092 | 2781 block[s->dsp.idct_permutation[i<<3]] += ROUNDED_DIV(ac_val[i]*qscale_table[xy], s->qscale); |
575 | 2782 } |
0 | 2783 } |
2784 } 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
|
2785 const int xy= s->mb_x + s->mb_y*s->mb_stride - s->mb_stride; |
0 | 2786 /* top prediction */ |
266 | 2787 ac_val -= 16 * s->block_wrap[n]; |
575 | 2788 |
903 | 2789 if(s->mb_y==0 || s->qscale == qscale_table[xy] || n==2 || n==3){ |
575 | 2790 /* same qscale */ |
2791 for(i=1;i<8;i++) { | |
1092 | 2792 block[s->dsp.idct_permutation[i]] += ac_val[i + 8]; |
575 | 2793 } |
2794 }else{ | |
2795 /* different qscale, we must rescale */ | |
2796 for(i=1;i<8;i++) { | |
1092 | 2797 block[s->dsp.idct_permutation[i]] += ROUNDED_DIV(ac_val[i + 8]*qscale_table[xy], s->qscale); |
575 | 2798 } |
0 | 2799 } |
2800 } | |
2801 } | |
2802 /* left copy */ | |
2803 for(i=1;i<8;i++) | |
1092 | 2804 ac_val1[i ] = block[s->dsp.idct_permutation[i<<3]]; |
591 | 2805 |
0 | 2806 /* top copy */ |
2807 for(i=1;i<8;i++) | |
1092 | 2808 ac_val1[8 + i] = block[s->dsp.idct_permutation[i ]]; |
591 | 2809 |
0 | 2810 } |
2811 | |
2812 /***********************************************/ | |
2813 /* decoding */ | |
2814 | |
2815 static VLC intra_MCBPC_vlc; | |
2816 static VLC inter_MCBPC_vlc; | |
2817 static VLC cbpy_vlc; | |
2818 static VLC mv_vlc; | |
2819 static VLC dc_lum, dc_chrom; | |
254
b4fed8b24e3a
gmc bitstream decoding support (the real motion compensation isnt implemnted yet)
michaelni
parents:
253
diff
changeset
|
2820 static VLC sprite_trajectory; |
262 | 2821 static VLC mb_type_b_vlc; |
1655 | 2822 static VLC h263_mbtype_b_vlc; |
2823 static VLC cbpc_b_vlc; | |
0 | 2824 |
2825 /* init vlcs */ | |
2826 | |
2827 /* XXX: find a better solution to handle static init */ | |
2828 void h263_decode_init_vlc(MpegEncContext *s) | |
2829 { | |
2830 static int done = 0; | |
2831 | |
2832 if (!done) { | |
2833 done = 1; | |
2834 | |
7098 | 2835 INIT_VLC_STATIC(&intra_MCBPC_vlc, INTRA_MCBPC_VLC_BITS, 9, |
0 | 2836 intra_MCBPC_bits, 1, 1, |
7098 | 2837 intra_MCBPC_code, 1, 1, 72); |
2838 INIT_VLC_STATIC(&inter_MCBPC_vlc, INTER_MCBPC_VLC_BITS, 28, | |
0 | 2839 inter_MCBPC_bits, 1, 1, |
7098 | 2840 inter_MCBPC_code, 1, 1, 198); |
2841 INIT_VLC_STATIC(&cbpy_vlc, CBPY_VLC_BITS, 16, | |
0 | 2842 &cbpy_tab[0][1], 2, 1, |
7098 | 2843 &cbpy_tab[0][0], 2, 1, 64); |
2844 INIT_VLC_STATIC(&mv_vlc, MV_VLC_BITS, 33, | |
0 | 2845 &mvtab[0][1], 2, 1, |
7098 | 2846 &mvtab[0][0], 2, 1, 538); |
4668 | 2847 init_rl(&rl_inter, static_rl_table_store[0]); |
2848 init_rl(&rl_intra, static_rl_table_store[1]); | |
2849 init_rl(&rvlc_rl_inter, static_rl_table_store[3]); | |
2850 init_rl(&rvlc_rl_intra, static_rl_table_store[4]); | |
2851 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
|
2852 INIT_VLC_RL(rl_inter, 554); |
778ecab25dd8
Change init_vlc_rl() so it does not use *alloc_static() anymore.
michael
parents:
6918
diff
changeset
|
2853 INIT_VLC_RL(rl_intra, 554); |
778ecab25dd8
Change init_vlc_rl() so it does not use *alloc_static() anymore.
michael
parents:
6918
diff
changeset
|
2854 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
|
2855 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
|
2856 INIT_VLC_RL(rl_intra_aic, 554); |
7098 | 2857 INIT_VLC_STATIC(&dc_lum, DC_VLC_BITS, 10 /* 13 */, |
0 | 2858 &DCtab_lum[0][1], 2, 1, |
7098 | 2859 &DCtab_lum[0][0], 2, 1, 512); |
2860 INIT_VLC_STATIC(&dc_chrom, DC_VLC_BITS, 10 /* 13 */, | |
0 | 2861 &DCtab_chrom[0][1], 2, 1, |
7098 | 2862 &DCtab_chrom[0][0], 2, 1, 512); |
2863 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
|
2864 &sprite_trajectory_tab[0][1], 4, 2, |
7098 | 2865 &sprite_trajectory_tab[0][0], 4, 2, 128); |
2866 INIT_VLC_STATIC(&mb_type_b_vlc, MB_TYPE_B_VLC_BITS, 4, | |
262 | 2867 &mb_type_b_tab[0][1], 2, 1, |
7098 | 2868 &mb_type_b_tab[0][0], 2, 1, 16); |
2869 INIT_VLC_STATIC(&h263_mbtype_b_vlc, H263_MBTYPE_B_VLC_BITS, 15, | |
1655 | 2870 &h263_mbtype_b_tab[0][1], 2, 1, |
7098 | 2871 &h263_mbtype_b_tab[0][0], 2, 1, 80); |
2872 INIT_VLC_STATIC(&cbpc_b_vlc, CBPC_B_VLC_BITS, 4, | |
1655 | 2873 &cbpc_b_tab[0][1], 2, 1, |
7098 | 2874 &cbpc_b_tab[0][0], 2, 1, 8); |
0 | 2875 } |
2876 } | |
2877 | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
2878 /** |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
2879 * 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
|
2880 */ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
2881 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
|
2882 if (s->height <= 400) |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
2883 return 1; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
2884 else if (s->height <= 800) |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
2885 return 2; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
2886 else |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
2887 return 4; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
2888 } |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
2889 |
1661 | 2890 int ff_h263_decode_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= get_bits(&s->gb, ff_mba_length[i]); | |
2898 s->mb_x= mb_pos % s->mb_width; | |
2899 s->mb_y= mb_pos / s->mb_width; | |
2900 | |
2901 return mb_pos; | |
2902 } | |
2903 | |
2904 void ff_h263_encode_mba(MpegEncContext *s) | |
2905 { | |
2906 int i, mb_pos; | |
2907 | |
2908 for(i=0; i<6; i++){ | |
1670 | 2909 if(s->mb_num-1 <= ff_mba_max[i]) break; |
1661 | 2910 } |
2911 mb_pos= s->mb_x + s->mb_width*s->mb_y; | |
2912 put_bits(&s->pb, ff_mba_length[i], mb_pos); | |
2913 } | |
2914 | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
2915 /** |
1661 | 2916 * decodes the group of blocks header or slice header. |
6524 | 2917 * @return <0 if an error occurred |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
2918 */ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
2919 static int h263_decode_gob_header(MpegEncContext *s) |
162 | 2920 { |
1661 | 2921 unsigned int val, gfid, gob_number; |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
2922 int left; |
2967 | 2923 |
162 | 2924 /* Check for GOB Start Code */ |
2925 val = show_bits(&s->gb, 16); | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
2926 if(val) |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
2927 return -1; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
2928 |
162 | 2929 /* 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
|
2930 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
|
2931 left= get_bits_left(&s->gb); |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
2932 //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
|
2933 for(;left>13; left--){ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
2934 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
|
2935 } |
2967 | 2936 if(left<=13) |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
2937 return -1; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
2938 |
1661 | 2939 if(s->h263_slice_structured){ |
2940 if(get_bits1(&s->gb)==0) | |
2941 return -1; | |
2942 | |
2943 ff_h263_decode_mba(s); | |
2944 | |
2945 if(s->mb_num > 1583) | |
2946 if(get_bits1(&s->gb)==0) | |
2947 return -1; | |
2967 | 2948 |
1661 | 2949 s->qscale = get_bits(&s->gb, 5); /* SQUANT */ |
2950 if(get_bits1(&s->gb)==0) | |
2951 return -1; | |
2952 gfid = get_bits(&s->gb, 2); /* GFID */ | |
2953 }else{ | |
2954 gob_number = get_bits(&s->gb, 5); /* GN */ | |
2955 s->mb_x= 0; | |
2956 s->mb_y= s->gob_index* gob_number; | |
2957 gfid = get_bits(&s->gb, 2); /* GFID */ | |
2958 s->qscale = get_bits(&s->gb, 5); /* GQUANT */ | |
2959 } | |
2967 | 2960 |
2961 if(s->mb_y >= s->mb_height) | |
1661 | 2962 return -1; |
2963 | |
2967 | 2964 if(s->qscale==0) |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
2965 return -1; |
1644 | 2966 |
162 | 2967 return 0; |
2968 } | |
2969 | |
290 | 2970 static inline void memsetw(short *tab, int val, int n) |
2971 { | |
2972 int i; | |
2973 for(i=0;i<n;i++) | |
2974 tab[i] = val; | |
2975 } | |
2976 | |
8590 | 2977 #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
|
2978 |
453 | 2979 void ff_mpeg4_init_partitions(MpegEncContext *s) |
2980 { | |
9431 | 2981 uint8_t *start= put_bits_ptr(&s->pb); |
1799 | 2982 uint8_t *end= s->pb.buf_end; |
2983 int size= end - start; | |
9259 | 2984 int pb_size = (((intptr_t)start + size/3)&(~3)) - (intptr_t)start; |
1912 | 2985 int tex_size= (size - 2*pb_size)&(~3); |
2967 | 2986 |
1799 | 2987 set_put_bits_buffer_size(&s->pb, pb_size); |
2988 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
|
2989 init_put_bits(&s->pb2 , start + pb_size + tex_size, pb_size); |
453 | 2990 } |
2991 | |
2992 void ff_mpeg4_merge_partitions(MpegEncContext *s) | |
290 | 2993 { |
1786 | 2994 const int pb2_len = put_bits_count(&s->pb2 ); |
2995 const int tex_pb_len= put_bits_count(&s->tex_pb); | |
2996 const int bits= put_bits_count(&s->pb); | |
453 | 2997 |
6481 | 2998 if(s->pict_type==FF_I_TYPE){ |
453 | 2999 put_bits(&s->pb, 19, DC_MARKER); |
3000 s->misc_bits+=19 + pb2_len + bits - s->last_bits; | |
3001 s->i_tex_bits+= tex_pb_len; | |
3002 }else{ | |
3003 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
|
3004 s->misc_bits+=17 + pb2_len; |
453 | 3005 s->mv_bits+= bits - s->last_bits; |
3006 s->p_tex_bits+= tex_pb_len; | |
3007 } | |
3008 | |
3009 flush_put_bits(&s->pb2); | |
3010 flush_put_bits(&s->tex_pb); | |
3011 | |
1799 | 3012 set_put_bits_buffer_size(&s->pb, s->pb2.buf_end - s->pb.buf); |
3013 ff_copy_bits(&s->pb, s->pb2.buf , pb2_len); | |
3014 ff_copy_bits(&s->pb, s->tex_pb.buf, tex_pb_len); | |
1786 | 3015 s->last_bits= put_bits_count(&s->pb); |
453 | 3016 } |
3017 | |
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
|
3018 #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
|
3019 |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3020 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
|
3021 switch(s->pict_type){ |
6481 | 3022 case FF_I_TYPE: |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3023 return 16; |
6481 | 3024 case FF_P_TYPE: |
3025 case FF_S_TYPE: | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3026 return s->f_code+15; |
6481 | 3027 case FF_B_TYPE: |
6655
22cca5d3173a
Implement FFMAX3(a,b,c) - maximum over three arguments.
voroshil
parents:
6524
diff
changeset
|
3028 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
|
3029 default: |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3030 return -1; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3031 } |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3032 } |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3033 |
8590 | 3034 #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
|
3035 |
453 | 3036 void ff_mpeg4_encode_video_packet_header(MpegEncContext *s) |
3037 { | |
3038 int mb_num_bits= av_log2(s->mb_num - 1) + 1; | |
3039 | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3040 put_bits(&s->pb, ff_mpeg4_get_video_packet_prefix_length(s), 0); |
453 | 3041 put_bits(&s->pb, 1, 1); |
2967 | 3042 |
453 | 3043 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
|
3044 put_bits(&s->pb, s->quant_precision, s->qscale); |
453 | 3045 put_bits(&s->pb, 1, 0); /* no HEC */ |
3046 } | |
3047 | |
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
|
3048 #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
|
3049 |
453 | 3050 /** |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3051 * 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
|
3052 * @return 0 if not |
453 | 3053 */ |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3054 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
|
3055 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
|
3056 int v= show_bits(&s->gb, 16); |
2967 | 3057 |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3058 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
|
3059 return 0; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3060 } |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3061 |
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
|
3062 while(v<=0xFF){ |
6481 | 3063 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
|
3064 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
|
3065 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
|
3066 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
|
3067 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
|
3068 } |
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
|
3069 |
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
|
3070 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
|
3071 v>>=8; |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3072 v|= 0x7F >> (7-(bits_count&7)); |
2967 | 3073 |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3074 if(v==0x7F) |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3075 return 1; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3076 }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
|
3077 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
|
3078 int len; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3079 GetBitContext gb= s->gb; |
2967 | 3080 |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3081 skip_bits(&s->gb, 1); |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3082 align_get_bits(&s->gb); |
2967 | 3083 |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3084 for(len=0; len<32; len++){ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3085 if(get_bits1(&s->gb)) break; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3086 } |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3087 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3088 s->gb= gb; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3089 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3090 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
|
3091 return 1; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3092 } |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3093 } |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3094 return 0; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3095 } |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3096 |
10753
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3097 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
|
3098 { |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3099 int i; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3100 int a= 2<<s->sprite_warping_accuracy; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3101 int rho= 3-s->sprite_warping_accuracy; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3102 int r=16/a; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3103 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
|
3104 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
|
3105 int sprite_ref[4][2]; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3106 int virtual_ref[2][2]; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3107 int w2, h2, w3, h3; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3108 int alpha=0, beta=0; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3109 int w= s->width; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3110 int h= s->height; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3111 int min_ab; |
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 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
|
3114 int length; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3115 int x=0, y=0; |
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 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
|
3118 if(length){ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3119 x= get_xbits(gb, length); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3120 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3121 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
|
3122 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3123 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
|
3124 if(length){ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3125 y=get_xbits(gb, length); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3126 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3127 skip_bits1(gb); /* marker bit */ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3128 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
|
3129 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
|
3130 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3131 for(; i<4; i++) |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3132 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
|
3133 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3134 while((1<<alpha)<w) alpha++; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3135 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
|
3136 w2= 1<<alpha; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3137 h2= 1<<beta; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3138 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3139 // 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
|
3140 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
|
3141 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
|
3142 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
|
3143 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
|
3144 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
|
3145 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
|
3146 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
|
3147 } else { |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3148 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
|
3149 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
|
3150 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
|
3151 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
|
3152 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
|
3153 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
|
3154 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3155 /* 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
|
3156 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
|
3157 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3158 // 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
|
3159 // 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
|
3160 // 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
|
3161 // 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
|
3162 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
|
3163 + 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
|
3164 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
|
3165 + 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
|
3166 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
|
3167 + 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
|
3168 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
|
3169 + 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
|
3170 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3171 switch(s->num_sprite_warping_points) |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3172 { |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3173 case 0: |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3174 s->sprite_offset[0][0]= 0; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3175 s->sprite_offset[0][1]= 0; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3176 s->sprite_offset[1][0]= 0; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3177 s->sprite_offset[1][1]= 0; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3178 s->sprite_delta[0][0]= a; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3179 s->sprite_delta[0][1]= 0; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3180 s->sprite_delta[1][0]= 0; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3181 s->sprite_delta[1][1]= a; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3182 s->sprite_shift[0]= 0; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3183 s->sprite_shift[1]= 0; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3184 break; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3185 case 1: //GMC only |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3186 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
|
3187 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
|
3188 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
|
3189 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
|
3190 s->sprite_delta[0][0]= a; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3191 s->sprite_delta[0][1]= 0; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3192 s->sprite_delta[1][0]= 0; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3193 s->sprite_delta[1][1]= a; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3194 s->sprite_shift[0]= 0; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3195 s->sprite_shift[1]= 0; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3196 break; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3197 case 2: |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3198 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
|
3199 + (-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
|
3200 + ( 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
|
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_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
|
3203 + (-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
|
3204 + (-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
|
3205 + (1<<(alpha+rho-1)); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3206 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
|
3207 +( 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
|
3208 +2*w2*r*sprite_ref[0][0] |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3209 - 16*w2 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3210 + (1<<(alpha+rho+1))); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3211 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
|
3212 +(-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
|
3213 +2*w2*r*sprite_ref[0][1] |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3214 - 16*w2 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3215 + (1<<(alpha+rho+1))); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3216 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
|
3217 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
|
3218 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
|
3219 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
|
3220 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3221 s->sprite_shift[0]= alpha+rho; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3222 s->sprite_shift[1]= alpha+rho+2; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3223 break; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3224 case 3: |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3225 min_ab= FFMIN(alpha, beta); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3226 w3= w2>>min_ab; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3227 h3= h2>>min_ab; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3228 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
|
3229 + (-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
|
3230 + (-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
|
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_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
|
3233 + (-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
|
3234 + (-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
|
3235 + (1<<(alpha+beta+rho-min_ab-1)); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3236 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
|
3237 + (-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
|
3238 + 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
|
3239 - 16*w2*h3 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3240 + (1<<(alpha+beta+rho-min_ab+1)); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3241 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
|
3242 + (-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
|
3243 + 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
|
3244 - 16*w2*h3 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3245 + (1<<(alpha+beta+rho-min_ab+1)); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3246 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
|
3247 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
|
3248 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
|
3249 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
|
3250 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3251 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
|
3252 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
|
3253 break; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3254 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3255 /* try to simplify the situation */ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3256 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
|
3257 && s->sprite_delta[0][1] == 0 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3258 && s->sprite_delta[1][0] == 0 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3259 && 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
|
3260 { |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3261 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
|
3262 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
|
3263 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
|
3264 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
|
3265 s->sprite_delta[0][0]= a; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3266 s->sprite_delta[0][1]= 0; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3267 s->sprite_delta[1][0]= 0; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3268 s->sprite_delta[1][1]= a; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3269 s->sprite_shift[0]= 0; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3270 s->sprite_shift[1]= 0; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3271 s->real_sprite_warping_points=1; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3272 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3273 else{ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3274 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
|
3275 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
|
3276 for(i=0; i<2; i++){ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3277 s->sprite_offset[0][i]<<= shift_y; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3278 s->sprite_offset[1][i]<<= shift_c; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3279 s->sprite_delta[0][i]<<= shift_y; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3280 s->sprite_delta[1][i]<<= shift_y; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3281 s->sprite_shift[i]= 16; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3282 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3283 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
|
3284 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3285 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3286 |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3287 /** |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3288 * decodes the next video packet. |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3289 * @return <0 if something went wrong |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3290 */ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3291 static int mpeg4_decode_video_packet_header(MpegEncContext *s) |
453 | 3292 { |
290 | 3293 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
|
3294 int header_extension=0, mb_num, len; |
2967 | 3295 |
453 | 3296 /* 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
|
3297 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
|
3298 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3299 for(len=0; len<32; len++){ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3300 if(get_bits1(&s->gb)) break; |
453 | 3301 } |
3302 | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3303 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
|
3304 av_log(s->avctx, AV_LOG_ERROR, "marker does not match f_code\n"); |
453 | 3305 return -1; |
3306 } | |
2967 | 3307 |
453 | 3308 if(s->shape != RECT_SHAPE){ |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3309 header_extension= get_bits1(&s->gb); |
453 | 3310 //FIXME more stuff here |
3311 } | |
3312 | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3313 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
|
3314 if(mb_num>=s->mb_num){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
3315 av_log(s->avctx, AV_LOG_ERROR, "illegal mb_num in video packet (%d %d) \n", mb_num, s->mb_num); |
453 | 3316 return -1; |
3317 } | |
6481 | 3318 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
|
3319 while(s->next_picture.mbskip_table[ s->mb_index2xy[ mb_num ] ]) mb_num++; |
6497 | 3320 if(mb_num >= s->mb_num) return -1; // slice contains just skipped MBs which where already decoded |
1176 | 3321 } |
2967 | 3322 |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3323 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
|
3324 s->mb_y= mb_num / s->mb_width; |
453 | 3325 |
3326 if(s->shape != BIN_ONLY_SHAPE){ | |
2967 | 3327 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
|
3328 if(qscale) |
1644 | 3329 s->chroma_qscale=s->qscale= qscale; |
290 | 3330 } |
3331 | |
3332 if(s->shape == RECT_SHAPE){ | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3333 header_extension= get_bits1(&s->gb); |
290 | 3334 } |
3335 if(header_extension){ | |
453 | 3336 int time_increment; |
290 | 3337 int time_incr=0; |
453 | 3338 |
2967 | 3339 while (get_bits1(&s->gb) != 0) |
290 | 3340 time_incr++; |
3341 | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3342 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
|
3343 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
|
3344 check_marker(&s->gb, "before vop_coding_type in video packed header"); |
2967 | 3345 |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3346 skip_bits(&s->gb, 2); /* vop coding type */ |
290 | 3347 //FIXME not rect stuff here |
3348 | |
3349 if(s->shape != BIN_ONLY_SHAPE){ | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3350 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
|
3351 //FIXME don't just ignore everything |
6481 | 3352 if(s->pict_type == FF_S_TYPE && s->vol_sprite_usage==GMC_SPRITE){ |
1914 | 3353 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
|
3354 av_log(s->avctx, AV_LOG_ERROR, "untested\n"); |
290 | 3355 } |
3356 | |
3357 //FIXME reduced res stuff here | |
2967 | 3358 |
6481 | 3359 if (s->pict_type != FF_I_TYPE) { |
2979 | 3360 int f_code = get_bits(&s->gb, 3); /* fcode_for */ |
660 | 3361 if(f_code==0){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
3362 av_log(s->avctx, AV_LOG_ERROR, "Error, video packet header damaged (f_code=0)\n"); |
290 | 3363 } |
3364 } | |
6481 | 3365 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
|
3366 int b_code = get_bits(&s->gb, 3); |
660 | 3367 if(b_code==0){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
3368 av_log(s->avctx, AV_LOG_ERROR, "Error, video packet header damaged (b_code=0)\n"); |
660 | 3369 } |
2967 | 3370 } |
290 | 3371 } |
3372 } | |
3373 //FIXME new-pred stuff | |
2967 | 3374 |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3375 return 0; |
453 | 3376 } |
3377 | |
3378 void ff_mpeg4_clean_buffers(MpegEncContext *s) | |
3379 { | |
3380 int c_wrap, c_xy, l_wrap, l_xy; | |
290 | 3381 |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1936
diff
changeset
|
3382 l_wrap= s->b8_stride; |
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1936
diff
changeset
|
3383 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
|
3384 c_wrap= s->mb_stride; |
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1936
diff
changeset
|
3385 c_xy= (s->mb_y-1)*c_wrap + s->mb_x - 1; |
290 | 3386 |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3387 #if 0 |
290 | 3388 /* clean DC */ |
453 | 3389 memsetw(s->dc_val[0] + l_xy, 1024, l_wrap*2+1); |
3390 memsetw(s->dc_val[1] + c_xy, 1024, c_wrap+1); | |
3391 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
|
3392 #endif |
290 | 3393 |
3394 /* clean AC */ | |
1064 | 3395 memset(s->ac_val[0] + l_xy, 0, (l_wrap*2+1)*16*sizeof(int16_t)); |
3396 memset(s->ac_val[1] + c_xy, 0, (c_wrap +1)*16*sizeof(int16_t)); | |
3397 memset(s->ac_val[2] + c_xy, 0, (c_wrap +1)*16*sizeof(int16_t)); | |
290 | 3398 |
3399 /* clean MV */ | |
2646
c735e3e60ca7
Even More spelling errors. patch by (Kevin Baragona <kevinmb500 gawab com)
michael
parents:
2639
diff
changeset
|
3400 // we can't clear the MVs as they might be needed by a b frame |
1064 | 3401 // memset(s->motion_val + l_xy, 0, (l_wrap*2+1)*2*sizeof(int16_t)); |
3402 // memset(s->motion_val, 0, 2*sizeof(int16_t)*(2 + s->mb_width*2)*(2 + s->mb_height*2)); | |
453 | 3403 s->last_mv[0][0][0]= |
3404 s->last_mv[0][0][1]= | |
3405 s->last_mv[1][0][0]= | |
3406 s->last_mv[1][0][1]= 0; | |
3407 } | |
3408 | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3409 /** |
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
|
3410 * 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
|
3411 * @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
|
3412 * @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
|
3413 * @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
|
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 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
|
3416 { |
2bf694251330
Add ff_h263_find_resync_marker() to find the bit position of the next resync_marker, if any.
michael
parents:
9008
diff
changeset
|
3417 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
|
3418 |
2bf694251330
Add ff_h263_find_resync_marker() to find the bit position of the next resync_marker, if any.
michael
parents:
9008
diff
changeset
|
3419 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
|
3420 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
|
3421 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
|
3422 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
|
3423 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
|
3424 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
|
3425 } |
2bf694251330
Add ff_h263_find_resync_marker() to find the bit position of the next resync_marker, if any.
michael
parents:
9008
diff
changeset
|
3426 } |
2bf694251330
Add ff_h263_find_resync_marker() to find the bit position of the next resync_marker, if any.
michael
parents:
9008
diff
changeset
|
3427 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
|
3428 } |
2bf694251330
Add ff_h263_find_resync_marker() to find the bit position of the next resync_marker, if any.
michael
parents:
9008
diff
changeset
|
3429 |
2bf694251330
Add ff_h263_find_resync_marker() to find the bit position of the next resync_marker, if any.
michael
parents:
9008
diff
changeset
|
3430 /** |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3431 * 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
|
3432 * @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
|
3433 */ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3434 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
|
3435 int left, pos, ret; |
2967 | 3436 |
1521 | 3437 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
|
3438 skip_bits1(&s->gb); |
1521 | 3439 align_get_bits(&s->gb); |
3440 } | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3441 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3442 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
|
3443 pos= get_bits_count(&s->gb); |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3444 if(s->codec_id==CODEC_ID_MPEG4) |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3445 ret= mpeg4_decode_video_packet_header(s); |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3446 else |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3447 ret= h263_decode_gob_header(s); |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3448 if(ret>=0) |
8691
25aa5388fa97
Make ff_h263_resync() return the bit position of the resync_marker or
benoit
parents:
8690
diff
changeset
|
3449 return pos; |
453 | 3450 } |
5129 | 3451 //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
|
3452 s->gb= s->last_resync_gb; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3453 align_get_bits(&s->gb); |
10535
95f3daa991a2
Use get_bits_left() instead of size_in_bits - get_bits_count().
rbultje
parents:
9999
diff
changeset
|
3454 left= get_bits_left(&s->gb); |
2967 | 3455 |
3456 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
|
3457 if(show_bits(&s->gb, 16)==0){ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3458 GetBitContext bak= s->gb; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3459 |
8691
25aa5388fa97
Make ff_h263_resync() return the bit position of the resync_marker or
benoit
parents:
8690
diff
changeset
|
3460 pos= get_bits_count(&s->gb); |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3461 if(s->codec_id==CODEC_ID_MPEG4) |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3462 ret= mpeg4_decode_video_packet_header(s); |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3463 else |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3464 ret= h263_decode_gob_header(s); |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3465 if(ret>=0) |
8691
25aa5388fa97
Make ff_h263_resync() return the bit position of the resync_marker or
benoit
parents:
8690
diff
changeset
|
3466 return pos; |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3467 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3468 s->gb= bak; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3469 } |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3470 skip_bits(&s->gb, 8); |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3471 } |
2967 | 3472 |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3473 return -1; |
453 | 3474 } |
3475 | |
10752
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3476 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
|
3477 { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3478 int code, val, sign, shift, l; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3479 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
|
3480 |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3481 if (code == 0) |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3482 return pred; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3483 if (code < 0) |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3484 return 0xffff; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3485 |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3486 sign = get_bits1(&s->gb); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3487 shift = f_code - 1; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3488 val = code; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3489 if (shift) { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3490 val = (val - 1) << shift; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3491 val |= get_bits(&s->gb, shift); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3492 val++; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3493 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3494 if (sign) |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3495 val = -val; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3496 val += pred; |
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 /* modulo decoding */ |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3499 if (!s->h263_long_vectors) { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3500 l = INT_BIT - 5 - f_code; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3501 val = (val<<l)>>l; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3502 } else { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3503 /* horrible h263 long vector mode */ |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3504 if (pred < -31 && val < -63) |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3505 val += 64; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3506 if (pred > 32 && val > 63) |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3507 val -= 64; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3508 |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3509 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3510 return val; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3511 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3512 |
453 | 3513 /** |
1034 | 3514 * gets the average motion vector for a GMC MB. |
753 | 3515 * @param n either 0 for the x component or 1 for y |
3516 * @returns the average MV for a GMC MB | |
3517 */ | |
3518 static inline int get_amv(MpegEncContext *s, int n){ | |
3519 int x, y, mb_v, sum, dx, dy, shift; | |
3520 int len = 1 << (s->f_code + 4); | |
3521 const int a= s->sprite_warping_accuracy; | |
2967 | 3522 |
1997 | 3523 if(s->workaround_bugs & FF_BUG_AMV) |
3524 len >>= s->quarter_sample; | |
753 | 3525 |
3526 if(s->real_sprite_warping_points==1){ | |
3527 if(s->divx_version==500 && s->divx_build==413) | |
3528 sum= s->sprite_offset[0][n] / (1<<(a - s->quarter_sample)); | |
3529 else | |
3530 sum= RSHIFT(s->sprite_offset[0][n]<<s->quarter_sample, a); | |
3531 }else{ | |
3532 dx= s->sprite_delta[n][0]; | |
3533 dy= s->sprite_delta[n][1]; | |
3534 shift= s->sprite_shift[0]; | |
3535 if(n) dy -= 1<<(shift + a + 1); | |
3536 else dx -= 1<<(shift + a + 1); | |
3537 mb_v= s->sprite_offset[0][n] + dx*s->mb_x*16 + dy*s->mb_y*16; | |
3538 | |
3539 sum=0; | |
3540 for(y=0; y<16; y++){ | |
3541 int v; | |
2967 | 3542 |
753 | 3543 v= mb_v + dy*y; |
3544 //XXX FIXME optimize | |
3545 for(x=0; x<16; x++){ | |
3546 sum+= v>>shift; | |
3547 v+= dx; | |
3548 } | |
3549 } | |
999
74dc4105e147
average motion vector rounding like the reference says and not what the standard says
michaelni
parents:
953
diff
changeset
|
3550 sum= RSHIFT(sum, a+8-s->quarter_sample); |
753 | 3551 } |
3552 | |
3553 if (sum < -len) sum= -len; | |
3554 else if (sum >= len) sum= len-1; | |
3555 | |
3556 return sum; | |
3557 } | |
3558 | |
3559 /** | |
10753
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3560 * decodes the dc value. |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3561 * @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
|
3562 * @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
|
3563 * @return the quantized dc |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3564 */ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3565 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
|
3566 { |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3567 int level, code; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3568 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3569 if (n < 4) |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3570 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
|
3571 else |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3572 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
|
3573 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
|
3574 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
|
3575 return -1; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3576 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3577 if (code == 0) { |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3578 level = 0; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3579 } else { |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3580 if(IS_3IV1){ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3581 if(code==1) |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3582 level= 2*get_bits1(&s->gb)-1; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3583 else{ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3584 if(get_bits1(&s->gb)) |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3585 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
|
3586 else |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3587 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
|
3588 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3589 }else{ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3590 level = get_xbits(&s->gb, code); |
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 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3593 if (code > 8){ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3594 if(get_bits1(&s->gb)==0){ /* marker */ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3595 if(s->error_recognition>=2){ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3596 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
|
3597 return -1; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3598 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3599 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3600 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3601 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3602 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3603 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
|
3604 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3605 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3606 /** |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3607 * decodes first partition. |
6524 | 3608 * @return number of MBs decoded or <0 if an error occurred |
453 | 3609 */ |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3610 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
|
3611 int mb_num; |
1064 | 3612 static const int8_t quant_tab[4] = { -1, -2, 1, 2 }; |
2967 | 3613 |
453 | 3614 /* decode first partition */ |
3615 mb_num=0; | |
290 | 3616 s->first_slice_line=1; |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3617 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
|
3618 ff_init_block_index(s); |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3619 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
|
3620 const int xy= s->mb_x + s->mb_y*s->mb_stride; |
453 | 3621 int cbpc; |
3622 int dir=0; | |
2967 | 3623 |
453 | 3624 mb_num++; |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3625 ff_update_block_index(s); |
453 | 3626 if(s->mb_x == s->resync_mb_x && s->mb_y == s->resync_mb_y+1) |
3627 s->first_slice_line=0; | |
2967 | 3628 |
6481 | 3629 if(s->pict_type==FF_I_TYPE){ |
453 | 3630 int i; |
3631 | |
1482 | 3632 do{ |
1873 | 3633 if(show_bits_long(&s->gb, 19)==DC_MARKER){ |
3634 return mb_num-1; | |
3635 } | |
3636 | |
1482 | 3637 cbpc = get_vlc2(&s->gb, intra_MCBPC_vlc.table, INTRA_MCBPC_VLC_BITS, 2); |
3638 if (cbpc < 0){ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
3639 av_log(s->avctx, AV_LOG_ERROR, "cbpc corrupted at %d %d\n", s->mb_x, s->mb_y); |
1482 | 3640 return -1; |
3641 } | |
3642 }while(cbpc == 8); | |
2967 | 3643 |
453 | 3644 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
|
3645 s->current_picture.mb_type[xy]= MB_TYPE_INTRA; |
453 | 3646 s->mb_intra = 1; |
3647 | |
3648 if(cbpc & 4) { | |
1652 | 3649 ff_set_qscale(s, s->qscale + quant_tab[get_bits(&s->gb, 2)]); |
453 | 3650 } |
903 | 3651 s->current_picture.qscale_table[xy]= s->qscale; |
453 | 3652 |
3653 s->mbintra_table[xy]= 1; | |
3654 for(i=0; i<6; i++){ | |
3655 int dc_pred_dir; | |
2967 | 3656 int dc= mpeg4_decode_dc(s, i, &dc_pred_dir); |
453 | 3657 if(dc < 0){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
3658 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
|
3659 return -1; |
453 | 3660 } |
3661 dir<<=1; | |
3662 if(dc_pred_dir) dir|=1; | |
3663 } | |
3664 s->pred_dir_table[xy]= dir; | |
3665 }else{ /* P/S_TYPE */ | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3666 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
|
3667 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
|
3668 const int stride= s->b8_stride*2; |
453 | 3669 |
1873 | 3670 try_again: |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3671 bits= show_bits(&s->gb, 17); |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3672 if(bits==MOTION_MARKER){ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3673 return mb_num-1; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3674 } |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3675 skip_bits1(&s->gb); |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3676 if(bits&0x10000){ |
453 | 3677 /* skip mb */ |
6481 | 3678 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
|
3679 s->current_picture.mb_type[xy]= MB_TYPE_SKIP | MB_TYPE_16x16 | MB_TYPE_GMC | MB_TYPE_L0; |
753 | 3680 mx= get_amv(s, 0); |
3681 my= get_amv(s, 1); | |
453 | 3682 }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
|
3683 s->current_picture.mb_type[xy]= MB_TYPE_SKIP | MB_TYPE_16x16 | MB_TYPE_L0; |
753 | 3684 mx=my=0; |
453 | 3685 } |
3686 mot_val[0 ]= mot_val[2 ]= | |
3687 mot_val[0+stride]= mot_val[2+stride]= mx; | |
3688 mot_val[1 ]= mot_val[3 ]= | |
3689 mot_val[1+stride]= mot_val[3+stride]= my; | |
3690 | |
3691 if(s->mbintra_table[xy]) | |
3692 ff_clean_intra_table_entries(s); | |
3693 continue; | |
3694 } | |
1482 | 3695 |
544 | 3696 cbpc = get_vlc2(&s->gb, inter_MCBPC_vlc.table, INTER_MCBPC_VLC_BITS, 2); |
453 | 3697 if (cbpc < 0){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
3698 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
|
3699 return -1; |
453 | 3700 } |
1873 | 3701 if(cbpc == 20) |
3702 goto try_again; | |
1482 | 3703 |
453 | 3704 s->cbp_table[xy]= cbpc&(8+3); //8 is dquant |
2967 | 3705 |
453 | 3706 s->mb_intra = ((cbpc & 4) != 0); |
2967 | 3707 |
453 | 3708 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
|
3709 s->current_picture.mb_type[xy]= MB_TYPE_INTRA; |
453 | 3710 s->mbintra_table[xy]= 1; |
2967 | 3711 mot_val[0 ]= mot_val[2 ]= |
453 | 3712 mot_val[0+stride]= mot_val[2+stride]= 0; |
3713 mot_val[1 ]= mot_val[3 ]= | |
3714 mot_val[1+stride]= mot_val[3+stride]= 0; | |
3715 }else{ | |
3716 if(s->mbintra_table[xy]) | |
3717 ff_clean_intra_table_entries(s); | |
3718 | |
6481 | 3719 if(s->pict_type==FF_S_TYPE && s->vol_sprite_usage==GMC_SPRITE && (cbpc & 16) == 0) |
453 | 3720 s->mcsel= get_bits1(&s->gb); |
3721 else s->mcsel= 0; | |
2967 | 3722 |
453 | 3723 if ((cbpc & 16) == 0) { |
3724 /* 16x16 motion prediction */ | |
3725 | |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1936
diff
changeset
|
3726 h263_pred_motion(s, 0, 0, &pred_x, &pred_y); |
753 | 3727 if(!s->mcsel){ |
3728 mx = h263_decode_motion(s, pred_x, s->f_code); | |
3729 if (mx >= 0xffff) | |
3730 return -1; | |
3731 | |
3732 my = h263_decode_motion(s, pred_y, s->f_code); | |
3733 if (my >= 0xffff) | |
3734 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
|
3735 s->current_picture.mb_type[xy]= MB_TYPE_16x16 | MB_TYPE_L0; |
753 | 3736 } else { |
3737 mx = get_amv(s, 0); | |
3738 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
|
3739 s->current_picture.mb_type[xy]= MB_TYPE_16x16 | MB_TYPE_GMC | MB_TYPE_L0; |
453 | 3740 } |
753 | 3741 |
453 | 3742 mot_val[0 ]= mot_val[2 ] = |
3743 mot_val[0+stride]= mot_val[2+stride]= mx; | |
3744 mot_val[1 ]= mot_val[3 ]= | |
3745 mot_val[1+stride]= mot_val[3+stride]= my; | |
3746 } else { | |
3747 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
|
3748 s->current_picture.mb_type[xy]= MB_TYPE_8x8 | MB_TYPE_L0; |
453 | 3749 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
|
3750 int16_t *mot_val= h263_pred_motion(s, i, 0, &pred_x, &pred_y); |
453 | 3751 mx = h263_decode_motion(s, pred_x, s->f_code); |
3752 if (mx >= 0xffff) | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3753 return -1; |
2967 | 3754 |
453 | 3755 my = h263_decode_motion(s, pred_y, s->f_code); |
3756 if (my >= 0xffff) | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3757 return -1; |
453 | 3758 mot_val[0] = mx; |
3759 mot_val[1] = my; | |
3760 } | |
3761 } | |
3762 } | |
3763 } | |
3764 } | |
3765 s->mb_x= 0; | |
3766 } | |
3767 | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3768 return mb_num; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3769 } |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3770 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3771 /** |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3772 * decode second partition. |
6524 | 3773 * @return <0 if an error occurred |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3774 */ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3775 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
|
3776 int mb_num=0; |
1064 | 3777 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
|
3778 |
453 | 3779 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
|
3780 s->first_slice_line=1; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3781 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
|
3782 ff_init_block_index(s); |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3783 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
|
3784 const int xy= s->mb_x + s->mb_y*s->mb_stride; |
453 | 3785 |
3786 mb_num++; | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3787 ff_update_block_index(s); |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3788 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
|
3789 s->first_slice_line=0; |
2967 | 3790 |
6481 | 3791 if(s->pict_type==FF_I_TYPE){ |
453 | 3792 int ac_pred= get_bits1(&s->gb); |
544 | 3793 int cbpy = get_vlc2(&s->gb, cbpy_vlc.table, CBPY_VLC_BITS, 1); |
453 | 3794 if(cbpy<0){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
3795 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
|
3796 return -1; |
453 | 3797 } |
2967 | 3798 |
453 | 3799 s->cbp_table[xy]|= cbpy<<2; |
2967 | 3800 s->current_picture.mb_type[xy] |= ac_pred*MB_TYPE_ACPRED; |
453 | 3801 }else{ /* P || S_TYPE */ |
2967 | 3802 if(IS_INTRA(s->current_picture.mb_type[xy])){ |
453 | 3803 int dir=0,i; |
3804 int ac_pred = get_bits1(&s->gb); | |
544 | 3805 int cbpy = get_vlc2(&s->gb, cbpy_vlc.table, CBPY_VLC_BITS, 1); |
453 | 3806 |
3807 if(cbpy<0){ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
3808 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
|
3809 return -1; |
453 | 3810 } |
2967 | 3811 |
453 | 3812 if(s->cbp_table[xy] & 8) { |
1652 | 3813 ff_set_qscale(s, s->qscale + quant_tab[get_bits(&s->gb, 2)]); |
453 | 3814 } |
903 | 3815 s->current_picture.qscale_table[xy]= s->qscale; |
453 | 3816 |
3817 for(i=0; i<6; i++){ | |
3818 int dc_pred_dir; | |
2967 | 3819 int dc= mpeg4_decode_dc(s, i, &dc_pred_dir); |
453 | 3820 if(dc < 0){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
3821 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
|
3822 return -1; |
453 | 3823 } |
3824 dir<<=1; | |
3825 if(dc_pred_dir) dir|=1; | |
3826 } | |
3827 s->cbp_table[xy]&= 3; //remove dquant | |
3828 s->cbp_table[xy]|= cbpy<<2; | |
2967 | 3829 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
|
3830 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
|
3831 }else if(IS_SKIP(s->current_picture.mb_type[xy])){ |
903 | 3832 s->current_picture.qscale_table[xy]= s->qscale; |
453 | 3833 s->cbp_table[xy]= 0; |
3834 }else{ | |
544 | 3835 int cbpy = get_vlc2(&s->gb, cbpy_vlc.table, CBPY_VLC_BITS, 1); |
453 | 3836 |
3837 if(cbpy<0){ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
3838 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
|
3839 return -1; |
453 | 3840 } |
2967 | 3841 |
453 | 3842 if(s->cbp_table[xy] & 8) { |
1652 | 3843 ff_set_qscale(s, s->qscale + quant_tab[get_bits(&s->gb, 2)]); |
453 | 3844 } |
903 | 3845 s->current_picture.qscale_table[xy]= s->qscale; |
453 | 3846 |
3847 s->cbp_table[xy]&= 3; //remove dquant | |
3848 s->cbp_table[xy]|= (cbpy^0xf)<<2; | |
3849 } | |
3850 } | |
3851 } | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3852 if(mb_num >= mb_count) return 0; |
453 | 3853 s->mb_x= 0; |
3854 } | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3855 return 0; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3856 } |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3857 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3858 /** |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3859 * decodes the first & second partition |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3860 * @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
|
3861 */ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3862 int ff_mpeg4_decode_partitions(MpegEncContext *s) |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3863 { |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3864 int mb_num; |
6481 | 3865 const int part_a_error= s->pict_type==FF_I_TYPE ? (DC_ERROR|MV_ERROR) : MV_ERROR; |
3866 const int part_a_end = s->pict_type==FF_I_TYPE ? (DC_END |MV_END) : MV_END; | |
2967 | 3867 |
3868 mb_num= mpeg4_decode_partition_a(s); | |
1144 | 3869 if(mb_num<0){ |
3870 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
|
3871 return -1; |
1144 | 3872 } |
2967 | 3873 |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3874 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
|
3875 av_log(s->avctx, AV_LOG_ERROR, "slice below monitor ...\n"); |
1144 | 3876 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
|
3877 return -1; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3878 } |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3879 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3880 s->mb_num_left= mb_num; |
2967 | 3881 |
6481 | 3882 if(s->pict_type==FF_I_TYPE){ |
1873 | 3883 while(show_bits(&s->gb, 9) == 1) |
3884 skip_bits(&s->gb, 9); | |
1257 | 3885 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
|
3886 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
|
3887 return -1; |
1144 | 3888 } |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3889 }else{ |
1873 | 3890 while(show_bits(&s->gb, 10) == 1) |
3891 skip_bits(&s->gb, 10); | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3892 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
|
3893 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
|
3894 return -1; |
1144 | 3895 } |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3896 } |
1144 | 3897 ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y, s->mb_x-1, s->mb_y, part_a_end); |
2967 | 3898 |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3899 if( mpeg4_decode_partition_b(s, mb_num) < 0){ |
6481 | 3900 if(s->pict_type==FF_P_TYPE) |
1144 | 3901 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
|
3902 return -1; |
1144 | 3903 }else{ |
6481 | 3904 if(s->pict_type==FF_P_TYPE) |
1144 | 3905 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
|
3906 } |
453 | 3907 |
2967 | 3908 return 0; |
453 | 3909 } |
3910 | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3911 /** |
10753
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3912 * decodes a block. |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3913 * @return <0 if an error occurred |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3914 */ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3915 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
|
3916 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
|
3917 { |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3918 int level, i, last, run; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3919 int dc_pred_dir; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3920 RLTable * rl; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3921 RL_VLC_ELEM * rl_vlc; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3922 const uint8_t * scan_table; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3923 int qmul, qadd; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3924 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3925 //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
|
3926 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3927 if(intra) { |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3928 if(s->use_intra_dc_vlc){ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3929 /* DC coef */ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3930 if(s->partitioned_frame){ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3931 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
|
3932 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
|
3933 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
|
3934 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
|
3935 }else{ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3936 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
|
3937 if (level < 0) |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3938 return -1; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3939 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3940 block[0] = level; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3941 i = 0; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3942 }else{ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3943 i = -1; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3944 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
|
3945 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3946 if (!coded) |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3947 goto not_coded; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3948 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3949 if(rvlc){ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3950 rl = &rvlc_rl_intra; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3951 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
|
3952 }else{ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3953 rl = &rl_intra; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3954 rl_vlc = rl_intra.rl_vlc[0]; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3955 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3956 if (s->ac_pred) { |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3957 if (dc_pred_dir == 0) |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3958 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
|
3959 else |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3960 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
|
3961 } else { |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3962 scan_table = s->intra_scantable.permutated; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3963 } |
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 } else { |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3967 i = -1; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3968 if (!coded) { |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3969 s->block_last_index[n] = i; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3970 return 0; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3971 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3972 if(rvlc) rl = &rvlc_rl_inter; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3973 else rl = &rl_inter; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3974 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3975 scan_table = s->intra_scantable.permutated; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3976 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3977 if(s->mpeg_quant){ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3978 qmul=1; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3979 qadd=0; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3980 if(rvlc){ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3981 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
|
3982 }else{ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3983 rl_vlc = rl_inter.rl_vlc[0]; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3984 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3985 }else{ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3986 qmul = s->qscale << 1; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3987 qadd = (s->qscale - 1) | 1; |
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 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
|
3990 }else{ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3991 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
|
3992 } |
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 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3995 { |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3996 OPEN_READER(re, &s->gb); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3997 for(;;) { |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3998 UPDATE_CACHE(re, &s->gb); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3999 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
|
4000 if (level==0) { |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4001 /* escape */ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4002 if(rvlc){ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4003 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
|
4004 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
|
4005 return -1; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4006 }; SKIP_CACHE(re, &s->gb, 1); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4007 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4008 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
|
4009 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
|
4010 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
|
4011 UPDATE_CACHE(re, &s->gb); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4012 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4013 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
|
4014 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
|
4015 return -1; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4016 }; SKIP_CACHE(re, &s->gb, 1); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4017 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4018 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
|
4019 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4020 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
|
4021 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
|
4022 return -1; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4023 }; SKIP_CACHE(re, &s->gb, 5); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4024 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4025 level= level * qmul + qadd; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4026 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
|
4027 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
|
4028 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4029 i+= run + 1; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4030 if(last) i+=192; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4031 }else{ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4032 int cache; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4033 cache= GET_CACHE(re, &s->gb); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4034 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4035 if(IS_3IV1) |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4036 cache ^= 0xC0000000; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4037 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4038 if (cache&0x80000000) { |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4039 if (cache&0x40000000) { |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4040 /* third escape */ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4041 SKIP_CACHE(re, &s->gb, 2); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4042 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
|
4043 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
|
4044 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
|
4045 UPDATE_CACHE(re, &s->gb); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4046 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4047 if(IS_3IV1){ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4048 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
|
4049 }else{ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4050 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
|
4051 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
|
4052 return -1; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4053 }; SKIP_CACHE(re, &s->gb, 1); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4054 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4055 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
|
4056 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4057 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
|
4058 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
|
4059 return -1; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4060 }; LAST_SKIP_CACHE(re, &s->gb, 1); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4061 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4062 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
|
4063 } |
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 0 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4066 if(s->error_recognition >= FF_ER_COMPLIANT){ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4067 const int abs_level= FFABS(level); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4068 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
|
4069 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
|
4070 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
|
4071 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
|
4072 return -1; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4073 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4074 if(s->error_recognition > FF_ER_COMPLIANT){ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4075 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
|
4076 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
|
4077 return -1; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4078 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4079 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
|
4080 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
|
4081 return -1; |
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 } |
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 #endif |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4087 if (level>0) level= level * qmul + qadd; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4088 else level= level * qmul - qadd; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4089 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4090 if((unsigned)(level + 2048) > 4095){ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4091 if(s->error_recognition > FF_ER_COMPLIANT){ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4092 if(level > 2560 || level<-2560){ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4093 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
|
4094 return -1; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4095 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4096 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4097 level= level<0 ? -2048 : 2047; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4098 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4099 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4100 i+= run + 1; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4101 if(last) i+=192; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4102 } else { |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4103 /* second escape */ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4104 #if MIN_CACHE_BITS < 20 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4105 LAST_SKIP_BITS(re, &s->gb, 2); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4106 UPDATE_CACHE(re, &s->gb); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4107 #else |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4108 SKIP_BITS(re, &s->gb, 2); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4109 #endif |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4110 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
|
4111 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
|
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 } else { |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4116 /* first escape */ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4117 #if MIN_CACHE_BITS < 19 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4118 LAST_SKIP_BITS(re, &s->gb, 1); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4119 UPDATE_CACHE(re, &s->gb); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4120 #else |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4121 SKIP_BITS(re, &s->gb, 1); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4122 #endif |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4123 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
|
4124 i+= run; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4125 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
|
4126 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
|
4127 LAST_SKIP_BITS(re, &s->gb, 1); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4128 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4129 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4130 } else { |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4131 i+= run; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4132 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
|
4133 LAST_SKIP_BITS(re, &s->gb, 1); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4134 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4135 if (i > 62){ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4136 i-= 192; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4137 if(i&(~63)){ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4138 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
|
4139 return -1; |
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 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4142 block[scan_table[i]] = level; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4143 break; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4144 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4145 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4146 block[scan_table[i]] = level; |
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 CLOSE_READER(re, &s->gb); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4149 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4150 not_coded: |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4151 if (intra) { |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4152 if(!s->use_intra_dc_vlc){ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4153 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
|
4154 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4155 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
|
4156 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4157 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4158 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
|
4159 if (s->ac_pred) { |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4160 i = 63; /* XXX: not optimal */ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4161 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4162 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4163 s->block_last_index[n] = i; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4164 return 0; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4165 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4166 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4167 /** |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
4168 * decode partition C of one MB. |
6524 | 4169 * @return <0 if an error occurred |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
4170 */ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
4171 static int mpeg4_decode_partitioned_mb(MpegEncContext *s, DCTELEM block[6][64]) |
453 | 4172 { |
4173 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
|
4174 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
|
4175 |
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
|
4176 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
|
4177 cbp = s->cbp_table[xy]; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
4178 |
3282 | 4179 s->use_intra_dc_vlc= s->qscale < s->intra_dc_threshold; |
4180 | |
903 | 4181 if(s->current_picture.qscale_table[xy] != s->qscale){ |
1652 | 4182 ff_set_qscale(s, s->current_picture.qscale_table[xy] ); |
453 | 4183 } |
2967 | 4184 |
6481 | 4185 if (s->pict_type == FF_P_TYPE || s->pict_type==FF_S_TYPE) { |
453 | 4186 int i; |
4187 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
|
4188 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
|
4189 s->mv[0][i][1] = s->current_picture.motion_val[0][ s->block_index[i] ][1]; |
453 | 4190 } |
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
|
4191 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
|
4192 |
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 if (IS_SKIP(mb_type)) { |
453 | 4194 /* skip mb */ |
4195 for(i=0;i<6;i++) | |
4196 s->block_last_index[i] = -1; | |
4197 s->mv_dir = MV_DIR_FORWARD; | |
4198 s->mv_type = MV_TYPE_16X16; | |
6481 | 4199 if(s->pict_type==FF_S_TYPE && s->vol_sprite_usage==GMC_SPRITE){ |
453 | 4200 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
|
4201 s->mb_skipped = 0; |
453 | 4202 }else{ |
4203 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
|
4204 s->mb_skipped = 1; |
453 | 4205 } |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
4206 }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
|
4207 s->ac_pred = IS_ACPRED(s->current_picture.mb_type[xy]); |
453 | 4208 }else if(!s->mb_intra){ |
4209 // s->mcsel= 0; //FIXME do we need to init that | |
2967 | 4210 |
453 | 4211 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
|
4212 if (IS_8X8(mb_type)) { |
453 | 4213 s->mv_type = MV_TYPE_8X8; |
4214 } else { | |
4215 s->mv_type = MV_TYPE_16X16; | |
4216 } | |
4217 } | |
4218 } else { /* I-Frame */ | |
4219 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
|
4220 s->ac_pred = IS_ACPRED(s->current_picture.mb_type[xy]); |
1132 | 4221 } |
4222 | |
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
|
4223 if (!IS_SKIP(mb_type)) { |
1132 | 4224 int i; |
2632 | 4225 s->dsp.clear_blocks(s->block[0]); |
453 | 4226 /* decode each block */ |
4227 for (i = 0; i < 6; i++) { | |
1132 | 4228 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
|
4229 av_log(s->avctx, AV_LOG_ERROR, "texture corrupted at %d %d %d\n", s->mb_x, s->mb_y, s->mb_intra); |
453 | 4230 return -1; |
4231 } | |
718 | 4232 cbp+=cbp; |
453 | 4233 } |
4234 } | |
290 | 4235 |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
4236 /* per-MB end of slice check */ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
4237 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
4238 if(--s->mb_num_left <= 0){ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
4239 if(mpeg4_is_resync(s)) |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
4240 return SLICE_END; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
4241 else |
2967 | 4242 return SLICE_NOEND; |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
4243 }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
|
4244 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
|
4245 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
|
4246 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
|
4247 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
|
4248 } |
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
|
4249 return SLICE_OK; |
619
2be2cc8fd0a1
mpeg4 interlaced decoding support (not completly implemented/tested due to lack of samples)
michaelni
parents:
617
diff
changeset
|
4250 } |
2be2cc8fd0a1
mpeg4 interlaced decoding support (not completly implemented/tested due to lack of samples)
michaelni
parents:
617
diff
changeset
|
4251 } |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
4252 |
10752
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4253 /* Decodes RVLC of H.263+ UMV */ |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4254 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
|
4255 { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4256 int code = 0, sign; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4257 |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4258 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
|
4259 return pred; |
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 code = 2 + get_bits1(&s->gb); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4262 |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4263 while (get_bits1(&s->gb)) |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4264 { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4265 code <<= 1; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4266 code += get_bits1(&s->gb); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4267 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4268 sign = code & 1; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4269 code >>= 1; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4270 |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4271 code = (sign) ? (pred - code) : (pred + code); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4272 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
|
4273 return code; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4274 |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4275 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4276 |
1633 | 4277 /** |
4278 * read the next MVs for OBMC. yes this is a ugly hack, feel free to send a patch :) | |
4279 */ | |
4280 static void preview_obmc(MpegEncContext *s){ | |
4281 GetBitContext gb= s->gb; | |
2967 | 4282 |
1633 | 4283 int cbpc, i, pred_x, pred_y, mx, my; |
4284 int16_t *mot_val; | |
4285 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
|
4286 const int stride= s->b8_stride*2; |
2967 | 4287 |
1633 | 4288 for(i=0; i<4; i++) |
4289 s->block_index[i]+= 2; | |
4290 for(i=4; i<6; i++) | |
4291 s->block_index[i]+= 1; | |
4292 s->mb_x++; | |
2967 | 4293 |
6481 | 4294 assert(s->pict_type == FF_P_TYPE); |
1633 | 4295 |
4296 do{ | |
4297 if (get_bits1(&s->gb)) { | |
4298 /* 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
|
4299 mot_val = s->current_picture.motion_val[0][ s->block_index[0] ]; |
2967 | 4300 mot_val[0 ]= mot_val[2 ]= |
1633 | 4301 mot_val[0+stride]= mot_val[2+stride]= 0; |
4302 mot_val[1 ]= mot_val[3 ]= | |
4303 mot_val[1+stride]= mot_val[3+stride]= 0; | |
2967 | 4304 |
1633 | 4305 s->current_picture.mb_type[xy]= MB_TYPE_SKIP | MB_TYPE_16x16 | MB_TYPE_L0; |
4306 goto end; | |
4307 } | |
4308 cbpc = get_vlc2(&s->gb, inter_MCBPC_vlc.table, INTER_MCBPC_VLC_BITS, 2); | |
4309 }while(cbpc == 20); | |
2967 | 4310 |
1633 | 4311 if(cbpc & 4){ |
4312 s->current_picture.mb_type[xy]= MB_TYPE_INTRA; | |
4313 }else{ | |
4314 get_vlc2(&s->gb, cbpy_vlc.table, CBPY_VLC_BITS, 1); | |
4315 if (cbpc & 8) { | |
1656 | 4316 if(s->modified_quant){ |
4317 if(get_bits1(&s->gb)) skip_bits(&s->gb, 1); | |
4318 else skip_bits(&s->gb, 5); | |
4319 }else | |
4320 skip_bits(&s->gb, 2); | |
1633 | 4321 } |
2967 | 4322 |
1633 | 4323 if ((cbpc & 16) == 0) { |
2967 | 4324 s->current_picture.mb_type[xy]= MB_TYPE_16x16 | MB_TYPE_L0; |
1633 | 4325 /* 16x16 motion prediction */ |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1936
diff
changeset
|
4326 mot_val= h263_pred_motion(s, 0, 0, &pred_x, &pred_y); |
1633 | 4327 if (s->umvplus) |
4328 mx = h263p_decode_umotion(s, pred_x); | |
4329 else | |
1655 | 4330 mx = h263_decode_motion(s, pred_x, 1); |
2967 | 4331 |
1633 | 4332 if (s->umvplus) |
4333 my = h263p_decode_umotion(s, pred_y); | |
4334 else | |
1655 | 4335 my = h263_decode_motion(s, pred_y, 1); |
2967 | 4336 |
4337 mot_val[0 ]= mot_val[2 ]= | |
1633 | 4338 mot_val[0+stride]= mot_val[2+stride]= mx; |
4339 mot_val[1 ]= mot_val[3 ]= | |
4340 mot_val[1+stride]= mot_val[3+stride]= my; | |
4341 } else { | |
2967 | 4342 s->current_picture.mb_type[xy]= MB_TYPE_8x8 | MB_TYPE_L0; |
1633 | 4343 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
|
4344 mot_val = h263_pred_motion(s, i, 0, &pred_x, &pred_y); |
1633 | 4345 if (s->umvplus) |
4346 mx = h263p_decode_umotion(s, pred_x); | |
4347 else | |
1655 | 4348 mx = h263_decode_motion(s, pred_x, 1); |
2967 | 4349 |
1633 | 4350 if (s->umvplus) |
4351 my = h263p_decode_umotion(s, pred_y); | |
2967 | 4352 else |
1655 | 4353 my = h263_decode_motion(s, pred_y, 1); |
1633 | 4354 if (s->umvplus && (mx - pred_x) == 1 && (my - pred_y) == 1) |
4355 skip_bits1(&s->gb); /* Bit stuffing to prevent PSC */ | |
4356 mot_val[0] = mx; | |
4357 mot_val[1] = my; | |
4358 } | |
4359 } | |
4360 } | |
4361 end: | |
2967 | 4362 |
1633 | 4363 for(i=0; i<4; i++) |
4364 s->block_index[i]-= 2; | |
4365 for(i=4; i<6; i++) | |
4366 s->block_index[i]-= 1; | |
4367 s->mb_x--; | |
4368 | |
4369 s->gb= gb; | |
4370 } | |
4371 | |
1656 | 4372 static void h263_decode_dquant(MpegEncContext *s){ |
4373 static const int8_t quant_tab[4] = { -1, -2, 1, 2 }; | |
4374 | |
4375 if(s->modified_quant){ | |
4376 if(get_bits1(&s->gb)) | |
4377 s->qscale= modified_quant_tab[get_bits1(&s->gb)][ s->qscale ]; | |
4378 else | |
4379 s->qscale= get_bits(&s->gb, 5); | |
4380 }else | |
4381 s->qscale += quant_tab[get_bits(&s->gb, 2)]; | |
4382 ff_set_qscale(s, s->qscale); | |
4383 } | |
4384 | |
10752
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4385 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
|
4386 int n, int coded) |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4387 { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4388 int code, level, i, j, last, run; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4389 RLTable *rl = &rl_inter; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4390 const uint8_t *scan_table; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4391 GetBitContext gb= s->gb; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4392 |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4393 scan_table = s->intra_scantable.permutated; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4394 if (s->h263_aic && s->mb_intra) { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4395 rl = &rl_intra_aic; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4396 i = 0; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4397 if (s->ac_pred) { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4398 if (s->h263_aic_dir) |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4399 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
|
4400 else |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4401 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
|
4402 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4403 } else if (s->mb_intra) { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4404 /* DC coef */ |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4405 if(s->codec_id == CODEC_ID_RV10){ |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4406 #if CONFIG_RV10_DECODER |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4407 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
|
4408 int component, diff; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4409 component = (n <= 3 ? 0 : n - 4 + 1); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4410 level = s->last_dc[component]; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4411 if (s->rv10_first_dc_coded[component]) { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4412 diff = rv_decode_dc(s, n); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4413 if (diff == 0xffff) |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4414 return -1; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4415 level += diff; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4416 level = level & 0xff; /* handle wrap round */ |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4417 s->last_dc[component] = level; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4418 } else { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4419 s->rv10_first_dc_coded[component] = 1; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4420 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4421 } else { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4422 level = get_bits(&s->gb, 8); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4423 if (level == 255) |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4424 level = 128; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4425 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4426 #endif |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4427 }else{ |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4428 level = get_bits(&s->gb, 8); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4429 if((level&0x7F) == 0){ |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4430 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
|
4431 if(s->error_recognition >= FF_ER_COMPLIANT) |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4432 return -1; |
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 if (level == 255) |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4435 level = 128; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4436 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4437 block[0] = level; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4438 i = 1; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4439 } else { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4440 i = 0; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4441 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4442 if (!coded) { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4443 if (s->mb_intra && s->h263_aic) |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4444 goto not_coded; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4445 s->block_last_index[n] = i - 1; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4446 return 0; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4447 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4448 retry: |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4449 for(;;) { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4450 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
|
4451 if (code < 0){ |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4452 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
|
4453 return -1; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4454 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4455 if (code == rl->n) { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4456 /* escape */ |
10788 | 4457 if (CONFIG_FLV_DECODER && s->h263_flv > 1) { |
4458 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
|
4459 } else { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4460 last = get_bits1(&s->gb); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4461 run = get_bits(&s->gb, 6); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4462 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
|
4463 if(level == -128){ |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4464 if (s->codec_id == CODEC_ID_RV10) { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4465 /* XXX: should patch encoder too */ |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4466 level = get_sbits(&s->gb, 12); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4467 }else{ |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4468 level = get_bits(&s->gb, 5); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4469 level |= get_sbits(&s->gb, 6)<<5; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4470 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4471 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4472 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4473 } else { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4474 run = rl->table_run[code]; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4475 level = rl->table_level[code]; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4476 last = code >= rl->last; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4477 if (get_bits1(&s->gb)) |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4478 level = -level; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4479 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4480 i += run; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4481 if (i >= 64){ |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4482 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
|
4483 //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
|
4484 rl = &rl_intra_aic; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4485 i = 0; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4486 s->gb= gb; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4487 s->dsp.clear_block(block); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4488 goto retry; |
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 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
|
4491 return -1; |
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 j = scan_table[i]; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4494 block[j] = level; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4495 if (last) |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4496 break; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4497 i++; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4498 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4499 not_coded: |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4500 if (s->mb_intra && s->h263_aic) { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4501 h263_pred_acdc(s, block, n); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4502 i = 63; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4503 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4504 s->block_last_index[n] = i; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4505 return 0; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4506 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4507 |
9103
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4508 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
|
4509 { |
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4510 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
|
4511 int i, mbi; |
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 /* 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
|
4514 * 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
|
4515 */ |
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4516 mbi = s->mb_intra; |
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4517 s->mb_intra = 0; |
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4518 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
|
4519 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
|
4520 return -1; |
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4521 cbp+=cbp; |
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4522 } |
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4523 s->mb_intra = mbi; |
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4524 return 0; |
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 |
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4527 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
|
4528 { |
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4529 int c, mv = 1; |
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4530 |
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4531 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
|
4532 c = get_bits1(gb); |
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4533 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
|
4534 mv = !get_bits1(gb); |
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4535 } 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
|
4536 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
|
4537 c = mv & 1; |
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4538 mv = !!(mv & 2); |
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4539 } |
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4540 if(c) |
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4541 *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
|
4542 return mv; |
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4543 } |
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4544 |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
4545 int ff_h263_decode_mb(MpegEncContext *s, |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
4546 DCTELEM block[6][64]) |
0 | 4547 { |
4548 int cbpc, cbpy, i, cbp, pred_x, pred_y, mx, my, dquant; | |
1064 | 4549 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
|
4550 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
|
4551 int cbpb = 0, pb_mv_count = 0; |
2967 | 4552 |
1649
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4553 assert(!s->h263_pred); |
2967 | 4554 |
6481 | 4555 if (s->pict_type == FF_P_TYPE) { |
1649
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4556 do{ |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4557 if (get_bits1(&s->gb)) { |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4558 /* skip mb */ |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4559 s->mb_intra = 0; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4560 for(i=0;i<6;i++) |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4561 s->block_last_index[i] = -1; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4562 s->mv_dir = MV_DIR_FORWARD; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4563 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
|
4564 s->current_picture.mb_type[xy]= MB_TYPE_SKIP | MB_TYPE_16x16 | MB_TYPE_L0; |
255 | 4565 s->mv[0][0][0] = 0; |
4566 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
|
4567 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
|
4568 goto end; |
255 | 4569 } |
1649
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4570 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
|
4571 if (cbpc < 0){ |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4572 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
|
4573 return -1; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4574 } |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4575 }while(cbpc == 20); |
2967 | 4576 |
2632 | 4577 s->dsp.clear_blocks(s->block[0]); |
2967 | 4578 |
0 | 4579 dquant = cbpc & 8; |
4580 s->mb_intra = ((cbpc & 4) != 0); | |
262 | 4581 if (s->mb_intra) goto intra; |
2967 | 4582 |
9103
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4583 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
|
4584 pb_mv_count = h263_get_modb(&s->gb, s->pb_frame, &cbpb); |
544 | 4585 cbpy = get_vlc2(&s->gb, cbpy_vlc.table, CBPY_VLC_BITS, 1); |
2967 | 4586 |
1637 | 4587 if(s->alt_inter_vlc==0 || (cbpc & 3)!=3) |
4588 cbpy ^= 0xF; | |
2967 | 4589 |
1637 | 4590 cbp = (cbpc & 3) | (cbpy << 2); |
0 | 4591 if (dquant) { |
1656 | 4592 h263_decode_dquant(s); |
0 | 4593 } |
2967 | 4594 |
1649
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4595 s->mv_dir = MV_DIR_FORWARD; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4596 if ((cbpc & 16) == 0) { |
2967 | 4597 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
|
4598 /* 16x16 motion prediction */ |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4599 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
|
4600 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
|
4601 if (s->umvplus) |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4602 mx = h263p_decode_umotion(s, pred_x); |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4603 else |
1655 | 4604 mx = h263_decode_motion(s, pred_x, 1); |
2967 | 4605 |
1649
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4606 if (mx >= 0xffff) |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4607 return -1; |
2967 | 4608 |
1649
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4609 if (s->umvplus) |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4610 my = h263p_decode_umotion(s, pred_y); |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4611 else |
1655 | 4612 my = h263_decode_motion(s, pred_y, 1); |
2967 | 4613 |
1649
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4614 if (my >= 0xffff) |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4615 return -1; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4616 s->mv[0][0][0] = mx; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4617 s->mv[0][0][1] = my; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4618 |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4619 if (s->umvplus && (mx - pred_x) == 1 && (my - pred_y) == 1) |
2967 | 4620 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
|
4621 } else { |
2967 | 4622 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
|
4623 s->mv_type = MV_TYPE_8X8; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4624 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
|
4625 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
|
4626 if (s->umvplus) |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4627 mx = h263p_decode_umotion(s, pred_x); |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4628 else |
1655 | 4629 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
|
4630 if (mx >= 0xffff) |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4631 return -1; |
2967 | 4632 |
1649
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4633 if (s->umvplus) |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4634 my = h263p_decode_umotion(s, pred_y); |
2967 | 4635 else |
1655 | 4636 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
|
4637 if (my >= 0xffff) |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4638 return -1; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4639 s->mv[0][i][0] = mx; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4640 s->mv[0][i][1] = my; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4641 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
|
4642 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
|
4643 mot_val[0] = mx; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4644 mot_val[1] = my; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4645 } |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4646 } |
6481 | 4647 } else if(s->pict_type==FF_B_TYPE) { |
1655 | 4648 int mb_type; |
4649 const int stride= s->b8_stride; | |
1701 | 4650 int16_t *mot_val0 = s->current_picture.motion_val[0][ 2*(s->mb_x + s->mb_y*stride) ]; |
4651 int16_t *mot_val1 = s->current_picture.motion_val[1][ 2*(s->mb_x + s->mb_y*stride) ]; | |
1655 | 4652 // const int mv_xy= s->mb_x + 1 + s->mb_y * s->mb_stride; |
4653 | |
2967 | 4654 //FIXME ugly |
4655 mot_val0[0 ]= mot_val0[2 ]= mot_val0[0+2*stride]= mot_val0[2+2*stride]= | |
4656 mot_val0[1 ]= mot_val0[3 ]= mot_val0[1+2*stride]= mot_val0[3+2*stride]= | |
4657 mot_val1[0 ]= mot_val1[2 ]= mot_val1[0+2*stride]= mot_val1[2+2*stride]= | |
1701 | 4658 mot_val1[1 ]= mot_val1[3 ]= mot_val1[1+2*stride]= mot_val1[3+2*stride]= 0; |
1655 | 4659 |
4660 do{ | |
4661 mb_type= get_vlc2(&s->gb, h263_mbtype_b_vlc.table, H263_MBTYPE_B_VLC_BITS, 2); | |
4662 if (mb_type < 0){ | |
4663 av_log(s->avctx, AV_LOG_ERROR, "b mb_type damaged at %d %d\n", s->mb_x, s->mb_y); | |
4664 return -1; | |
4665 } | |
4666 | |
4667 mb_type= h263_mb_type_b_map[ mb_type ]; | |
4668 }while(!mb_type); | |
4669 | |
4670 s->mb_intra = IS_INTRA(mb_type); | |
4671 if(HAS_CBP(mb_type)){ | |
2632 | 4672 s->dsp.clear_blocks(s->block[0]); |
1655 | 4673 cbpc = get_vlc2(&s->gb, cbpc_b_vlc.table, CBPC_B_VLC_BITS, 1); |
4674 if(s->mb_intra){ | |
4675 dquant = IS_QUANT(mb_type); | |
4676 goto intra; | |
4677 } | |
4678 | |
4679 cbpy = get_vlc2(&s->gb, cbpy_vlc.table, CBPY_VLC_BITS, 1); | |
4680 | |
4681 if (cbpy < 0){ | |
4682 av_log(s->avctx, AV_LOG_ERROR, "b cbpy damaged at %d %d\n", s->mb_x, s->mb_y); | |
4683 return -1; | |
4684 } | |
2967 | 4685 |
1655 | 4686 if(s->alt_inter_vlc==0 || (cbpc & 3)!=3) |
4687 cbpy ^= 0xF; | |
2967 | 4688 |
1655 | 4689 cbp = (cbpc & 3) | (cbpy << 2); |
4690 }else | |
4691 cbp=0; | |
2967 | 4692 |
1655 | 4693 assert(!s->mb_intra); |
4694 | |
4695 if(IS_QUANT(mb_type)){ | |
1656 | 4696 h263_decode_dquant(s); |
1655 | 4697 } |
4698 | |
4699 if(IS_DIRECT(mb_type)){ | |
4700 s->mv_dir = MV_DIR_FORWARD | MV_DIR_BACKWARD | MV_DIRECT; | |
4701 mb_type |= ff_mpeg4_set_direct_mv(s, 0, 0); | |
4702 }else{ | |
4703 s->mv_dir = 0; | |
4704 s->mv_type= MV_TYPE_16X16; | |
4705 //FIXME UMV | |
4706 | |
4707 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
|
4708 int16_t *mot_val= h263_pred_motion(s, 0, 0, &mx, &my); |
1655 | 4709 s->mv_dir = MV_DIR_FORWARD; |
4710 | |
4711 mx = h263_decode_motion(s, mx, 1); | |
4712 my = h263_decode_motion(s, my, 1); | |
2967 | 4713 |
1655 | 4714 s->mv[0][0][0] = mx; |
4715 s->mv[0][0][1] = my; | |
1701 | 4716 mot_val[0 ]= mot_val[2 ]= mot_val[0+2*stride]= mot_val[2+2*stride]= mx; |
4717 mot_val[1 ]= mot_val[3 ]= mot_val[1+2*stride]= mot_val[3+2*stride]= my; | |
1655 | 4718 } |
2967 | 4719 |
1655 | 4720 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
|
4721 int16_t *mot_val= h263_pred_motion(s, 0, 1, &mx, &my); |
1655 | 4722 s->mv_dir |= MV_DIR_BACKWARD; |
2967 | 4723 |
1655 | 4724 mx = h263_decode_motion(s, mx, 1); |
4725 my = h263_decode_motion(s, my, 1); | |
1701 | 4726 |
1655 | 4727 s->mv[1][0][0] = mx; |
4728 s->mv[1][0][1] = my; | |
1701 | 4729 mot_val[0 ]= mot_val[2 ]= mot_val[0+2*stride]= mot_val[2+2*stride]= mx; |
4730 mot_val[1 ]= mot_val[3 ]= mot_val[1+2*stride]= mot_val[3+2*stride]= my; | |
1655 | 4731 } |
4732 } | |
2967 | 4733 |
1655 | 4734 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
|
4735 } else { /* I-Frame */ |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4736 do{ |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4737 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
|
4738 if (cbpc < 0){ |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4739 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
|
4740 return -1; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4741 } |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4742 }while(cbpc == 8); |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4743 |
2632 | 4744 s->dsp.clear_blocks(s->block[0]); |
4745 | |
1649
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4746 dquant = cbpc & 4; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4747 s->mb_intra = 1; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4748 intra: |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4749 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
|
4750 if (s->h263_aic) { |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4751 s->ac_pred = get_bits1(&s->gb); |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4752 if(s->ac_pred){ |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4753 s->current_picture.mb_type[xy]= MB_TYPE_INTRA | MB_TYPE_ACPRED; |
2967 | 4754 |
1649
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4755 s->h263_aic_dir = get_bits1(&s->gb); |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4756 } |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4757 }else |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4758 s->ac_pred = 0; |
2967 | 4759 |
9103
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4760 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
|
4761 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
|
4762 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
|
4763 if(cbpy<0){ |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4764 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
|
4765 return -1; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4766 } |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4767 cbp = (cbpc & 3) | (cbpy << 2); |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4768 if (dquant) { |
1656 | 4769 h263_decode_dquant(s); |
1649
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4770 } |
9103
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4771 |
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4772 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
|
4773 } |
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4774 |
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4775 while(pb_mv_count--){ |
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4776 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
|
4777 h263_decode_motion(s, 0, 1); |
9093 | 4778 } |
4779 | |
4780 /* decode each block */ | |
4781 for (i = 0; i < 6; i++) { | |
4782 if (h263_decode_block(s, block[i], i, cbp&32) < 0) | |
4783 return -1; | |
4784 cbp+=cbp; | |
4785 } | |
4786 | |
9103
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4787 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
|
4788 return -1; |
9093 | 4789 if(s->obmc && !s->mb_intra){ |
4790 if(s->pict_type == FF_P_TYPE && s->mb_x+1<s->mb_width && s->mb_num_left != 1) | |
4791 preview_obmc(s); | |
1649
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4792 } |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4793 end: |
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 /* per-MB end of slice check */ |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4796 { |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4797 int v= show_bits(&s->gb, 16); |
2967 | 4798 |
1649
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4799 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
|
4800 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
|
4801 } |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4802 |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4803 if(v==0) |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4804 return SLICE_END; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4805 } |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4806 |
2967 | 4807 return SLICE_OK; |
1649
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4808 } |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4809 |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4810 int ff_mpeg4_decode_mb(MpegEncContext *s, |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4811 DCTELEM block[6][64]) |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4812 { |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4813 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
|
4814 int16_t *mot_val; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4815 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
|
4816 const int xy= s->mb_x + s->mb_y * s->mb_stride; |
2967 | 4817 |
1649
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4818 assert(s->h263_pred); |
2967 | 4819 |
6481 | 4820 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
|
4821 do{ |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4822 if (get_bits1(&s->gb)) { |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4823 /* skip mb */ |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4824 s->mb_intra = 0; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4825 for(i=0;i<6;i++) |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4826 s->block_last_index[i] = -1; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4827 s->mv_dir = MV_DIR_FORWARD; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4828 s->mv_type = MV_TYPE_16X16; |
6481 | 4829 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
|
4830 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
|
4831 s->mcsel=1; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4832 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
|
4833 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
|
4834 |
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
|
4835 s->mb_skipped = 0; |
1649
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4836 }else{ |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4837 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
|
4838 s->mcsel=0; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4839 s->mv[0][0][0] = 0; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4840 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
|
4841 s->mb_skipped = 1; |
1649
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4842 } |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4843 goto end; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4844 } |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4845 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
|
4846 if (cbpc < 0){ |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4847 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
|
4848 return -1; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4849 } |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4850 }while(cbpc == 20); |
2967 | 4851 |
2632 | 4852 s->dsp.clear_blocks(s->block[0]); |
1649
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4853 dquant = cbpc & 8; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4854 s->mb_intra = ((cbpc & 4) != 0); |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4855 if (s->mb_intra) goto intra; |
2967 | 4856 |
6481 | 4857 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
|
4858 s->mcsel= get_bits1(&s->gb); |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4859 else s->mcsel= 0; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4860 cbpy = get_vlc2(&s->gb, cbpy_vlc.table, CBPY_VLC_BITS, 1) ^ 0x0F; |
2967 | 4861 |
1649
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4862 cbp = (cbpc & 3) | (cbpy << 2); |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4863 if (dquant) { |
1652 | 4864 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
|
4865 } |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
4866 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
|
4867 s->interlaced_dct= get_bits1(&s->gb); |
2967 | 4868 |
0 | 4869 s->mv_dir = MV_DIR_FORWARD; |
4870 if ((cbpc & 16) == 0) { | |
619
2be2cc8fd0a1
mpeg4 interlaced decoding support (not completly implemented/tested due to lack of samples)
michaelni
parents:
617
diff
changeset
|
4871 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
|
4872 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
|
4873 /* 16x16 global motion prediction */ |
2be2cc8fd0a1
mpeg4 interlaced decoding support (not completly implemented/tested due to lack of samples)
michaelni
parents:
617
diff
changeset
|
4874 s->mv_type = MV_TYPE_16X16; |
753 | 4875 mx= get_amv(s, 0); |
4876 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
|
4877 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
|
4878 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
|
4879 }else if((!s->progressive_sequence) && get_bits1(&s->gb)){ |
2967 | 4880 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
|
4881 /* 16x8 field motion prediction */ |
2be2cc8fd0a1
mpeg4 interlaced decoding support (not completly implemented/tested due to lack of samples)
michaelni
parents:
617
diff
changeset
|
4882 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
|
4883 |
2be2cc8fd0a1
mpeg4 interlaced decoding support (not completly implemented/tested due to lack of samples)
michaelni
parents:
617
diff
changeset
|
4884 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
|
4885 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
|
4886 |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1936
diff
changeset
|
4887 h263_pred_motion(s, 0, 0, &pred_x, &pred_y); |
2967 | 4888 |
619
2be2cc8fd0a1
mpeg4 interlaced decoding support (not completly implemented/tested due to lack of samples)
michaelni
parents:
617
diff
changeset
|
4889 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
|
4890 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
|
4891 if (mx >= 0xffff) |
2be2cc8fd0a1
mpeg4 interlaced decoding support (not completly implemented/tested due to lack of samples)
michaelni
parents:
617
diff
changeset
|
4892 return -1; |
2967 | 4893 |
619
2be2cc8fd0a1
mpeg4 interlaced decoding support (not completly implemented/tested due to lack of samples)
michaelni
parents:
617
diff
changeset
|
4894 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
|
4895 if (my >= 0xffff) |
2be2cc8fd0a1
mpeg4 interlaced decoding support (not completly implemented/tested due to lack of samples)
michaelni
parents:
617
diff
changeset
|
4896 return -1; |
2be2cc8fd0a1
mpeg4 interlaced decoding support (not completly implemented/tested due to lack of samples)
michaelni
parents:
617
diff
changeset
|
4897 |
2be2cc8fd0a1
mpeg4 interlaced decoding support (not completly implemented/tested due to lack of samples)
michaelni
parents:
617
diff
changeset
|
4898 s->mv[0][i][0] = mx; |
661 | 4899 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
|
4900 } |
2be2cc8fd0a1
mpeg4 interlaced decoding support (not completly implemented/tested due to lack of samples)
michaelni
parents:
617
diff
changeset
|
4901 }else{ |
2967 | 4902 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
|
4903 /* 16x16 motion prediction */ |
2be2cc8fd0a1
mpeg4 interlaced decoding support (not completly implemented/tested due to lack of samples)
michaelni
parents:
617
diff
changeset
|
4904 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
|
4905 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
|
4906 mx = h263_decode_motion(s, pred_x, s->f_code); |
2967 | 4907 |
619
2be2cc8fd0a1
mpeg4 interlaced decoding support (not completly implemented/tested due to lack of samples)
michaelni
parents:
617
diff
changeset
|
4908 if (mx >= 0xffff) |
2be2cc8fd0a1
mpeg4 interlaced decoding support (not completly implemented/tested due to lack of samples)
michaelni
parents:
617
diff
changeset
|
4909 return -1; |
2967 | 4910 |
1649
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4911 my = h263_decode_motion(s, pred_y, s->f_code); |
2967 | 4912 |
619
2be2cc8fd0a1
mpeg4 interlaced decoding support (not completly implemented/tested due to lack of samples)
michaelni
parents:
617
diff
changeset
|
4913 if (my >= 0xffff) |
2be2cc8fd0a1
mpeg4 interlaced decoding support (not completly implemented/tested due to lack of samples)
michaelni
parents:
617
diff
changeset
|
4914 return -1; |
2be2cc8fd0a1
mpeg4 interlaced decoding support (not completly implemented/tested due to lack of samples)
michaelni
parents:
617
diff
changeset
|
4915 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
|
4916 s->mv[0][0][1] = my; |
255 | 4917 } |
0 | 4918 } else { |
2967 | 4919 s->current_picture.mb_type[xy]= MB_TYPE_8x8 | MB_TYPE_L0; |
0 | 4920 s->mv_type = MV_TYPE_8X8; |
4921 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
|
4922 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
|
4923 mx = h263_decode_motion(s, pred_x, s->f_code); |
0 | 4924 if (mx >= 0xffff) |
4925 return -1; | |
2967 | 4926 |
1649
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4927 my = h263_decode_motion(s, pred_y, s->f_code); |
0 | 4928 if (my >= 0xffff) |
4929 return -1; | |
4930 s->mv[0][i][0] = mx; | |
4931 s->mv[0][i][1] = my; | |
4932 mot_val[0] = mx; | |
4933 mot_val[1] = my; | |
4934 } | |
4935 } | |
6481 | 4936 } else if(s->pict_type==FF_B_TYPE) { |
262 | 4937 int modb1; // first bit of modb |
4938 int modb2; // second bit of modb | |
4939 int mb_type; | |
4940 | |
4941 s->mb_intra = 0; //B-frames never contain intra blocks | |
4942 s->mcsel=0; // ... true gmc blocks | |
4943 | |
4944 if(s->mb_x==0){ | |
674 | 4945 for(i=0; i<2; i++){ |
2967 | 4946 s->last_mv[i][0][0]= |
4947 s->last_mv[i][0][1]= | |
4948 s->last_mv[i][1][0]= | |
674 | 4949 s->last_mv[i][1][1]= 0; |
4950 } | |
262 | 4951 } |
4952 | |
4953 /* 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
|
4954 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
|
4955 |
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
|
4956 if(s->mb_skipped){ |
262 | 4957 /* skip mb */ |
4958 for(i=0;i<6;i++) | |
4959 s->block_last_index[i] = -1; | |
4960 | |
4961 s->mv_dir = MV_DIR_FORWARD; | |
4962 s->mv_type = MV_TYPE_16X16; | |
4963 s->mv[0][0][0] = 0; | |
4964 s->mv[0][0][1] = 0; | |
4965 s->mv[1][0][0] = 0; | |
4966 s->mv[1][0][1] = 0; | |
2967 | 4967 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
|
4968 goto end; |
262 | 4969 } |
4970 | |
2967 | 4971 modb1= get_bits1(&s->gb); |
666 | 4972 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
|
4973 mb_type= MB_TYPE_DIRECT2 | MB_TYPE_SKIP | MB_TYPE_L0L1; //like MB_TYPE_B_DIRECT but no vectors coded |
666 | 4974 cbp=0; |
4975 }else{ | |
262 | 4976 modb2= get_bits1(&s->gb); |
544 | 4977 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
|
4978 if(mb_type<0){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
4979 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
|
4980 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
|
4981 } |
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
|
4982 mb_type= mb_type_b_map[ mb_type ]; |
666 | 4983 if(modb2) cbp= 0; |
2632 | 4984 else{ |
4985 s->dsp.clear_blocks(s->block[0]); | |
4986 cbp= get_bits(&s->gb, 6); | |
4987 } | |
666 | 4988 |
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
|
4989 if ((!IS_DIRECT(mb_type)) && cbp) { |
262 | 4990 if(get_bits1(&s->gb)){ |
1652 | 4991 ff_set_qscale(s, s->qscale + get_bits1(&s->gb)*4 - 2); |
262 | 4992 } |
4993 } | |
664 | 4994 |
4995 if(!s->progressive_sequence){ | |
4996 if(cbp) | |
4997 s->interlaced_dct= get_bits1(&s->gb); | |
4998 | |
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
|
4999 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
|
5000 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
|
5001 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
|
5002 |
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 if(USES_LIST(mb_type, 0)){ |
667 | 5004 s->field_select[0][0]= get_bits1(&s->gb); |
5005 s->field_select[0][1]= get_bits1(&s->gb); | |
5006 } | |
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
|
5007 if(USES_LIST(mb_type, 1)){ |
667 | 5008 s->field_select[1][0]= get_bits1(&s->gb); |
5009 s->field_select[1][1]= get_bits1(&s->gb); | |
5010 } | |
5011 } | |
666 | 5012 } |
5013 | |
667 | 5014 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
|
5015 if((mb_type & (MB_TYPE_DIRECT2|MB_TYPE_INTERLACED)) == 0){ |
666 | 5016 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
|
5017 |
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
|
5018 if(USES_LIST(mb_type, 0)){ |
666 | 5019 s->mv_dir = MV_DIR_FORWARD; |
5020 | |
5021 mx = h263_decode_motion(s, s->last_mv[0][0][0], s->f_code); | |
5022 my = h263_decode_motion(s, s->last_mv[0][0][1], s->f_code); | |
5023 s->last_mv[0][1][0]= s->last_mv[0][0][0]= s->mv[0][0][0] = mx; | |
5024 s->last_mv[0][1][1]= s->last_mv[0][0][1]= s->mv[0][0][1] = my; | |
667 | 5025 } |
2967 | 5026 |
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
|
5027 if(USES_LIST(mb_type, 1)){ |
666 | 5028 s->mv_dir |= MV_DIR_BACKWARD; |
5029 | |
5030 mx = h263_decode_motion(s, s->last_mv[1][0][0], s->b_code); | |
5031 my = h263_decode_motion(s, s->last_mv[1][0][1], s->b_code); | |
5032 s->last_mv[1][1][0]= s->last_mv[1][0][0]= s->mv[1][0][0] = mx; | |
5033 s->last_mv[1][1][1]= s->last_mv[1][0][1]= s->mv[1][0][1] = my; | |
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 }else if(!IS_DIRECT(mb_type)){ |
666 | 5036 s->mv_type= MV_TYPE_FIELD; |
667 | 5037 |
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
|
5038 if(USES_LIST(mb_type, 0)){ |
666 | 5039 s->mv_dir = MV_DIR_FORWARD; |
2967 | 5040 |
666 | 5041 for(i=0; i<2; i++){ |
5042 mx = h263_decode_motion(s, s->last_mv[0][i][0] , s->f_code); | |
5043 my = h263_decode_motion(s, s->last_mv[0][i][1]/2, s->f_code); | |
5044 s->last_mv[0][i][0]= s->mv[0][i][0] = mx; | |
5045 s->last_mv[0][i][1]= (s->mv[0][i][1] = my)*2; | |
5046 } | |
667 | 5047 } |
2967 | 5048 |
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
|
5049 if(USES_LIST(mb_type, 1)){ |
666 | 5050 s->mv_dir |= MV_DIR_BACKWARD; |
5051 | |
5052 for(i=0; i<2; i++){ | |
5053 mx = h263_decode_motion(s, s->last_mv[1][i][0] , s->b_code); | |
5054 my = h263_decode_motion(s, s->last_mv[1][i][1]/2, s->b_code); | |
5055 s->last_mv[1][i][0]= s->mv[1][i][0] = mx; | |
5056 s->last_mv[1][i][1]= (s->mv[1][i][1] = my)*2; | |
664 | 5057 } |
5058 } | |
5059 } | |
5060 } | |
2967 | 5061 |
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
|
5062 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
|
5063 if(IS_SKIP(mb_type)) |
666 | 5064 mx=my=0; |
5065 else{ | |
5066 mx = h263_decode_motion(s, 0, 1); | |
5067 my = h263_decode_motion(s, 0, 1); | |
5068 } | |
2967 | 5069 |
262 | 5070 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
|
5071 mb_type |= ff_mpeg4_set_direct_mv(s, mx, my); |
664 | 5072 } |
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
|
5073 s->current_picture.mb_type[xy]= mb_type; |
262 | 5074 } else { /* I-Frame */ |
1482 | 5075 do{ |
5076 cbpc = get_vlc2(&s->gb, intra_MCBPC_vlc.table, INTRA_MCBPC_VLC_BITS, 2); | |
5077 if (cbpc < 0){ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
5078 av_log(s->avctx, AV_LOG_ERROR, "I cbpc damaged at %d %d\n", s->mb_x, s->mb_y); |
1482 | 5079 return -1; |
5080 } | |
5081 }while(cbpc == 8); | |
5082 | |
262 | 5083 dquant = cbpc & 4; |
5084 s->mb_intra = 1; | |
5085 intra: | |
1649
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
5086 s->ac_pred = get_bits1(&s->gb); |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
5087 if(s->ac_pred) |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
5088 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
|
5089 else |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
5090 s->current_picture.mb_type[xy]= MB_TYPE_INTRA; |
2967 | 5091 |
544 | 5092 cbpy = get_vlc2(&s->gb, cbpy_vlc.table, CBPY_VLC_BITS, 1); |
1482 | 5093 if(cbpy<0){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
5094 av_log(s->avctx, AV_LOG_ERROR, "I cbpy damaged at %d %d\n", s->mb_x, s->mb_y); |
1482 | 5095 return -1; |
5096 } | |
0 | 5097 cbp = (cbpc & 3) | (cbpy << 2); |
3282 | 5098 |
5099 s->use_intra_dc_vlc= s->qscale < s->intra_dc_threshold; | |
5100 | |
0 | 5101 if (dquant) { |
1652 | 5102 ff_set_qscale(s, s->qscale + quant_tab[get_bits(&s->gb, 2)]); |
0 | 5103 } |
2967 | 5104 |
619
2be2cc8fd0a1
mpeg4 interlaced decoding support (not completly implemented/tested due to lack of samples)
michaelni
parents:
617
diff
changeset
|
5105 if(!s->progressive_sequence) |
2be2cc8fd0a1
mpeg4 interlaced decoding support (not completly implemented/tested due to lack of samples)
michaelni
parents:
617
diff
changeset
|
5106 s->interlaced_dct= get_bits1(&s->gb); |
575 | 5107 |
2632 | 5108 s->dsp.clear_blocks(s->block[0]); |
575 | 5109 /* decode each block */ |
1649
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
5110 for (i = 0; i < 6; i++) { |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
5111 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
|
5112 return -1; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
5113 cbp+=cbp; |
575 | 5114 } |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
5115 goto end; |
0 | 5116 } |
5117 | |
5118 /* decode each block */ | |
1649
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
5119 for (i = 0; i < 6; i++) { |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
5120 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
|
5121 return -1; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
5122 cbp+=cbp; |
0 | 5123 } |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
5124 end: |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
5125 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
5126 /* per-MB end of slice check */ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
5127 if(s->codec_id==CODEC_ID_MPEG4){ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
5128 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
|
5129 const int delta= s->mb_x + 1 == s->mb_width ? 2 : 1; |
6481 | 5130 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
|
5131 return SLICE_OK; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
5132 return SLICE_END; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
5133 } |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
5134 } |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
5135 |
2967 | 5136 return SLICE_OK; |
0 | 5137 } |
5138 | |
5139 /* most is hardcoded. should extend to handle all h263 streams */ | |
5140 int h263_decode_picture_header(MpegEncContext *s) | |
5141 { | |
1278
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1273
diff
changeset
|
5142 int format, width, height, i; |
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1273
diff
changeset
|
5143 uint32_t startcode; |
2967 | 5144 |
1278
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1273
diff
changeset
|
5145 align_get_bits(&s->gb); |
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1273
diff
changeset
|
5146 |
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1273
diff
changeset
|
5147 startcode= get_bits(&s->gb, 22-8); |
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1273
diff
changeset
|
5148 |
10535
95f3daa991a2
Use get_bits_left() instead of size_in_bits - get_bits_count().
rbultje
parents:
9999
diff
changeset
|
5149 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
|
5150 startcode = ((startcode << 8) | get_bits(&s->gb, 8)) & 0x003FFFFF; |
2967 | 5151 |
1278
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1273
diff
changeset
|
5152 if(startcode == 0x20) |
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1273
diff
changeset
|
5153 break; |
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1273
diff
changeset
|
5154 } |
2967 | 5155 |
1278
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1273
diff
changeset
|
5156 if (startcode != 0x20) { |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
5157 av_log(s->avctx, AV_LOG_ERROR, "Bad picture start code\n"); |
0 | 5158 return -1; |
355 | 5159 } |
5160 /* temporal reference */ | |
1865 | 5161 i = get_bits(&s->gb, 8); /* picture timestamp */ |
5162 if( (s->picture_number&~0xFF)+i < s->picture_number) | |
5163 i+= 256; | |
2886 | 5164 s->current_picture_ptr->pts= |
1865 | 5165 s->picture_number= (s->picture_number&~0xFF) + i; |
355 | 5166 |
2967 | 5167 /* PTYPE starts here */ |
355 | 5168 if (get_bits1(&s->gb) != 1) { |
5169 /* marker */ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
5170 av_log(s->avctx, AV_LOG_ERROR, "Bad marker\n"); |
355 | 5171 return -1; |
5172 } | |
5173 if (get_bits1(&s->gb) != 0) { | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
5174 av_log(s->avctx, AV_LOG_ERROR, "Bad H263 id\n"); |
2979 | 5175 return -1; /* h263 id */ |
5176 } | |
5177 skip_bits1(&s->gb); /* split screen off */ | |
5178 skip_bits1(&s->gb); /* camera off */ | |
5179 skip_bits1(&s->gb); /* freeze picture release off */ | |
0 | 5180 |
5181 format = get_bits(&s->gb, 3); | |
355 | 5182 /* |
5183 0 forbidden | |
5184 1 sub-QCIF | |
5185 10 QCIF | |
2979 | 5186 7 extended PTYPE (PLUSPTYPE) |
355 | 5187 */ |
0 | 5188 |
161 | 5189 if (format != 7 && format != 6) { |
0 | 5190 s->h263_plus = 0; |
5191 /* H.263v1 */ | |
5192 width = h263_format[format][0]; | |
5193 height = h263_format[format][1]; | |
5194 if (!width) | |
5195 return -1; | |
2967 | 5196 |
6481 | 5197 s->pict_type = FF_I_TYPE + get_bits1(&s->gb); |
0 | 5198 |
2967 | 5199 s->h263_long_vectors = get_bits1(&s->gb); |
0 | 5200 |
355 | 5201 if (get_bits1(&s->gb) != 0) { |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
5202 av_log(s->avctx, AV_LOG_ERROR, "H263 SAC not supported\n"); |
2979 | 5203 return -1; /* SAC: off */ |
355 | 5204 } |
1633 | 5205 s->obmc= get_bits1(&s->gb); /* Advanced prediction mode */ |
5206 s->unrestricted_mv = s->h263_long_vectors || s->obmc; | |
2967 | 5207 |
9104 | 5208 s->pb_frame = get_bits1(&s->gb); |
1644 | 5209 s->chroma_qscale= s->qscale = get_bits(&s->gb, 5); |
2979 | 5210 skip_bits1(&s->gb); /* Continuous Presence Multipoint mode: off */ |
1393 | 5211 |
5212 s->width = width; | |
5213 s->height = height; | |
1865 | 5214 s->avctx->sample_aspect_ratio= (AVRational){12,11}; |
2637 | 5215 s->avctx->time_base= (AVRational){1001, 30000}; |
0 | 5216 } else { |
161 | 5217 int ufep; |
2967 | 5218 |
0 | 5219 /* H.263v2 */ |
161 | 5220 s->h263_plus = 1; |
5221 ufep = get_bits(&s->gb, 3); /* Update Full Extended PTYPE */ | |
355 | 5222 |
2967 | 5223 /* ufep other than 0 and 1 are reserved */ |
161 | 5224 if (ufep == 1) { |
2967 | 5225 /* OPPTYPE */ |
161 | 5226 format = get_bits(&s->gb, 3); |
4652 | 5227 dprintf(s->avctx, "ufep=1, format: %d\n", format); |
1872 | 5228 s->custom_pcf= get_bits1(&s->gb); |
5513 | 5229 s->umvplus = get_bits1(&s->gb); /* Unrestricted Motion Vector */ |
1644 | 5230 if (get_bits1(&s->gb) != 0) { |
5231 av_log(s->avctx, AV_LOG_ERROR, "Syntax-based Arithmetic Coding (SAC) not supported\n"); | |
5232 } | |
1633 | 5233 s->obmc= get_bits1(&s->gb); /* Advanced prediction mode */ |
5234 s->h263_aic = get_bits1(&s->gb); /* Advanced Intra Coding (AIC) */ | |
1644 | 5235 s->loop_filter= get_bits1(&s->gb); |
5236 s->unrestricted_mv = s->umvplus || s->obmc || s->loop_filter; | |
2967 | 5237 |
1661 | 5238 s->h263_slice_structured= get_bits1(&s->gb); |
1278
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1273
diff
changeset
|
5239 if (get_bits1(&s->gb) != 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, "Reference Picture Selection not supported\n"); |
1278
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1273
diff
changeset
|
5241 } |
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1273
diff
changeset
|
5242 if (get_bits1(&s->gb) != 0) { |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
5243 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
|
5244 } |
1637 | 5245 s->alt_inter_vlc= get_bits1(&s->gb); |
1639 | 5246 s->modified_quant= get_bits1(&s->gb); |
1644 | 5247 if(s->modified_quant) |
5248 s->chroma_qscale_table= ff_h263_chroma_qscale_table; | |
2967 | 5249 |
1278
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1273
diff
changeset
|
5250 skip_bits(&s->gb, 1); /* Prevent start code emulation */ |
355 | 5251 |
161 | 5252 skip_bits(&s->gb, 3); /* Reserved */ |
355 | 5253 } else if (ufep != 0) { |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
5254 av_log(s->avctx, AV_LOG_ERROR, "Bad UFEP type (%d)\n", ufep); |
0 | 5255 return -1; |
355 | 5256 } |
2967 | 5257 |
78 | 5258 /* MPPTYPE */ |
1655 | 5259 s->pict_type = get_bits(&s->gb, 3); |
5260 switch(s->pict_type){ | |
6481 | 5261 case 0: s->pict_type= FF_I_TYPE;break; |
5262 case 1: s->pict_type= FF_P_TYPE;break; | |
9104 | 5263 case 2: s->pict_type= FF_P_TYPE;s->pb_frame = 3;break; |
6481 | 5264 case 3: s->pict_type= FF_B_TYPE;break; |
5265 case 7: s->pict_type= FF_I_TYPE;break; //ZYGO | |
1655 | 5266 default: |
0 | 5267 return -1; |
1655 | 5268 } |
250
3449316664b5
- Bug fix on RTYPE (rounding type) not being honoured by H.263+ decoder.
pulento
parents:
249
diff
changeset
|
5269 skip_bits(&s->gb, 2); |
3449316664b5
- Bug fix on RTYPE (rounding type) not being honoured by H.263+ decoder.
pulento
parents:
249
diff
changeset
|
5270 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
|
5271 skip_bits(&s->gb, 4); |
2967 | 5272 |
78 | 5273 /* Get the picture dimensions */ |
161 | 5274 if (ufep) { |
5275 if (format == 6) { | |
5276 /* Custom Picture Format (CPFMT) */ | |
355 | 5277 s->aspect_ratio_info = get_bits(&s->gb, 4); |
4652 | 5278 dprintf(s->avctx, "aspect: %d\n", s->aspect_ratio_info); |
355 | 5279 /* aspect ratios: |
5280 0 - forbidden | |
5281 1 - 1:1 | |
5282 2 - 12:11 (CIF 4:3) | |
5283 3 - 10:11 (525-type 4:3) | |
5284 4 - 16:11 (CIF 16:9) | |
5285 5 - 40:33 (525-type 16:9) | |
5286 6-14 - reserved | |
5287 */ | |
161 | 5288 width = (get_bits(&s->gb, 9) + 1) * 4; |
5289 skip_bits1(&s->gb); | |
5290 height = get_bits(&s->gb, 9) * 4; | |
4652 | 5291 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
|
5292 if (s->aspect_ratio_info == FF_ASPECT_EXTENDED) { |
355 | 5293 /* aspected dimensions */ |
1548 | 5294 s->avctx->sample_aspect_ratio.num= get_bits(&s->gb, 8); |
5295 s->avctx->sample_aspect_ratio.den= get_bits(&s->gb, 8); | |
887 | 5296 }else{ |
1548 | 5297 s->avctx->sample_aspect_ratio= pixel_aspect[s->aspect_ratio_info]; |
355 | 5298 } |
5299 } else { | |
161 | 5300 width = h263_format[format][0]; |
5301 height = h263_format[format][1]; | |
1865 | 5302 s->avctx->sample_aspect_ratio= (AVRational){12,11}; |
161 | 5303 } |
5304 if ((width == 0) || (height == 0)) | |
5305 return -1; | |
5306 s->width = width; | |
5307 s->height = height; | |
1872 | 5308 |
5309 if(s->custom_pcf){ | |
5310 int gcd; | |
2637 | 5311 s->avctx->time_base.den= 1800000; |
5312 s->avctx->time_base.num= 1000 + get_bits1(&s->gb); | |
5313 s->avctx->time_base.num*= get_bits(&s->gb, 7); | |
5314 if(s->avctx->time_base.num == 0){ | |
1872 | 5315 av_log(s, AV_LOG_ERROR, "zero framerate\n"); |
5316 return -1; | |
5317 } | |
8611 | 5318 gcd= av_gcd(s->avctx->time_base.den, s->avctx->time_base.num); |
2637 | 5319 s->avctx->time_base.den /= gcd; |
5320 s->avctx->time_base.num /= gcd; | |
1872 | 5321 }else{ |
2637 | 5322 s->avctx->time_base= (AVRational){1001, 30000}; |
1872 | 5323 } |
5324 } | |
2967 | 5325 |
1872 | 5326 if(s->custom_pcf){ |
5327 skip_bits(&s->gb, 2); //extended Temporal reference | |
5328 } | |
5329 | |
5330 if (ufep) { | |
1089 | 5331 if (s->umvplus) { |
5332 if(get_bits1(&s->gb)==0) /* Unlimited Unrestricted Motion Vectors Indicator (UUI) */ | |
2967 | 5333 skip_bits1(&s->gb); |
161 | 5334 } |
1661 | 5335 if(s->h263_slice_structured){ |
5336 if (get_bits1(&s->gb) != 0) { | |
5337 av_log(s->avctx, AV_LOG_ERROR, "rectangular slices not supported\n"); | |
5338 } | |
5339 if (get_bits1(&s->gb) != 0) { | |
5340 av_log(s->avctx, AV_LOG_ERROR, "unordered slices not supported\n"); | |
5341 } | |
5342 } | |
78 | 5343 } |
2967 | 5344 |
0 | 5345 s->qscale = get_bits(&s->gb, 5); |
5346 } | |
1670 | 5347 |
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
|
5348 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
|
5349 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
|
5350 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
|
5351 |
9104 | 5352 if (s->pb_frame) { |
5353 skip_bits(&s->gb, 3); /* Temporal reference for B-pictures */ | |
5354 if (s->custom_pcf) | |
5355 skip_bits(&s->gb, 2); //extended Temporal reference | |
5356 skip_bits(&s->gb, 2); /* Quantization information for B-pictures */ | |
5357 } | |
5358 | |
0 | 5359 /* PEI */ |
21 | 5360 while (get_bits1(&s->gb) != 0) { |
5361 skip_bits(&s->gb, 8); | |
0 | 5362 } |
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
|
5363 |
1670 | 5364 if(s->h263_slice_structured){ |
5365 if (get_bits1(&s->gb) != 1) { | |
5366 av_log(s->avctx, AV_LOG_ERROR, "SEPB1 marker missing\n"); | |
5367 return -1; | |
5368 } | |
5369 | |
5370 ff_h263_decode_mba(s); | |
5371 | |
5372 if (get_bits1(&s->gb) != 1) { | |
5373 av_log(s->avctx, AV_LOG_ERROR, "SEPB2 marker missing\n"); | |
5374 return -1; | |
5375 } | |
5376 } | |
0 | 5377 s->f_code = 1; |
2967 | 5378 |
498 | 5379 if(s->h263_aic){ |
2967 | 5380 s->y_dc_scale_table= |
1639 | 5381 s->c_dc_scale_table= ff_aic_dc_scale_table; |
498 | 5382 }else{ |
5383 s->y_dc_scale_table= | |
5384 s->c_dc_scale_table= ff_mpeg1_dc_scale_table; | |
5385 } | |
5386 | |
10791 | 5387 ff_h263_show_pict_info(s); |
8612 | 5388 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
|
5389 int i,j; |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
5390 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
|
5391 av_log(s->avctx, AV_LOG_DEBUG, "\n"); |
1584
3615999a7284
dumping funny numbers from first zygo i frame header
michael
parents:
1583
diff
changeset
|
5392 for(i=0; i<13; i++){ |
3615999a7284
dumping funny numbers from first zygo i frame header
michael
parents:
1583
diff
changeset
|
5393 for(j=0; j<3; j++){ |
3615999a7284
dumping funny numbers from first zygo i frame header
michael
parents:
1583
diff
changeset
|
5394 int v= get_bits(&s->gb, 8); |
3615999a7284
dumping funny numbers from first zygo i frame header
michael
parents:
1583
diff
changeset
|
5395 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
|
5396 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
|
5397 } |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
5398 av_log(s->avctx, AV_LOG_DEBUG, "\n"); |
1584
3615999a7284
dumping funny numbers from first zygo i frame header
michael
parents:
1583
diff
changeset
|
5399 } |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
5400 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
|
5401 } |
3615999a7284
dumping funny numbers from first zygo i frame header
michael
parents:
1583
diff
changeset
|
5402 |
0 | 5403 return 0; |
5404 } | |
5405 | |
942 | 5406 static int mpeg4_decode_gop_header(MpegEncContext * s, GetBitContext *gb){ |
5407 int hours, minutes, seconds; | |
5408 | |
5409 hours= get_bits(gb, 5); | |
5410 minutes= get_bits(gb, 6); | |
5411 skip_bits1(gb); | |
5412 seconds= get_bits(gb, 6); | |
5413 | |
5414 s->time_base= seconds + 60*(minutes + 60*hours); | |
5415 | |
5416 skip_bits1(gb); | |
5417 skip_bits1(gb); | |
2967 | 5418 |
942 | 5419 return 0; |
5420 } | |
5421 | |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5422 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
|
5423 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
|
5424 |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5425 /* vol header */ |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5426 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
|
5427 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
|
5428 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
|
5429 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
|
5430 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
|
5431 } else { |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5432 vo_ver_id = 1; |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5433 } |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5434 s->aspect_ratio_info= get_bits(gb, 4); |
2967 | 5435 if(s->aspect_ratio_info == FF_ASPECT_EXTENDED){ |
1548 | 5436 s->avctx->sample_aspect_ratio.num= get_bits(gb, 8); // par_width |
5437 s->avctx->sample_aspect_ratio.den= get_bits(gb, 8); // par_height | |
887 | 5438 }else{ |
1548 | 5439 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
|
5440 } |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5441 |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5442 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
|
5443 int chroma_format= get_bits(gb, 2); |
8690 | 5444 if(chroma_format!=CHROMA_420){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
5445 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
|
5446 } |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5447 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
|
5448 if(get_bits1(gb)){ /* vbv parameters */ |
2979 | 5449 get_bits(gb, 15); /* first_half_bitrate */ |
5450 skip_bits1(gb); /* marker */ | |
5451 get_bits(gb, 15); /* latter_half_bitrate */ | |
5452 skip_bits1(gb); /* marker */ | |
5453 get_bits(gb, 15); /* first_half_vbv_buffer_size */ | |
5454 skip_bits1(gb); /* marker */ | |
5455 get_bits(gb, 3); /* latter_half_vbv_buffer_size */ | |
5456 get_bits(gb, 11); /* first_half_vbv_occupancy */ | |
5457 skip_bits1(gb); /* marker */ | |
5458 get_bits(gb, 15); /* latter_half_vbv_occupancy */ | |
5459 skip_bits1(gb); /* marker */ | |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5460 } |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5461 }else{ |
2646
c735e3e60ca7
Even More spelling errors. patch by (Kevin Baragona <kevinmb500 gawab com)
michael
parents:
2639
diff
changeset
|
5462 // 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
|
5463 if(s->picture_number==0) |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5464 s->low_delay=0; |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5465 } |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5466 |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5467 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
|
5468 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
|
5469 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
|
5470 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
|
5471 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
|
5472 } |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5473 |
1411 | 5474 check_marker(gb, "before time_increment_resolution"); |
2967 | 5475 |
2637 | 5476 s->avctx->time_base.den = get_bits(gb, 16); |
2812 | 5477 if(!s->avctx->time_base.den){ |
5478 av_log(s->avctx, AV_LOG_ERROR, "time_base.den==0\n"); | |
5479 return -1; | |
5480 } | |
2967 | 5481 |
2637 | 5482 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
|
5483 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
|
5484 s->time_increment_bits = 1; |
2967 | 5485 |
1411 | 5486 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
|
5487 |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5488 if (get_bits1(gb) != 0) { /* fixed_vop_rate */ |
2637 | 5489 s->avctx->time_base.num = get_bits(gb, s->time_increment_bits); |
5490 }else | |
5491 s->avctx->time_base.num = 1; | |
5492 | |
2034 | 5493 s->t_frame=0; |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5494 |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5495 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
|
5496 if (s->shape == RECT_SHAPE) { |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5497 skip_bits1(gb); /* marker */ |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5498 width = get_bits(gb, 13); |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5499 skip_bits1(gb); /* marker */ |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5500 height = get_bits(gb, 13); |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5501 skip_bits1(gb); /* marker */ |
8612 | 5502 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
|
5503 s->width = width; |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5504 s->height = height; |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5505 } |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5506 } |
2967 | 5507 |
5508 s->progressive_sequence= | |
1659 | 5509 s->progressive_frame= get_bits1(gb)^1; |
3192 | 5510 s->interlaced_dct=0; |
2967 | 5511 if(!get_bits1(gb) && (s->avctx->debug & FF_DEBUG_PICT_INFO)) |
1644 | 5512 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
|
5513 if (vo_ver_id == 1) { |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5514 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
|
5515 } else { |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5516 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
|
5517 } |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
5518 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
|
5519 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
|
5520 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
|
5521 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
|
5522 skip_bits1(gb); /* marker */ |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5523 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
|
5524 skip_bits1(gb); /* marker */ |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5525 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
|
5526 skip_bits1(gb); /* marker */ |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5527 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
|
5528 skip_bits1(gb); /* marker */ |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5529 } |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5530 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
|
5531 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
|
5532 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
|
5533 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
|
5534 return -1; |
655d25351bfc
fix possibly exploitable stack overflow with num_sprite_warping_points (found by reimar)
michael
parents:
4672
diff
changeset
|
5535 } |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5536 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
|
5537 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
|
5538 if(s->vol_sprite_usage==STATIC_SPRITE) |
2967 | 5539 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
|
5540 } |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5541 // FIXME sadct disable bit if verid!=1 && shape not rect |
2967 | 5542 |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5543 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
|
5544 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
|
5545 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
|
5546 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
|
5547 } else { |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5548 s->quant_precision = 5; |
0 | 5549 } |
2967 | 5550 |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5551 // 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
|
5552 |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5553 if((s->mpeg_quant=get_bits1(gb))){ /* vol_quant_type */ |
1057 | 5554 int i, v; |
2967 | 5555 |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5556 /* load default matrixes */ |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5557 for(i=0; i<64; i++){ |
1092 | 5558 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
|
5559 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
|
5560 s->intra_matrix[j]= v; |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5561 s->chroma_intra_matrix[j]= v; |
2967 | 5562 |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5563 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
|
5564 s->inter_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_inter_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 /* load custom intra matrix */ |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5569 if(get_bits1(gb)){ |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5570 int last=0; |
2979 | 5571 for(i=0; i<64; i++){ |
1057 | 5572 int j; |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5573 v= get_bits(gb, 8); |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5574 if(v==0) break; |
2967 | 5575 |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5576 last= v; |
1092 | 5577 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
|
5578 s->intra_matrix[j]= v; |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5579 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
|
5580 } |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5581 |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5582 /* replicate last value */ |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5583 for(; i<64; i++){ |
2979 | 5584 int j= s->dsp.idct_permutation[ ff_zigzag_direct[i] ]; |
1411 | 5585 s->intra_matrix[j]= last; |
5586 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
|
5587 } |
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 /* load custom non intra matrix */ |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5591 if(get_bits1(gb)){ |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5592 int last=0; |
2979 | 5593 for(i=0; i<64; i++){ |
1057 | 5594 int j; |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5595 v= get_bits(gb, 8); |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5596 if(v==0) break; |
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 last= v; |
1092 | 5599 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
|
5600 s->inter_matrix[j]= v; |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5601 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
|
5602 } |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5603 |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5604 /* replicate last value */ |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5605 for(; i<64; i++){ |
2979 | 5606 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
|
5607 s->inter_matrix[j]= last; |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5608 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
|
5609 } |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5610 } |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5611 |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5612 // 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
|
5613 } |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5614 |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5615 if(vo_ver_id != 1) |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5616 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
|
5617 else s->quarter_sample=0; |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5618 |
8251
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5619 if(!get_bits1(gb)){ |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5620 int pos= get_bits_count(gb); |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5621 int estimation_method= get_bits(gb, 2); |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5622 if(estimation_method<2){ |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5623 if(!get_bits1(gb)){ |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5624 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
|
5625 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
|
5626 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
|
5627 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
|
5628 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
|
5629 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
|
5630 } |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5631 if(!get_bits1(gb)){ |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5632 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
|
5633 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
|
5634 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
|
5635 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
|
5636 } |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5637 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
|
5638 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
|
5639 goto no_cplx_est; |
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(!get_bits1(gb)){ |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5642 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
|
5643 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
|
5644 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
|
5645 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
|
5646 } |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5647 if(!get_bits1(gb)){ |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5648 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
|
5649 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
|
5650 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
|
5651 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
|
5652 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
|
5653 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
|
5654 } |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5655 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
|
5656 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
|
5657 goto no_cplx_est; |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5658 } |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5659 if(estimation_method==1){ |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5660 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
|
5661 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
|
5662 } |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5663 }else |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5664 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
|
5665 }else{ |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5666 no_cplx_est: |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5667 s->cplx_estimation_trash_i= |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5668 s->cplx_estimation_trash_p= |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5669 s->cplx_estimation_trash_b= 0; |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5670 } |
747
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->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
|
5673 |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5674 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
|
5675 if(s->data_partitioning){ |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5676 s->rvlc= get_bits1(gb); |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5677 } |
2967 | 5678 |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5679 if(vo_ver_id != 1) { |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5680 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
|
5681 if(s->new_pred){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
5682 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
|
5683 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
|
5684 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
|
5685 } |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5686 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
|
5687 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
|
5688 } |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5689 else{ |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5690 s->new_pred=0; |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5691 s->reduced_res_vop= 0; |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5692 } |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5693 |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5694 s->scalability= get_bits1(gb); |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5695 |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5696 if (s->scalability) { |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5697 GetBitContext bak= *gb; |
751 | 5698 int ref_layer_id; |
5699 int ref_layer_sampling_dir; | |
5700 int h_sampling_factor_n; | |
5701 int h_sampling_factor_m; | |
5702 int v_sampling_factor_n; | |
5703 int v_sampling_factor_m; | |
2967 | 5704 |
751 | 5705 s->hierachy_type= get_bits1(gb); |
5706 ref_layer_id= get_bits(gb, 4); | |
5707 ref_layer_sampling_dir= get_bits1(gb); | |
5708 h_sampling_factor_n= get_bits(gb, 5); | |
5709 h_sampling_factor_m= get_bits(gb, 5); | |
5710 v_sampling_factor_n= get_bits(gb, 5); | |
5711 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
|
5712 s->enhancement_type= get_bits1(gb); |
2967 | 5713 |
5714 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
|
5715 || 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
|
5716 /* illegal scalability header (VERY broken encoder), |
35e175942ee2
Add a few explanatory comments to cornercase workarounds.
diego
parents:
10759
diff
changeset
|
5717 * trying to workaround */ |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5718 s->scalability=0; |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5719 *gb= bak; |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5720 }else |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
5721 av_log(s->avctx, AV_LOG_ERROR, "scalability not supported\n"); |
2967 | 5722 |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5723 // bin shape stuff FIXME |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5724 } |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5725 } |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5726 return 0; |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5727 } |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5728 |
1034 | 5729 /** |
5730 * decodes the user data stuff in the header. | |
6918 | 5731 * Also initializes divx/xvid/lavc_version/build. |
1034 | 5732 */ |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5733 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
|
5734 char buf[256]; |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5735 int i; |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5736 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
|
5737 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
|
5738 char last; |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5739 |
3615 | 5740 for(i=0; i<255 && get_bits_count(gb) < gb->size_in_bits; i++){ |
2804 | 5741 if(show_bits(gb, 23) == 0) break; |
5742 buf[i]= get_bits(gb, 8); | |
5743 } | |
5744 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
|
5745 |
761 | 5746 /* 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
|
5747 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
|
5748 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
|
5749 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
|
5750 if(e>=2){ |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5751 s->divx_version= ver; |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5752 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
|
5753 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
|
5754 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
|
5755 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
|
5756 s->showed_packed_warning=1; |
2f5101a67500
Only warn about "Invalid and inefficient vfw-avi packed B frames" once.
andoma
parents:
8042
diff
changeset
|
5757 } |
0 | 5758 } |
2967 | 5759 |
761 | 5760 /* ffmpeg detection */ |
2805
55a6659fc2ee
fix user data parsing code so it suppors pre1 and cvs
michael
parents:
2804
diff
changeset
|
5761 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
|
5762 if(e!=4) |
2967 | 5763 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
|
5764 if(e!=4){ |
2814 | 5765 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
|
5766 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
|
5767 build= (ver<<16) + (ver2<<8) + ver3; |
2814 | 5768 } |
5769 if(e!=4){ | |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5770 if(strcmp(buf, "ffmpeg")==0){ |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5771 s->lavc_build= 4600; |
63 | 5772 } |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5773 } |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5774 if(e==4){ |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5775 s->lavc_build= build; |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5776 } |
2967 | 5777 |
6908 | 5778 /* Xvid detection */ |
761 | 5779 e=sscanf(buf, "XviD%d", &build); |
5780 if(e==1){ | |
5781 s->xvid_build= build; | |
5782 } | |
5783 | |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5784 return 0; |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5785 } |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5786 |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5787 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
|
5788 int time_incr, time_increment; |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5789 |
6481 | 5790 s->pict_type = get_bits(gb, 2) + FF_I_TYPE; /* pict type: I = 0 , P = 1 */ |
5791 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
|
5792 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
|
5793 s->low_delay=0; |
fdeec2834c79
there are divx5? encoded files without a userdata section but with b-frames :(
michaelni
parents:
364
diff
changeset
|
5794 } |
2967 | 5795 |
6481 | 5796 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
|
5797 if(s->partitioned_frame) |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
5798 s->decode_mb= mpeg4_decode_partitioned_mb; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
5799 else |
1649
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
5800 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
|
5801 |
262 | 5802 time_incr=0; |
2967 | 5803 while (get_bits1(gb) != 0) |
0 | 5804 time_incr++; |
5805 | |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5806 check_marker(gb, "before time_increment"); |
2666 | 5807 |
5808 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
|
5809 av_log(s->avctx, AV_LOG_ERROR, "hmm, seems the headers are not complete, trying to guess time_increment_bits\n"); |
1068 | 5810 |
5811 for(s->time_increment_bits=1 ;s->time_increment_bits<16; s->time_increment_bits++){ | |
10664 | 5812 if ( s->pict_type == FF_P_TYPE |
5813 || (s->pict_type == FF_S_TYPE && s->vol_sprite_usage==GMC_SPRITE)) { | |
5814 if((show_bits(gb, s->time_increment_bits+6)&0x37) == 0x30) break; | |
5815 }else | |
5816 if((show_bits(gb, s->time_increment_bits+5)&0x1F) == 0x18) break; | |
1068 | 5817 } |
1396 | 5818 |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
5819 av_log(s->avctx, AV_LOG_ERROR, "my guess is %d bits ;)\n",s->time_increment_bits); |
1068 | 5820 } |
2967 | 5821 |
1411 | 5822 if(IS_3IV1) time_increment= get_bits1(gb); //FIXME investigate further |
5823 else time_increment= get_bits(gb, s->time_increment_bits); | |
2967 | 5824 |
6481 | 5825 if(s->pict_type!=FF_B_TYPE){ |
324 | 5826 s->last_time_base= s->time_base; |
262 | 5827 s->time_base+= time_incr; |
2637 | 5828 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
|
5829 if(s->workaround_bugs&FF_BUG_UMP4){ |
700
0fb4c66527e1
autodetect UMP4 (by adding a fourcc field to AVCodecContext)
michaelni
parents:
699
diff
changeset
|
5830 if(s->time < s->last_non_b_time){ |
10775
35e175942ee2
Add a few explanatory comments to cornercase workarounds.
diego
parents:
10759
diff
changeset
|
5831 /* header is not mpeg-4-compatible, broken encoder, |
35e175942ee2
Add a few explanatory comments to cornercase workarounds.
diego
parents:
10759
diff
changeset
|
5832 * trying to workaround */ |
700
0fb4c66527e1
autodetect UMP4 (by adding a fourcc field to AVCodecContext)
michaelni
parents:
699
diff
changeset
|
5833 s->time_base++; |
2637 | 5834 s->time+= s->avctx->time_base.den; |
700
0fb4c66527e1
autodetect UMP4 (by adding a fourcc field to AVCodecContext)
michaelni
parents:
699
diff
changeset
|
5835 } |
664 | 5836 } |
324 | 5837 s->pp_time= s->time - s->last_non_b_time; |
5838 s->last_non_b_time= s->time; | |
262 | 5839 }else{ |
2637 | 5840 s->time= (s->last_time_base + time_incr)*s->avctx->time_base.den + time_increment; |
664 | 5841 s->pb_time= s->pp_time - (s->last_non_b_time - s->time); |
5842 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
|
5843 /* 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
|
5844 return FRAME_SKIPPED; |
335 | 5845 } |
3247 | 5846 ff_mpeg4_init_direct_mv(s); |
2967 | 5847 |
2034 | 5848 if(s->t_frame==0) s->t_frame= s->pb_time; |
664 | 5849 if(s->t_frame==0) s->t_frame=1; // 1/0 protection |
2967 | 5850 s->pp_field_time= ( ROUNDED_DIV(s->last_non_b_time, s->t_frame) |
664 | 5851 - ROUNDED_DIV(s->last_non_b_time - s->pp_time, s->t_frame))*2; |
2967 | 5852 s->pb_field_time= ( ROUNDED_DIV(s->time, s->t_frame) |
664 | 5853 - ROUNDED_DIV(s->last_non_b_time - s->pp_time, s->t_frame))*2; |
4346 | 5854 if(!s->progressive_sequence){ |
5855 if(s->pp_field_time <= s->pb_field_time || s->pb_field_time <= 1) | |
5856 return FRAME_SKIPPED; | |
5857 } | |
262 | 5858 } |
2967 | 5859 |
2813
6fd9dbb8c385
try to check for nonsense time_base instead of setting fake one
michael
parents:
2812
diff
changeset
|
5860 if(s->avctx->time_base.num) |
6fd9dbb8c385
try to check for nonsense time_base instead of setting fake one
michael
parents:
2812
diff
changeset
|
5861 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
|
5862 else |
6fd9dbb8c385
try to check for nonsense time_base instead of setting fake one
michael
parents:
2812
diff
changeset
|
5863 s->current_picture_ptr->pts= AV_NOPTS_VALUE; |
942 | 5864 if(s->avctx->debug&FF_DEBUG_PTS) |
2962 | 5865 av_log(s->avctx, AV_LOG_DEBUG, "MPEG4 PTS: %"PRId64"\n", s->current_picture_ptr->pts); |
2034 | 5866 |
1068 | 5867 check_marker(gb, "before vop_coded"); |
2967 | 5868 |
0 | 5869 /* vop coded */ |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5870 if (get_bits1(gb) != 1){ |
2271 | 5871 if(s->avctx->debug&FF_DEBUG_PICT_INFO) |
5872 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
|
5873 return FRAME_SKIPPED; |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5874 } |
6481 | 5875 if (s->shape != BIN_ONLY_SHAPE && ( s->pict_type == FF_P_TYPE |
5876 || (s->pict_type == FF_S_TYPE && s->vol_sprite_usage==GMC_SPRITE))) { | |
0 | 5877 /* rounding type for motion estimation */ |
2979 | 5878 s->no_rounding = get_bits1(gb); |
63 | 5879 } else { |
2979 | 5880 s->no_rounding = 0; |
0 | 5881 } |
253
4448dd55d415
parsing more of the mpeg4 header & print some "not supported" stuff
michaelni
parents:
250
diff
changeset
|
5882 //FIXME reduced res stuff |
4448dd55d415
parsing more of the mpeg4 header & print some "not supported" stuff
michaelni
parents:
250
diff
changeset
|
5883 |
4448dd55d415
parsing more of the mpeg4 header & print some "not supported" stuff
michaelni
parents:
250
diff
changeset
|
5884 if (s->shape != RECT_SHAPE) { |
6481 | 5885 if (s->vol_sprite_usage != 1 || s->pict_type != FF_I_TYPE) { |
63 | 5886 int width, height, hor_spat_ref, ver_spat_ref; |
2967 | 5887 |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5888 width = get_bits(gb, 13); |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5889 skip_bits1(gb); /* marker */ |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5890 height = get_bits(gb, 13); |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5891 skip_bits1(gb); /* marker */ |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5892 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
|
5893 skip_bits1(gb); /* marker */ |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5894 ver_spat_ref = get_bits(gb, 13); /* ver_spat_ref */ |
63 | 5895 } |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5896 skip_bits1(gb); /* change_CR_disable */ |
2967 | 5897 |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5898 if (get_bits1(gb) != 0) { |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5899 skip_bits(gb, 8); /* constant_alpha_value */ |
63 | 5900 } |
5901 } | |
253
4448dd55d415
parsing more of the mpeg4 header & print some "not supported" stuff
michaelni
parents:
250
diff
changeset
|
5902 //FIXME complexity estimation stuff |
2967 | 5903 |
253
4448dd55d415
parsing more of the mpeg4 header & print some "not supported" stuff
michaelni
parents:
250
diff
changeset
|
5904 if (s->shape != BIN_ONLY_SHAPE) { |
8251
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5905 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
|
5906 if(s->pict_type != FF_I_TYPE) |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5907 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
|
5908 if(s->pict_type == FF_B_TYPE) |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5909 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
|
5910 |
1520 | 5911 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
|
5912 if(!s->progressive_sequence){ |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5913 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
|
5914 s->alternate_scan= get_bits1(gb); |
661 | 5915 }else |
5916 s->alternate_scan= 0; | |
253
4448dd55d415
parsing more of the mpeg4 header & print some "not supported" stuff
michaelni
parents:
250
diff
changeset
|
5917 } |
254
b4fed8b24e3a
gmc bitstream decoding support (the real motion compensation isnt implemnted yet)
michaelni
parents:
253
diff
changeset
|
5918 |
718 | 5919 if(s->alternate_scan){ |
1273 | 5920 ff_init_scantable(s->dsp.idct_permutation, &s->inter_scantable , ff_alternate_vertical_scan); |
5921 ff_init_scantable(s->dsp.idct_permutation, &s->intra_scantable , ff_alternate_vertical_scan); | |
5922 ff_init_scantable(s->dsp.idct_permutation, &s->intra_h_scantable, ff_alternate_vertical_scan); | |
5923 ff_init_scantable(s->dsp.idct_permutation, &s->intra_v_scantable, ff_alternate_vertical_scan); | |
718 | 5924 } else{ |
1273 | 5925 ff_init_scantable(s->dsp.idct_permutation, &s->inter_scantable , ff_zigzag_direct); |
5926 ff_init_scantable(s->dsp.idct_permutation, &s->intra_scantable , ff_zigzag_direct); | |
5927 ff_init_scantable(s->dsp.idct_permutation, &s->intra_h_scantable, ff_alternate_horizontal_scan); | |
5928 ff_init_scantable(s->dsp.idct_permutation, &s->intra_v_scantable, ff_alternate_vertical_scan); | |
718 | 5929 } |
2967 | 5930 |
6481 | 5931 if(s->pict_type == FF_S_TYPE && (s->vol_sprite_usage==STATIC_SPRITE || s->vol_sprite_usage==GMC_SPRITE)){ |
1914 | 5932 mpeg4_decode_sprite_trajectory(s, gb); |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
5933 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
|
5934 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
|
5935 } |
254
b4fed8b24e3a
gmc bitstream decoding support (the real motion compensation isnt implemnted yet)
michaelni
parents:
253
diff
changeset
|
5936 |
253
4448dd55d415
parsing more of the mpeg4 header & print some "not supported" stuff
michaelni
parents:
250
diff
changeset
|
5937 if (s->shape != BIN_ONLY_SHAPE) { |
1644 | 5938 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
|
5939 if(s->qscale==0){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
5940 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
|
5941 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
|
5942 } |
2967 | 5943 |
6481 | 5944 if (s->pict_type != FF_I_TYPE) { |
2979 | 5945 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
|
5946 if(s->f_code==0){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
5947 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
|
5948 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
|
5949 } |
582
5132a4ee50cd
different edge positions fixed with edge emu / dr1
michaelni
parents:
575
diff
changeset
|
5950 }else |
5132a4ee50cd
different edge positions fixed with edge emu / dr1
michaelni
parents:
575
diff
changeset
|
5951 s->f_code=1; |
2967 | 5952 |
6481 | 5953 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
|
5954 s->b_code = get_bits(gb, 3); |
582
5132a4ee50cd
different edge positions fixed with edge emu / dr1
michaelni
parents:
575
diff
changeset
|
5955 }else |
5132a4ee50cd
different edge positions fixed with edge emu / dr1
michaelni
parents:
575
diff
changeset
|
5956 s->b_code=1; |
906 | 5957 |
5958 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
|
5959 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 | 5960 s->qscale, s->f_code, s->b_code, |
6481 | 5961 s->pict_type == FF_I_TYPE ? "I" : (s->pict_type == FF_P_TYPE ? "P" : (s->pict_type == FF_B_TYPE ? "B" : "S")), |
2967 | 5962 gb->size_in_bits,s->progressive_sequence, s->alternate_scan, s->top_field_first, |
930 | 5963 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
|
5964 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 | 5965 } |
5966 | |
253
4448dd55d415
parsing more of the mpeg4 header & print some "not supported" stuff
michaelni
parents:
250
diff
changeset
|
5967 if(!s->scalability){ |
6481 | 5968 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
|
5969 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
|
5970 } |
575 | 5971 }else{ |
5972 if(s->enhancement_type){ | |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5973 int load_backward_shape= get_bits1(gb); |
575 | 5974 if(load_backward_shape){ |
2646
c735e3e60ca7
Even More spelling errors. patch by (Kevin Baragona <kevinmb500 gawab com)
michael
parents:
2639
diff
changeset
|
5975 av_log(s->avctx, AV_LOG_ERROR, "load backward shape isn't supported\n"); |
575 | 5976 } |
5977 } | |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5978 skip_bits(gb, 2); //ref_select_code |
63 | 5979 } |
5980 } | |
2646
c735e3e60ca7
Even More spelling errors. patch by (Kevin Baragona <kevinmb500 gawab com)
michael
parents:
2639
diff
changeset
|
5981 /* 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
|
5982 // 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
|
5983 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
|
5984 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
|
5985 s->low_delay=1; |
c2f789fe4945
detecting xvid/divx4/opendivx and set low_delay flag
michaelni
parents:
344
diff
changeset
|
5986 } |
c2f789fe4945
detecting xvid/divx4/opendivx and set low_delay flag
michaelni
parents:
344
diff
changeset
|
5987 |
2646
c735e3e60ca7
Even More spelling errors. patch by (Kevin Baragona <kevinmb500 gawab com)
michael
parents:
2639
diff
changeset
|
5988 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
|
5989 |
2967 | 5990 s->y_dc_scale_table= ff_mpeg4_y_dc_scale_table; //FIXME add short header support |
498 | 5991 s->c_dc_scale_table= ff_mpeg4_c_dc_scale_table; |
5992 | |
1366
80067f8d6770
fix edge repeating bug for %16!=0 files, this fixes Quicktime mpeg4 (they arent buggy)
michaelni
parents:
1364
diff
changeset
|
5993 if(s->workaround_bugs&FF_BUG_EDGE){ |
582
5132a4ee50cd
different edge positions fixed with edge emu / dr1
michaelni
parents:
575
diff
changeset
|
5994 s->h_edge_pos= s->width; |
5132a4ee50cd
different edge positions fixed with edge emu / dr1
michaelni
parents:
575
diff
changeset
|
5995 s->v_edge_pos= s->height; |
5132a4ee50cd
different edge positions fixed with edge emu / dr1
michaelni
parents:
575
diff
changeset
|
5996 } |
63 | 5997 return 0; |
0 | 5998 } |
5999 | |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
6000 /** |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
6001 * decode mpeg4 headers |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
6002 * @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
|
6003 * 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
|
6004 * 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
|
6005 */ |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
6006 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
|
6007 { |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
6008 int startcode, v; |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
6009 |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
6010 /* search next start code */ |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
6011 align_get_bits(gb); |
2406 | 6012 |
8612 | 6013 if(s->codec_tag == AV_RL32("WV1F") && show_bits(gb, 24) == 0x575630){ |
2406 | 6014 skip_bits(gb, 24); |
6015 if(get_bits(gb, 8) == 0xF0) | |
8417
ad4f10287633
Move CODEC_FLAG_LOW_DELAY into ff_mpeg4_decode_picture_header().
michael
parents:
8297
diff
changeset
|
6016 goto end; |
2406 | 6017 } |
6018 | |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
6019 startcode = 0xff; |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
6020 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
|
6021 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
|
6022 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
|
6023 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
|
6024 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
|
6025 }else |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
6026 return -1; //end of stream |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
6027 } |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
6028 |
2966
564788471dd4
bitstream related fixes from [PATCH] from DivX, Part 9: bitstream crashes by (Steve Lhomme | slhomme divxcorp com)
michael
parents:
2962
diff
changeset
|
6029 /* 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
|
6030 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
|
6031 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
|
6032 |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
6033 if((startcode&0xFFFFFF00) != 0x100) |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
6034 continue; //no startcode |
2967 | 6035 |
942 | 6036 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
|
6037 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
|
6038 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
|
6039 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
|
6040 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
|
6041 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
|
6042 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
|
6043 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
|
6044 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
|
6045 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
|
6046 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
|
6047 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
|
6048 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
|
6049 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
|
6050 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
|
6051 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
|
6052 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
|
6053 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
|
6054 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
|
6055 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
|
6056 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
|
6057 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
|
6058 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
|
6059 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
|
6060 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
|
6061 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
|
6062 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
|
6063 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
|
6064 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
|
6065 av_log(s->avctx, AV_LOG_DEBUG, " at %d\n", get_bits_count(gb)); |
942 | 6066 } |
6067 | |
1512 | 6068 if(startcode >= 0x120 && startcode <= 0x12F){ |
2967 | 6069 if(decode_vol_header(s, gb) < 0) |
1396 | 6070 return -1; |
1512 | 6071 } |
6072 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
|
6073 decode_user_data(s, gb); |
1512 | 6074 } |
6075 else if(startcode == GOP_STARTCODE){ | |
942 | 6076 mpeg4_decode_gop_header(s, gb); |
1512 | 6077 } |
6078 else if(startcode == VOP_STARTCODE){ | |
8417
ad4f10287633
Move CODEC_FLAG_LOW_DELAY into ff_mpeg4_decode_picture_header().
michael
parents:
8297
diff
changeset
|
6079 break; |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
6080 } |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
6081 |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
6082 align_get_bits(gb); |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
6083 startcode = 0xff; |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
6084 } |
8417
ad4f10287633
Move CODEC_FLAG_LOW_DELAY into ff_mpeg4_decode_picture_header().
michael
parents:
8297
diff
changeset
|
6085 end: |
ad4f10287633
Move CODEC_FLAG_LOW_DELAY into ff_mpeg4_decode_picture_header().
michael
parents:
8297
diff
changeset
|
6086 if(s->flags& CODEC_FLAG_LOW_DELAY) |
ad4f10287633
Move CODEC_FLAG_LOW_DELAY into ff_mpeg4_decode_picture_header().
michael
parents:
8297
diff
changeset
|
6087 s->low_delay=1; |
8418
f75be04312dc
Fix PTS returned by the demuxers for mpeg4 without a decoder.
michael
parents:
8417
diff
changeset
|
6088 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
|
6089 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
|
6090 } |