Mercurial > libavcodec.hg
annotate h263.c @ 10754:15144b93a64f libavcodec
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
It is used by both encoders and decoders and should not be below
a CONFIG_ENCODERS preprocessor check.
author | diego |
---|---|
date | Wed, 30 Dec 2009 16:08:47 +0000 |
parents | 3790420a84b6 |
children | 465c9e1cad02 |
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" |
0 | 44 |
690
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
45 //#undef NDEBUG |
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
46 //#include <assert.h> |
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
47 |
544 | 48 #define INTRA_MCBPC_VLC_BITS 6 |
1482 | 49 #define INTER_MCBPC_VLC_BITS 7 |
544 | 50 #define CBPY_VLC_BITS 6 |
51 #define MV_VLC_BITS 9 | |
52 #define DC_VLC_BITS 9 | |
53 #define SPRITE_TRAJ_VLC_BITS 6 | |
54 #define MB_TYPE_B_VLC_BITS 4 | |
55 #define TEX_VLC_BITS 9 | |
1655 | 56 #define H263_MBTYPE_B_VLC_BITS 6 |
57 #define CBPC_B_VLC_BITS 3 | |
544 | 58 |
8590 | 59 #if CONFIG_ENCODERS |
10721
07c893df0334
cosmetics: Move a bunch of forward declarations below a CONFIG_ENCODERS #ifdef.
diego
parents:
10664
diff
changeset
|
60 static void mpeg4_encode_visual_object_header(MpegEncContext *s); |
07c893df0334
cosmetics: Move a bunch of forward declarations below a CONFIG_ENCODERS #ifdef.
diego
parents:
10664
diff
changeset
|
61 static void mpeg4_encode_vol_header(MpegEncContext *s, int vo_number, |
07c893df0334
cosmetics: Move a bunch of forward declarations below a CONFIG_ENCODERS #ifdef.
diego
parents:
10664
diff
changeset
|
62 int vol_number); |
07c893df0334
cosmetics: Move a bunch of forward declarations below a CONFIG_ENCODERS #ifdef.
diego
parents:
10664
diff
changeset
|
63 static inline void mpeg4_encode_block(MpegEncContext *s, DCTELEM *block, |
07c893df0334
cosmetics: Move a bunch of forward declarations below a CONFIG_ENCODERS #ifdef.
diego
parents:
10664
diff
changeset
|
64 int n, int dc, uint8_t *scan_table, |
07c893df0334
cosmetics: Move a bunch of forward declarations below a CONFIG_ENCODERS #ifdef.
diego
parents:
10664
diff
changeset
|
65 PutBitContext *dc_pb, |
07c893df0334
cosmetics: Move a bunch of forward declarations below a CONFIG_ENCODERS #ifdef.
diego
parents:
10664
diff
changeset
|
66 PutBitContext *ac_pb); |
07c893df0334
cosmetics: Move a bunch of forward declarations below a CONFIG_ENCODERS #ifdef.
diego
parents:
10664
diff
changeset
|
67 static int mpeg4_get_block_length(MpegEncContext *s, DCTELEM *block, int n, |
07c893df0334
cosmetics: Move a bunch of forward declarations below a CONFIG_ENCODERS #ifdef.
diego
parents:
10664
diff
changeset
|
68 int intra_dc, uint8_t *scan_table); |
07c893df0334
cosmetics: Move a bunch of forward declarations below a CONFIG_ENCODERS #ifdef.
diego
parents:
10664
diff
changeset
|
69 |
1064 | 70 static uint8_t uni_DCtab_lum_len[512]; |
71 static uint8_t uni_DCtab_chrom_len[512]; | |
72 static uint16_t uni_DCtab_lum_bits[512]; | |
73 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
|
74 |
4655 | 75 static uint8_t mv_penalty[MAX_FCODE+1][MAX_MV*2+1]; |
1064 | 76 static uint8_t fcode_tab[MAX_MV*2+1]; |
77 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
|
78 |
945 | 79 static uint32_t uni_mpeg4_intra_rl_bits[64*64*2*2]; |
80 static uint8_t uni_mpeg4_intra_rl_len [64*64*2*2]; | |
81 static uint32_t uni_mpeg4_inter_rl_bits[64*64*2*2]; | |
82 static uint8_t uni_mpeg4_inter_rl_len [64*64*2*2]; | |
2253 | 83 static uint8_t uni_h263_intra_aic_rl_len [64*64*2*2]; |
84 static uint8_t uni_h263_inter_rl_len [64*64*2*2]; | |
945 | 85 //#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
|
86 //#define UNI_MPEG4_ENC_INDEX(last,run,level) ((last)*128*64 + (run) + (level)*64) |
945 | 87 #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
|
88 |
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
|
89 /* 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
|
90 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
|
91 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
|
92 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
|
93 |
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
|
94 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
|
95 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
|
96 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
|
97 */ |
815
78accc54493b
put a few large tables under #ifdef CONFIG_ENCODERS or dynamically allocate them
michaelni
parents:
770
diff
changeset
|
98 #endif |
78accc54493b
put a few large tables under #ifdef CONFIG_ENCODERS or dynamically allocate them
michaelni
parents:
770
diff
changeset
|
99 |
4672 | 100 static uint8_t static_rl_table_store[5][2][2*MAX_RUN + MAX_LEVEL + 3]; |
101 | |
2646
c735e3e60ca7
Even More spelling errors. patch by (Kevin Baragona <kevinmb500 gawab com)
michael
parents:
2639
diff
changeset
|
102 #if 0 //3IV1 is quite rare and it slows things down a tiny bit |
8612 | 103 #define IS_3IV1 s->codec_tag == AV_RL32("3IV1") |
2967 | 104 #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
|
105 #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
|
106 #endif |
293 | 107 |
0 | 108 int h263_get_picture_format(int width, int height) |
109 { | |
110 int format; | |
111 | |
112 if (width == 128 && height == 96) | |
355 | 113 format = 1; |
0 | 114 else if (width == 176 && height == 144) |
355 | 115 format = 2; |
0 | 116 else if (width == 352 && height == 288) |
355 | 117 format = 3; |
0 | 118 else if (width == 704 && height == 576) |
355 | 119 format = 4; |
0 | 120 else if (width == 1408 && height == 1152) |
355 | 121 format = 5; |
0 | 122 else |
123 format = 7; | |
124 return format; | |
125 } | |
126 | |
5403 | 127 static void show_pict_info(MpegEncContext *s){ |
128 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", | |
129 s->qscale, av_get_pict_type_char(s->pict_type), | |
130 s->gb.size_in_bits, 1-s->no_rounding, | |
131 s->obmc ? " AP" : "", | |
132 s->umvplus ? " UMV" : "", | |
133 s->h263_long_vectors ? " LONG" : "", | |
134 s->h263_plus ? " +" : "", | |
135 s->h263_aic ? " AIC" : "", | |
136 s->alt_inter_vlc ? " AIV" : "", | |
137 s->modified_quant ? " MQ" : "", | |
138 s->loop_filter ? " LOOP" : "", | |
139 s->h263_slice_structured ? " SS" : "", | |
140 s->avctx->time_base.den, s->avctx->time_base.num | |
141 ); | |
142 } | |
143 | |
8590 | 144 #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
|
145 |
1548 | 146 static void aspect_to_info(MpegEncContext * s, AVRational aspect){ |
887 | 147 int i; |
148 | |
1548 | 149 if(aspect.num==0) aspect= (AVRational){1,1}; |
150 | |
887 | 151 for(i=1; i<6; i++){ |
1548 | 152 if(av_cmp_q(pixel_aspect[i], aspect) == 0){ |
887 | 153 s->aspect_ratio_info=i; |
154 return; | |
155 } | |
156 } | |
2967 | 157 |
887 | 158 s->aspect_ratio_info= FF_ASPECT_EXTENDED; |
880 | 159 } |
160 | |
1354 | 161 void ff_flv_encode_picture_header(MpegEncContext * s, int picture_number) |
0 | 162 { |
1354 | 163 int format; |
164 | |
165 align_put_bits(&s->pb); | |
166 | |
1353
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
167 put_bits(&s->pb, 17, 1); |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
168 put_bits(&s->pb, 5, (s->h263_flv-1)); /* 0: h263 escape codes 1: 11-bit escape codes */ |
2637 | 169 put_bits(&s->pb, 8, (((int64_t)s->picture_number * 30 * s->avctx->time_base.num) / //FIXME use timestamp |
170 s->avctx->time_base.den) & 0xff); /* TemporalReference */ | |
1353
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
171 if (s->width == 352 && s->height == 288) |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
172 format = 2; |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
173 else if (s->width == 176 && s->height == 144) |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
174 format = 3; |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
175 else if (s->width == 128 && s->height == 96) |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
176 format = 4; |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
177 else if (s->width == 320 && s->height == 240) |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
178 format = 5; |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
179 else if (s->width == 160 && s->height == 120) |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
180 format = 6; |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
181 else if (s->width <= 255 && s->height <= 255) |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
182 format = 0; /* use 1 byte width & height */ |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
183 else |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
184 format = 1; /* use 2 bytes width & height */ |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
185 put_bits(&s->pb, 3, format); /* PictureSize */ |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
186 if (format == 0) { |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
187 put_bits(&s->pb, 8, s->width); |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
188 put_bits(&s->pb, 8, s->height); |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
189 } else if (format == 1) { |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
190 put_bits(&s->pb, 16, s->width); |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
191 put_bits(&s->pb, 16, s->height); |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
192 } |
6481 | 193 put_bits(&s->pb, 2, s->pict_type == FF_P_TYPE); /* PictureType */ |
1390
39d07c0263de
patch for flv deblocking by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1389
diff
changeset
|
194 put_bits(&s->pb, 1, 1); /* DeblockingFlag: on */ |
1353
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
195 put_bits(&s->pb, 5, s->qscale); /* Quantizer */ |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
196 put_bits(&s->pb, 1, 0); /* ExtraInformation */ |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
197 |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
198 if(s->h263_aic){ |
2967 | 199 s->y_dc_scale_table= |
1639 | 200 s->c_dc_scale_table= ff_aic_dc_scale_table; |
1353
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
201 }else{ |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
202 s->y_dc_scale_table= |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
203 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
|
204 } |
1354 | 205 } |
206 | |
207 void h263_encode_picture_header(MpegEncContext * s, int picture_number) | |
208 { | |
1872 | 209 int format, coded_frame_rate, coded_frame_rate_base, i, temp_ref; |
210 int best_clock_code=1; | |
211 int best_divisor=60; | |
212 int best_error= INT_MAX; | |
2967 | 213 |
1872 | 214 if(s->h263_plus){ |
215 for(i=0; i<2; i++){ | |
216 int div, error; | |
2637 | 217 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
|
218 div= av_clip(div, 1, 127); |
4001 | 219 error= FFABS(s->avctx->time_base.num*1800000LL - (1000LL+i)*s->avctx->time_base.den*div); |
1872 | 220 if(error < best_error){ |
221 best_error= error; | |
222 best_divisor= div; | |
223 best_clock_code= i; | |
224 } | |
225 } | |
226 } | |
227 s->custom_pcf= best_clock_code!=1 || best_divisor!=60; | |
228 coded_frame_rate= 1800000; | |
229 coded_frame_rate_base= (1000+best_clock_code)*best_divisor; | |
1354 | 230 |
231 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
|
232 |
231 | 233 /* Update the pointer to last GOB */ |
9431 | 234 s->ptr_lastgob = put_bits_ptr(&s->pb); |
231 | 235 put_bits(&s->pb, 22, 0x20); /* PSC */ |
2637 | 236 temp_ref= s->picture_number * (int64_t)coded_frame_rate * s->avctx->time_base.num / //FIXME use timestamp |
237 (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
|
238 put_sbits(&s->pb, 8, temp_ref); /* TemporalReference */ |
0 | 239 |
2979 | 240 put_bits(&s->pb, 1, 1); /* marker */ |
241 put_bits(&s->pb, 1, 0); /* h263 id */ | |
242 put_bits(&s->pb, 1, 0); /* split screen off */ | |
243 put_bits(&s->pb, 1, 0); /* camera off */ | |
244 put_bits(&s->pb, 1, 0); /* freeze picture release off */ | |
2967 | 245 |
78 | 246 format = h263_get_picture_format(s->width, s->height); |
0 | 247 if (!s->h263_plus) { |
248 /* H.263v1 */ | |
249 put_bits(&s->pb, 3, format); | |
6481 | 250 put_bits(&s->pb, 1, (s->pict_type == FF_P_TYPE)); |
0 | 251 /* By now UMV IS DISABLED ON H.263v1, since the restrictions |
252 of H.263v1 UMV implies to check the predicted MV after | |
253 calculation of the current MB to see if we're on the limits */ | |
2979 | 254 put_bits(&s->pb, 1, 0); /* Unrestricted Motion Vector: off */ |
255 put_bits(&s->pb, 1, 0); /* SAC: off */ | |
256 put_bits(&s->pb, 1, s->obmc); /* Advanced Prediction */ | |
257 put_bits(&s->pb, 1, 0); /* only I/P frames, no PB frame */ | |
0 | 258 put_bits(&s->pb, 5, s->qscale); |
2979 | 259 put_bits(&s->pb, 1, 0); /* Continuous Presence Multipoint mode: off */ |
0 | 260 } else { |
1872 | 261 int ufep=1; |
0 | 262 /* H.263v2 */ |
263 /* H.263 Plus PTYPE */ | |
2967 | 264 |
0 | 265 put_bits(&s->pb, 3, 7); |
1872 | 266 put_bits(&s->pb,3,ufep); /* Update Full Extended PTYPE */ |
78 | 267 if (format == 7) |
268 put_bits(&s->pb,3,6); /* Custom Source Format */ | |
269 else | |
270 put_bits(&s->pb, 3, format); | |
2967 | 271 |
1872 | 272 put_bits(&s->pb,1, s->custom_pcf); |
1661 | 273 put_bits(&s->pb,1, s->umvplus); /* Unrestricted Motion Vector */ |
0 | 274 put_bits(&s->pb,1,0); /* SAC: off */ |
1633 | 275 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
|
276 put_bits(&s->pb,1,s->h263_aic); /* Advanced Intra Coding */ |
1644 | 277 put_bits(&s->pb,1,s->loop_filter); /* Deblocking Filter */ |
1661 | 278 put_bits(&s->pb,1,s->h263_slice_structured); /* Slice Structured */ |
0 | 279 put_bits(&s->pb,1,0); /* Reference Picture Selection: off */ |
280 put_bits(&s->pb,1,0); /* Independent Segment Decoding: off */ | |
1637 | 281 put_bits(&s->pb,1,s->alt_inter_vlc); /* Alternative Inter VLC */ |
1644 | 282 put_bits(&s->pb,1,s->modified_quant); /* Modified Quantization: */ |
0 | 283 put_bits(&s->pb,1,1); /* "1" to prevent start code emulation */ |
284 put_bits(&s->pb,3,0); /* Reserved */ | |
2967 | 285 |
6481 | 286 put_bits(&s->pb, 3, s->pict_type == FF_P_TYPE); |
2967 | 287 |
0 | 288 put_bits(&s->pb,1,0); /* Reference Picture Resampling: off */ |
289 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
|
290 put_bits(&s->pb,1,s->no_rounding); /* Rounding Type */ |
0 | 291 put_bits(&s->pb,2,0); /* Reserved */ |
292 put_bits(&s->pb,1,1); /* "1" to prevent start code emulation */ | |
2967 | 293 |
0 | 294 /* This should be here if PLUSPTYPE */ |
2979 | 295 put_bits(&s->pb, 1, 0); /* Continuous Presence Multipoint mode: off */ |
296 | |
297 if (format == 7) { | |
78 | 298 /* Custom Picture Format (CPFMT) */ |
1548 | 299 aspect_to_info(s, s->avctx->sample_aspect_ratio); |
880 | 300 |
301 put_bits(&s->pb,4,s->aspect_ratio_info); | |
78 | 302 put_bits(&s->pb,9,(s->width >> 2) - 1); |
303 put_bits(&s->pb,1,1); /* "1" to prevent start code emulation */ | |
304 put_bits(&s->pb,9,(s->height >> 2)); | |
1548 | 305 if (s->aspect_ratio_info == FF_ASPECT_EXTENDED){ |
306 put_bits(&s->pb, 8, s->avctx->sample_aspect_ratio.num); | |
307 put_bits(&s->pb, 8, s->avctx->sample_aspect_ratio.den); | |
2979 | 308 } |
78 | 309 } |
1872 | 310 if(s->custom_pcf){ |
311 if(ufep){ | |
312 put_bits(&s->pb, 1, best_clock_code); | |
313 put_bits(&s->pb, 7, best_divisor); | |
314 } | |
7260
3ec34b551aae
bitstream: move put_sbits() from flacenc.c to bitstream.h and use it
ramiro
parents:
7098
diff
changeset
|
315 put_sbits(&s->pb, 2, temp_ref>>8); |
1872 | 316 } |
2967 | 317 |
0 | 318 /* Unlimited Unrestricted Motion Vectors Indicator (UUI) */ |
79
82e579c37bc3
Moved some H.263+ variables to MpegEncContext to be thread-safe.
pulento
parents:
78
diff
changeset
|
319 if (s->umvplus) |
1089 | 320 // put_bits(&s->pb,1,1); /* Limited according tables of Annex D */ |
1644 | 321 //FIXME check actual requested range |
1089 | 322 put_bits(&s->pb,2,1); /* unlimited */ |
1661 | 323 if(s->h263_slice_structured) |
324 put_bits(&s->pb,2,0); /* no weird submodes */ | |
1089 | 325 |
0 | 326 put_bits(&s->pb, 5, s->qscale); |
327 } | |
328 | |
2979 | 329 put_bits(&s->pb, 1, 0); /* no PEI */ |
498 | 330 |
1670 | 331 if(s->h263_slice_structured){ |
332 put_bits(&s->pb, 1, 1); | |
2967 | 333 |
1670 | 334 assert(s->mb_x == 0 && s->mb_y == 0); |
335 ff_h263_encode_mba(s); | |
336 | |
337 put_bits(&s->pb, 1, 1); | |
338 } | |
339 | |
498 | 340 if(s->h263_aic){ |
2967 | 341 s->y_dc_scale_table= |
1639 | 342 s->c_dc_scale_table= ff_aic_dc_scale_table; |
498 | 343 }else{ |
344 s->y_dc_scale_table= | |
345 s->c_dc_scale_table= ff_mpeg1_dc_scale_table; | |
346 } | |
0 | 347 } |
348 | |
766 | 349 /** |
350 * Encodes a group of blocks header. | |
351 */ | |
1661 | 352 void h263_encode_gob_header(MpegEncContext * s, int mb_line) |
162 | 353 { |
1661 | 354 put_bits(&s->pb, 17, 1); /* GBSC */ |
355 | |
356 if(s->h263_slice_structured){ | |
357 put_bits(&s->pb, 1, 1); | |
358 | |
359 ff_h263_encode_mba(s); | |
360 | |
361 if(s->mb_num > 1583) | |
362 put_bits(&s->pb, 1, 1); | |
363 put_bits(&s->pb, 5, s->qscale); /* GQUANT */ | |
364 put_bits(&s->pb, 1, 1); | |
6481 | 365 put_bits(&s->pb, 2, s->pict_type == FF_I_TYPE); /* GFID */ |
1661 | 366 }else{ |
367 int gob_number= mb_line / s->gob_index; | |
368 | |
369 put_bits(&s->pb, 5, gob_number); /* GN */ | |
6481 | 370 put_bits(&s->pb, 2, s->pict_type == FF_I_TYPE); /* GFID */ |
1661 | 371 put_bits(&s->pb, 5, s->qscale); /* GQUANT */ |
372 } | |
162 | 373 } |
265
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
374 |
1492 | 375 static inline int get_block_rate(MpegEncContext * s, DCTELEM block[64], int block_last_index, uint8_t scantable[64]){ |
376 int last=0; | |
377 int j; | |
378 int rate=0; | |
379 | |
380 for(j=1; j<=block_last_index; j++){ | |
381 const int index= scantable[j]; | |
382 int level= block[index]; | |
383 if(level){ | |
384 level+= 64; | |
385 if((level&(~127)) == 0){ | |
386 if(j<block_last_index) rate+= s->intra_ac_vlc_length [UNI_AC_ENC_INDEX(j-last-1, level)]; | |
387 else rate+= s->intra_ac_vlc_last_length[UNI_AC_ENC_INDEX(j-last-1, level)]; | |
388 }else | |
389 rate += s->ac_esc_length; | |
390 | |
391 last= j; | |
392 } | |
393 } | |
2967 | 394 |
1492 | 395 return rate; |
396 } | |
397 | |
398 static inline int decide_ac_pred(MpegEncContext * s, DCTELEM block[6][64], int dir[6], uint8_t *st[6], int zigzag_last_index[6]) | |
265
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
399 { |
1492 | 400 int score= 0; |
265
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
401 int i, n; |
903 | 402 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
|
403 |
1492 | 404 memcpy(zigzag_last_index, s->block_last_index, sizeof(int)*6); |
2967 | 405 |
265
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
406 for(n=0; n<6; n++){ |
1064 | 407 int16_t *ac_val, *ac_val1; |
2967 | 408 |
1492 | 409 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
|
410 |
266 | 411 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
|
412 ac_val1= ac_val; |
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
413 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
|
414 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
|
415 /* top prediction */ |
266 | 416 ac_val-= s->block_wrap[n]*16; |
903 | 417 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
|
418 /* same qscale */ |
852b5a416161
fixing ac prediction encoding with adaptive quantization
michaelni
parents:
690
diff
changeset
|
419 for(i=1; i<8; i++){ |
1092 | 420 const int level= block[n][s->dsp.idct_permutation[i ]]; |
1492 | 421 block[n][s->dsp.idct_permutation[i ]] = level - ac_val[i+8]; |
1092 | 422 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
|
423 ac_val1[i+8]= level; |
852b5a416161
fixing ac prediction encoding with adaptive quantization
michaelni
parents:
690
diff
changeset
|
424 } |
852b5a416161
fixing ac prediction encoding with adaptive quantization
michaelni
parents:
690
diff
changeset
|
425 }else{ |
852b5a416161
fixing ac prediction encoding with adaptive quantization
michaelni
parents:
690
diff
changeset
|
426 /* different qscale, we must rescale */ |
852b5a416161
fixing ac prediction encoding with adaptive quantization
michaelni
parents:
690
diff
changeset
|
427 for(i=1; i<8; i++){ |
1092 | 428 const int level= block[n][s->dsp.idct_permutation[i ]]; |
1492 | 429 block[n][s->dsp.idct_permutation[i ]] = level - ROUNDED_DIV(ac_val[i + 8]*qscale_table[xy], s->qscale); |
1092 | 430 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
|
431 ac_val1[i+8]= level; |
852b5a416161
fixing ac prediction encoding with adaptive quantization
michaelni
parents:
690
diff
changeset
|
432 } |
265
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
433 } |
1492 | 434 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
|
435 }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
|
436 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
|
437 /* left prediction */ |
265
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
438 ac_val-= 16; |
903 | 439 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
|
440 /* same qscale */ |
852b5a416161
fixing ac prediction encoding with adaptive quantization
michaelni
parents:
690
diff
changeset
|
441 for(i=1; i<8; i++){ |
1092 | 442 const int level= block[n][s->dsp.idct_permutation[i<<3]]; |
1492 | 443 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
|
444 ac_val1[i ]= level; |
1092 | 445 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
|
446 } |
852b5a416161
fixing ac prediction encoding with adaptive quantization
michaelni
parents:
690
diff
changeset
|
447 }else{ |
852b5a416161
fixing ac prediction encoding with adaptive quantization
michaelni
parents:
690
diff
changeset
|
448 /* different qscale, we must rescale */ |
852b5a416161
fixing ac prediction encoding with adaptive quantization
michaelni
parents:
690
diff
changeset
|
449 for(i=1; i<8; i++){ |
1092 | 450 const int level= block[n][s->dsp.idct_permutation[i<<3]]; |
1492 | 451 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
|
452 ac_val1[i ]= level; |
1092 | 453 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
|
454 } |
265
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
455 } |
1492 | 456 st[n]= s->intra_v_scantable.permutated; |
457 } | |
458 | |
459 for(i=63; i>0; i--) //FIXME optimize | |
460 if(block[n][ st[n][i] ]) break; | |
461 s->block_last_index[n]= i; | |
462 | |
463 score += get_block_rate(s, block[n], s->block_last_index[n], st[n]); | |
464 } | |
465 | |
466 return score < 0; | |
467 } | |
468 | |
469 static inline void restore_ac_coeffs(MpegEncContext * s, DCTELEM block[6][64], int dir[6], uint8_t *st[6], int zigzag_last_index[6]) | |
470 { | |
471 int i, n; | |
472 memcpy(s->block_last_index, zigzag_last_index, sizeof(int)*6); | |
473 | |
474 for(n=0; n<6; n++){ | |
475 int16_t *ac_val = s->ac_val[0][0] + s->block_index[n] * 16; | |
476 | |
477 st[n]= s->intra_scantable.permutated; | |
478 if(dir[n]){ | |
479 /* top prediction */ | |
480 for(i=1; i<8; i++){ | |
481 block[n][s->dsp.idct_permutation[i ]] = ac_val[i+8]; | |
482 } | |
483 }else{ | |
484 /* left prediction */ | |
485 for(i=1; i<8; i++){ | |
486 block[n][s->dsp.idct_permutation[i<<3]]= ac_val[i ]; | |
487 } | |
265
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
488 } |
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
489 } |
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
490 } |
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
491 |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
492 /** |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
493 * 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
|
494 */ |
695 | 495 void ff_clean_h263_qscales(MpegEncContext *s){ |
690
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
496 int i; |
903 | 497 int8_t * const qscale_table= s->current_picture.qscale_table; |
2967 | 498 |
4316 | 499 ff_init_qscale_tab(s); |
500 | |
690
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
501 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
|
502 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
|
503 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
|
504 } |
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
505 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
|
506 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
|
507 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
|
508 } |
1983 | 509 |
510 if(s->codec_id != CODEC_ID_H263P){ | |
511 for(i=1; i<s->mb_num; i++){ | |
512 int mb_xy= s->mb_index2xy[i]; | |
2967 | 513 |
1983 | 514 if(qscale_table[mb_xy] != qscale_table[s->mb_index2xy[i-1]] && (s->mb_type[mb_xy]&CANDIDATE_MB_TYPE_INTER4V)){ |
515 s->mb_type[mb_xy]|= CANDIDATE_MB_TYPE_INTER; | |
516 } | |
517 } | |
518 } | |
695 | 519 } |
520 | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
521 /** |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
522 * 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
|
523 */ |
695 | 524 void ff_clean_mpeg4_qscales(MpegEncContext *s){ |
525 int i; | |
903 | 526 int8_t * const qscale_table= s->current_picture.qscale_table; |
527 | |
695 | 528 ff_clean_h263_qscales(s); |
2967 | 529 |
6481 | 530 if(s->pict_type== FF_B_TYPE){ |
690
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
531 int odd=0; |
2646
c735e3e60ca7
Even More spelling errors. patch by (Kevin Baragona <kevinmb500 gawab com)
michael
parents:
2639
diff
changeset
|
532 /* ok, come on, this isn't funny anymore, there's more code for handling this mpeg4 mess than for the actual adaptive quantization */ |
2967 | 533 |
690
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
534 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
|
535 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
|
536 odd += qscale_table[mb_xy]&1; |
690
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
537 } |
2967 | 538 |
690
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
539 if(2*odd > s->mb_num) odd=1; |
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
540 else odd=0; |
2967 | 541 |
690
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
542 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
|
543 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
|
544 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
|
545 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
|
546 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
|
547 qscale_table[mb_xy]= 31; |
2967 | 548 } |
549 | |
690
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
550 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
|
551 int mb_xy= s->mb_index2xy[i]; |
1708 | 552 if(qscale_table[mb_xy] != qscale_table[s->mb_index2xy[i-1]] && (s->mb_type[mb_xy]&CANDIDATE_MB_TYPE_DIRECT)){ |
553 s->mb_type[mb_xy]|= CANDIDATE_MB_TYPE_BIDIR; | |
690
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
554 } |
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
555 } |
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
556 } |
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
557 } |
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
558 |
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
|
559 #endif //CONFIG_ENCODERS |
3247 | 560 |
8042 | 561 #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
|
562 #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
|
563 |
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
|
564 void ff_mpeg4_init_direct_mv(MpegEncContext *s){ |
3247 | 565 int i; |
566 for(i=0; i<tab_size; i++){ | |
567 s->direct_scale_mv[0][i] = (i-tab_bias)*s->pb_time/s->pp_time; | |
568 s->direct_scale_mv[1][i] = (i-tab_bias)*(s->pb_time-s->pp_time)/s->pp_time; | |
569 } | |
570 } | |
571 | |
572 static inline void ff_mpeg4_set_one_direct_mv(MpegEncContext *s, int mx, int my, int i){ | |
573 int xy= s->block_index[i]; | |
574 uint16_t time_pp= s->pp_time; | |
575 uint16_t time_pb= s->pb_time; | |
576 int p_mx, p_my; | |
577 | |
578 p_mx= s->next_picture.motion_val[0][xy][0]; | |
579 if((unsigned)(p_mx + tab_bias) < tab_size){ | |
580 s->mv[0][i][0] = s->direct_scale_mv[0][p_mx + tab_bias] + mx; | |
581 s->mv[1][i][0] = mx ? s->mv[0][i][0] - p_mx | |
582 : s->direct_scale_mv[1][p_mx + tab_bias]; | |
583 }else{ | |
584 s->mv[0][i][0] = p_mx*time_pb/time_pp + mx; | |
585 s->mv[1][i][0] = mx ? s->mv[0][i][0] - p_mx | |
586 : p_mx*(time_pb - time_pp)/time_pp; | |
587 } | |
588 p_my= s->next_picture.motion_val[0][xy][1]; | |
589 if((unsigned)(p_my + tab_bias) < tab_size){ | |
590 s->mv[0][i][1] = s->direct_scale_mv[0][p_my + tab_bias] + my; | |
591 s->mv[1][i][1] = my ? s->mv[0][i][1] - p_my | |
592 : s->direct_scale_mv[1][p_my + tab_bias]; | |
593 }else{ | |
594 s->mv[0][i][1] = p_my*time_pb/time_pp + my; | |
595 s->mv[1][i][1] = my ? s->mv[0][i][1] - p_my | |
596 : p_my*(time_pb - time_pp)/time_pp; | |
597 } | |
598 } | |
599 | |
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
|
600 #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
|
601 #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
|
602 |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1176
diff
changeset
|
603 /** |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1176
diff
changeset
|
604 * |
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
|
605 * @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
|
606 */ |
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
|
607 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
|
608 const int mb_index= s->mb_x + s->mb_y*s->mb_stride; |
1708 | 609 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
|
610 uint16_t time_pp; |
fb240cb99bcf
Remove useless init from ff_mpeg4_set_direct_mv() found by CSA.
michael
parents:
9481
diff
changeset
|
611 uint16_t time_pb; |
936 | 612 int i; |
2967 | 613 |
936 | 614 //FIXME avoid divides |
3247 | 615 // try special case with shifts for 1 and 3 B-frames? |
2967 | 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 if(IS_8X8(colocated_mb_type)){ |
936 | 618 s->mv_type = MV_TYPE_8X8; |
619 for(i=0; i<4; i++){ | |
3247 | 620 ff_mpeg4_set_one_direct_mv(s, mx, my, i); |
936 | 621 } |
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
|
622 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
|
623 } else if(IS_INTERLACED(colocated_mb_type)){ |
936 | 624 s->mv_type = MV_TYPE_FIELD; |
625 for(i=0; i<2; i++){ | |
1948 | 626 int field_select= s->next_picture.ref_index[0][s->block_index[2*i]]; |
3205 | 627 s->field_select[0][i]= field_select; |
628 s->field_select[1][i]= i; | |
936 | 629 if(s->top_field_first){ |
1948 | 630 time_pp= s->pp_field_time - field_select + i; |
631 time_pb= s->pb_field_time - field_select + i; | |
936 | 632 }else{ |
1948 | 633 time_pp= s->pp_field_time + field_select - i; |
634 time_pb= s->pb_field_time + field_select - i; | |
936 | 635 } |
1708 | 636 s->mv[0][i][0] = s->p_field_mv_table[i][0][mb_index][0]*time_pb/time_pp + mx; |
637 s->mv[0][i][1] = s->p_field_mv_table[i][0][mb_index][1]*time_pb/time_pp + my; | |
638 s->mv[1][i][0] = mx ? s->mv[0][i][0] - s->p_field_mv_table[i][0][mb_index][0] | |
639 : s->p_field_mv_table[i][0][mb_index][0]*(time_pb - time_pp)/time_pp; | |
2967 | 640 s->mv[1][i][1] = my ? s->mv[0][i][1] - s->p_field_mv_table[i][0][mb_index][1] |
1708 | 641 : s->p_field_mv_table[i][0][mb_index][1]*(time_pb - time_pp)/time_pp; |
936 | 642 } |
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
|
643 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
|
644 }else{ |
3247 | 645 ff_mpeg4_set_one_direct_mv(s, mx, my, 0); |
646 s->mv[0][1][0] = s->mv[0][2][0] = s->mv[0][3][0] = s->mv[0][0][0]; | |
647 s->mv[0][1][1] = s->mv[0][2][1] = s->mv[0][3][1] = s->mv[0][0][1]; | |
648 s->mv[1][1][0] = s->mv[1][2][0] = s->mv[1][3][0] = s->mv[1][0][0]; | |
649 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
|
650 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
|
651 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
|
652 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
|
653 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
|
654 return MB_TYPE_DIRECT2 | MB_TYPE_16x16 | MB_TYPE_L0L1; //Note see prev line |
936 | 655 } |
656 } | |
657 | |
1389 | 658 void ff_h263_update_motion_val(MpegEncContext * s){ |
659 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
|
660 //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
|
661 const int wrap = s->b8_stride; |
1389 | 662 const int xy = s->block_index[0]; |
2967 | 663 |
664 s->current_picture.mbskip_table[mb_xy]= s->mb_skipped; | |
1389 | 665 |
666 if(s->mv_type != MV_TYPE_8X8){ | |
667 int motion_x, motion_y; | |
668 if (s->mb_intra) { | |
669 motion_x = 0; | |
670 motion_y = 0; | |
671 } else if (s->mv_type == MV_TYPE_16X16) { | |
672 motion_x = s->mv[0][0][0]; | |
673 motion_y = s->mv[0][0][1]; | |
674 } else /*if (s->mv_type == MV_TYPE_FIELD)*/ { | |
675 int i; | |
676 motion_x = s->mv[0][0][0] + s->mv[0][1][0]; | |
677 motion_y = s->mv[0][0][1] + s->mv[0][1][1]; | |
678 motion_x = (motion_x>>1) | (motion_x&1); | |
679 for(i=0; i<2; i++){ | |
1708 | 680 s->p_field_mv_table[i][0][mb_xy][0]= s->mv[0][i][0]; |
681 s->p_field_mv_table[i][0][mb_xy][1]= s->mv[0][i][1]; | |
1389 | 682 } |
1948 | 683 s->current_picture.ref_index[0][xy ]= |
684 s->current_picture.ref_index[0][xy + 1]= s->field_select[0][0]; | |
685 s->current_picture.ref_index[0][xy + wrap ]= | |
686 s->current_picture.ref_index[0][xy + wrap + 1]= s->field_select[0][1]; | |
1389 | 687 } |
1948 | 688 |
1389 | 689 /* 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
|
690 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
|
691 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
|
692 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
|
693 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
|
694 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
|
695 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
|
696 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
|
697 s->current_picture.motion_val[0][xy + 1 + wrap][1] = motion_y; |
1389 | 698 } |
699 | |
700 if(s->encoding){ //FIXME encoding MUST be cleaned up | |
2967 | 701 if (s->mv_type == MV_TYPE_8X8) |
1389 | 702 s->current_picture.mb_type[mb_xy]= MB_TYPE_L0 | MB_TYPE_8x8; |
1633 | 703 else if(s->mb_intra) |
704 s->current_picture.mb_type[mb_xy]= MB_TYPE_INTRA; | |
1389 | 705 else |
706 s->current_picture.mb_type[mb_xy]= MB_TYPE_L0 | MB_TYPE_16x16; | |
707 } | |
708 } | |
709 | |
10754
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
710 /** |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
711 * predicts the dc. |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
712 * encoding quantized level -> quantized diff |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
713 * decoding quantized diff -> quantized level |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
714 * @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
|
715 * @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
|
716 */ |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
717 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
|
718 { |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
719 int a, b, c, wrap, pred, scale, ret; |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
720 int16_t *dc_val; |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
721 |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
722 /* find prediction */ |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
723 if (n < 4) { |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
724 scale = s->y_dc_scale; |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
725 } else { |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
726 scale = s->c_dc_scale; |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
727 } |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
728 if(IS_3IV1) |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
729 scale= 8; |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
730 |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
731 wrap= s->block_wrap[n]; |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
732 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
|
733 |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
734 /* B C |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
735 * A X |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
736 */ |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
737 a = dc_val[ - 1]; |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
738 b = dc_val[ - 1 - wrap]; |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
739 c = dc_val[ - wrap]; |
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 /* 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
|
742 if(s->first_slice_line && n!=3){ |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
743 if(n!=2) b=c= 1024; |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
744 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
|
745 } |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
746 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
|
747 if(n==0 || n==4 || n==5) |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
748 b=1024; |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
749 } |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
750 |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
751 if (abs(a - b) < abs(b - c)) { |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
752 pred = c; |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
753 *dir_ptr = 1; /* top */ |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
754 } else { |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
755 pred = a; |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
756 *dir_ptr = 0; /* left */ |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
757 } |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
758 /* we assume pred is positive */ |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
759 pred = FASTDIV((pred + (scale >> 1)), scale); |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
760 |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
761 if(encoding){ |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
762 ret = level - pred; |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
763 }else{ |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
764 level += pred; |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
765 ret= level; |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
766 if(s->error_recognition>=3){ |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
767 if(level<0){ |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
768 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
|
769 return -1; |
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 if(level*scale > 2048 + scale){ |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
772 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
|
773 return -1; |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
774 } |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
775 } |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
776 } |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
777 level *=scale; |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
778 if(level&(~2047)){ |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
779 if(level<0) |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
780 level=0; |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
781 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
|
782 level=2047; |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
783 } |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
784 dc_val[0]= level; |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
785 |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
786 return ret; |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
787 } |
15144b93a64f
10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents:
10753
diff
changeset
|
788 |
8590 | 789 #if CONFIG_ENCODERS |
1490
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
790 |
2502 | 791 static inline int h263_get_motion_length(MpegEncContext * s, int val, int f_code){ |
792 int l, bit_size, code; | |
793 | |
794 if (val == 0) { | |
795 return mvtab[0][1]; | |
796 } else { | |
797 bit_size = f_code - 1; | |
798 /* modulo encoding */ | |
799 l= INT_BIT - 6 - bit_size; | |
800 val = (val<<l)>>l; | |
801 val--; | |
802 code = (val >> bit_size) + 1; | |
803 | |
804 return mvtab[code][1] + 1 + bit_size; | |
805 } | |
806 } | |
807 | |
808 static inline void ff_h263_encode_motion_vector(MpegEncContext * s, int x, int y, int f_code){ | |
809 if(s->flags2 & CODEC_FLAG2_NO_OUTPUT){ | |
2967 | 810 skip_put_bits(&s->pb, |
2502 | 811 h263_get_motion_length(s, x, f_code) |
812 +h263_get_motion_length(s, y, f_code)); | |
813 }else{ | |
814 ff_h263_encode_motion(s, x, f_code); | |
815 ff_h263_encode_motion(s, y, f_code); | |
816 } | |
817 } | |
818 | |
1490
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
819 static inline int get_p_cbp(MpegEncContext * s, |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
820 DCTELEM block[6][64], |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
821 int motion_x, int motion_y){ |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
822 int cbp, i; |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
823 |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
824 if(s->flags & CODEC_FLAG_CBP_RD){ |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
825 int best_cbpy_score= INT_MAX; |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
826 int best_cbpc_score= INT_MAX; |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
827 int cbpc = (-1), cbpy= (-1); |
1490
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
828 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
|
829 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
|
830 |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
831 for(i=0; i<4; i++){ |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
832 int score= inter_MCBPC_bits[i + offset] * lambda; |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
833 if(i&1) score += s->coded_score[5]; |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
834 if(i&2) score += s->coded_score[4]; |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
835 |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
836 if(score < best_cbpc_score){ |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
837 best_cbpc_score= score; |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
838 cbpc= i; |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
839 } |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
840 } |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
841 |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
842 for(i=0; i<16; i++){ |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
843 int score= cbpy_tab[i ^ 0xF][1] * lambda; |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
844 if(i&1) score += s->coded_score[3]; |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
845 if(i&2) score += s->coded_score[2]; |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
846 if(i&4) score += s->coded_score[1]; |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
847 if(i&8) score += s->coded_score[0]; |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
848 |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
849 if(score < best_cbpy_score){ |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
850 best_cbpy_score= score; |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
851 cbpy= i; |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
852 } |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
853 } |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
854 cbp= cbpc + 4*cbpy; |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
855 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
|
856 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
|
857 cbp= 0; |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
858 } |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
859 |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
860 for (i = 0; i < 6; i++) { |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
861 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
|
862 s->block_last_index[i]= -1; |
8288 | 863 s->dsp.clear_block(s->block[i]); |
1490
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
864 } |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
865 } |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
866 }else{ |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
867 cbp= 0; |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
868 for (i = 0; i < 6; i++) { |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
869 if (s->block_last_index[i] >= 0) |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
870 cbp |= 1 << (5 - i); |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
871 } |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
872 } |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
873 return cbp; |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
874 } |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
875 |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
876 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
|
877 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
|
878 int cbp=0, i; |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
879 |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
880 if(s->flags & CODEC_FLAG_CBP_RD){ |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
881 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
|
882 const int lambda= s->lambda2 >> (FF_LAMBDA_SHIFT - 6); |
2967 | 883 |
1490
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
884 for(i=0; i<6; i++){ |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
885 if(s->coded_score[i] < 0){ |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
886 score += s->coded_score[i]; |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
887 cbp |= 1 << (5 - i); |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
888 } |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
889 } |
2967 | 890 |
1490
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
891 if(cbp){ |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
892 int zero_score= -6; |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
893 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
|
894 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
|
895 } |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
896 |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
897 zero_score*= lambda; |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
898 if(zero_score <= score){ |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
899 cbp=0; |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
900 } |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
901 } |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
902 |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
903 for (i = 0; i < 6; i++) { |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
904 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
|
905 s->block_last_index[i]= -1; |
8288 | 906 s->dsp.clear_block(s->block[i]); |
1490
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
907 } |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
908 } |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
909 }else{ |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
910 for (i = 0; i < 6; i++) { |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
911 if (s->block_last_index[i] >= 0) |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
912 cbp |= 1 << (5 - i); |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
913 } |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
914 } |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
915 return cbp; |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
916 } |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
917 |
2967 | 918 static inline void mpeg4_encode_blocks(MpegEncContext * s, DCTELEM block[6][64], int intra_dc[6], |
2502 | 919 uint8_t **scan_table, PutBitContext *dc_pb, PutBitContext *ac_pb){ |
920 int i; | |
2967 | 921 |
2502 | 922 if(scan_table){ |
923 if(s->flags2 & CODEC_FLAG2_NO_OUTPUT){ | |
924 for (i = 0; i < 6; i++) { | |
925 skip_put_bits(&s->pb, mpeg4_get_block_length(s, block[i], i, intra_dc[i], scan_table[i])); | |
926 } | |
927 }else{ | |
928 /* encode each block */ | |
929 for (i = 0; i < 6; i++) { | |
930 mpeg4_encode_block(s, block[i], i, intra_dc[i], scan_table[i], dc_pb, ac_pb); | |
931 } | |
932 } | |
933 }else{ | |
934 if(s->flags2 & CODEC_FLAG2_NO_OUTPUT){ | |
935 for (i = 0; i < 6; i++) { | |
936 skip_put_bits(&s->pb, mpeg4_get_block_length(s, block[i], i, 0, s->intra_scantable.permutated)); | |
937 } | |
938 }else{ | |
939 /* encode each block */ | |
940 for (i = 0; i < 6; i++) { | |
941 mpeg4_encode_block(s, block[i], i, 0, s->intra_scantable.permutated, dc_pb, ac_pb); | |
942 } | |
943 } | |
944 } | |
945 } | |
946 | |
8644 | 947 static const int dquant_code[5]= {1,0,9,2,3}; |
948 | |
265
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
949 void mpeg4_encode_mb(MpegEncContext * s, |
2979 | 950 DCTELEM block[6][64], |
951 int motion_x, int motion_y) | |
265
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
952 { |
1057 | 953 int cbpc, cbpy, pred_x, pred_y; |
453 | 954 PutBitContext * const pb2 = s->data_partitioning ? &s->pb2 : &s->pb; |
6481 | 955 PutBitContext * const tex_pb = s->data_partitioning && s->pict_type!=FF_B_TYPE ? &s->tex_pb : &s->pb; |
956 PutBitContext * const dc_pb = s->data_partitioning && s->pict_type!=FF_I_TYPE ? &s->pb2 : &s->pb; | |
453 | 957 const int interleaved_stats= (s->flags&CODEC_FLAG_PASS1) && !s->data_partitioning ? 1 : 0; |
2967 | 958 |
265
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
959 if (!s->mb_intra) { |
1490
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
960 int i, cbp; |
2967 | 961 |
6481 | 962 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
|
963 static const int mb_type_table[8]= {-1, 3, 2, 1,-1,-1,-1, 0}; /* convert from mv_dir to type */ |
324 | 964 int mb_type= mb_type_table[s->mv_dir]; |
1708 | 965 |
324 | 966 if(s->mb_x==0){ |
1708 | 967 for(i=0; i<2; i++){ |
2967 | 968 s->last_mv[i][0][0]= |
969 s->last_mv[i][0][1]= | |
970 s->last_mv[i][1][0]= | |
1708 | 971 s->last_mv[i][1][1]= 0; |
972 } | |
324 | 973 } |
2967 | 974 |
690
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
975 assert(s->dquant>=-2 && s->dquant<=2); |
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
976 assert((s->dquant&1)==0); |
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
977 assert(mb_type>=0); |
265
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
978 |
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
|
979 /* 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
|
980 if(s->next_picture.mbskip_table[s->mb_y * s->mb_stride + s->mb_x]){ //FIXME avoid DCT & ... |
324 | 981 s->skip_count++; |
2967 | 982 s->mv[0][0][0]= |
983 s->mv[0][0][1]= | |
984 s->mv[1][0][0]= | |
324 | 985 s->mv[1][0][1]= 0; |
2646
c735e3e60ca7
Even More spelling errors. patch by (Kevin Baragona <kevinmb500 gawab com)
michael
parents:
2639
diff
changeset
|
986 s->mv_dir= MV_DIR_FORWARD; //doesn't matter |
690
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
987 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
|
988 // s->mb_skipped=1; |
903 | 989 |
324 | 990 return; |
991 } | |
2967 | 992 |
1490
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
993 cbp= get_b_cbp(s, block, motion_x, motion_y, mb_type); |
2967 | 994 |
324 | 995 if ((cbp | motion_x | motion_y | mb_type) ==0) { |
996 /* direct MB with MV={0,0} */ | |
690
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
997 assert(s->dquant==0); |
2967 | 998 |
324 | 999 put_bits(&s->pb, 1, 1); /* mb not coded modb1=1 */ |
453 | 1000 |
1001 if(interleaved_stats){ | |
1002 s->misc_bits++; | |
1003 s->last_bits++; | |
1004 } | |
324 | 1005 s->skip_count++; |
1006 return; | |
1007 } | |
2967 | 1008 |
2979 | 1009 put_bits(&s->pb, 1, 0); /* mb coded modb1=0 */ |
324 | 1010 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
|
1011 put_bits(&s->pb, mb_type+1, 1); // this table is so simple that we don't need it :) |
324 | 1012 if(cbp) put_bits(&s->pb, 6, cbp); |
2967 | 1013 |
690
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
1014 if(cbp && mb_type){ |
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
1015 if(s->dquant) |
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
1016 put_bits(&s->pb, 2, (s->dquant>>2)+3); |
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
1017 else |
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
1018 put_bits(&s->pb, 1, 0); |
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
1019 }else |
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
1020 s->qscale -= s->dquant; |
2967 | 1021 |
697 | 1022 if(!s->progressive_sequence){ |
1023 if(cbp) | |
1024 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
|
1025 if(mb_type) // not direct mode |
1708 | 1026 put_bits(&s->pb, 1, s->mv_type == MV_TYPE_FIELD); |
697 | 1027 } |
265
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
1028 |
453 | 1029 if(interleaved_stats){ |
1164 | 1030 s->misc_bits+= get_bits_diff(s); |
453 | 1031 } |
295 | 1032 |
1708 | 1033 if(mb_type == 0){ |
1034 assert(s->mv_dir & MV_DIRECT); | |
2502 | 1035 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
|
1036 s->b_count++; |
e47fa3e3f2d5
statistics for forw & back p-MBs instead of just one counter for both
michaelni
parents:
654
diff
changeset
|
1037 s->f_count++; |
1708 | 1038 }else{ |
1039 assert(mb_type > 0 && mb_type < 4); | |
1040 if(s->mv_type != MV_TYPE_FIELD){ | |
1041 if(s->mv_dir & MV_DIR_FORWARD){ | |
2502 | 1042 ff_h263_encode_motion_vector(s, s->mv[0][0][0] - s->last_mv[0][0][0], |
1043 s->mv[0][0][1] - s->last_mv[0][0][1], s->f_code); | |
1708 | 1044 s->last_mv[0][0][0]= s->last_mv[0][1][0]= s->mv[0][0][0]; |
1045 s->last_mv[0][0][1]= s->last_mv[0][1][1]= s->mv[0][0][1]; | |
1046 s->f_count++; | |
1047 } | |
1048 if(s->mv_dir & MV_DIR_BACKWARD){ | |
2502 | 1049 ff_h263_encode_motion_vector(s, s->mv[1][0][0] - s->last_mv[1][0][0], |
1050 s->mv[1][0][1] - s->last_mv[1][0][1], s->b_code); | |
1708 | 1051 s->last_mv[1][0][0]= s->last_mv[1][1][0]= s->mv[1][0][0]; |
1052 s->last_mv[1][0][1]= s->last_mv[1][1][1]= s->mv[1][0][1]; | |
1053 s->b_count++; | |
1054 } | |
1055 }else{ | |
1056 if(s->mv_dir & MV_DIR_FORWARD){ | |
1057 put_bits(&s->pb, 1, s->field_select[0][0]); | |
1058 put_bits(&s->pb, 1, s->field_select[0][1]); | |
1059 } | |
1060 if(s->mv_dir & MV_DIR_BACKWARD){ | |
1061 put_bits(&s->pb, 1, s->field_select[1][0]); | |
1062 put_bits(&s->pb, 1, s->field_select[1][1]); | |
1063 } | |
1064 if(s->mv_dir & MV_DIR_FORWARD){ | |
1065 for(i=0; i<2; i++){ | |
2502 | 1066 ff_h263_encode_motion_vector(s, s->mv[0][i][0] - s->last_mv[0][i][0] , |
1067 s->mv[0][i][1] - s->last_mv[0][i][1]/2, s->f_code); | |
1708 | 1068 s->last_mv[0][i][0]= s->mv[0][i][0]; |
1069 s->last_mv[0][i][1]= s->mv[0][i][1]*2; | |
1070 } | |
1071 s->f_count++; | |
1072 } | |
1073 if(s->mv_dir & MV_DIR_BACKWARD){ | |
1074 for(i=0; i<2; i++){ | |
2502 | 1075 ff_h263_encode_motion_vector(s, s->mv[1][i][0] - s->last_mv[1][i][0] , |
1076 s->mv[1][i][1] - s->last_mv[1][i][1]/2, s->b_code); | |
1708 | 1077 s->last_mv[1][i][0]= s->mv[1][i][0]; |
1078 s->last_mv[1][i][1]= s->mv[1][i][1]*2; | |
1079 } | |
1080 s->b_count++; | |
1081 } | |
1082 } | |
324 | 1083 } |
453 | 1084 |
1085 if(interleaved_stats){ | |
1164 | 1086 s->mv_bits+= get_bits_diff(s); |
453 | 1087 } |
295 | 1088 |
2502 | 1089 mpeg4_encode_blocks(s, block, NULL, NULL, NULL, &s->pb); |
453 | 1090 |
1091 if(interleaved_stats){ | |
1164 | 1092 s->p_tex_bits+= get_bits_diff(s); |
453 | 1093 } |
1708 | 1094 |
6481 | 1095 }else{ /* s->pict_type==FF_B_TYPE */ |
1490
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1096 cbp= get_p_cbp(s, block, motion_x, motion_y); |
2967 | 1097 |
690
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
1098 if ((cbp | motion_x | motion_y | s->dquant) == 0 && s->mv_type==MV_TYPE_16X16) { |
2967 | 1099 /* 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
|
1100 why didn't they just compress the skip-mb bits instead of reusing them ?! */ |
331 | 1101 if(s->max_b_frames>0){ |
1102 int i; | |
364
6b6332e7008a
segfault fix for b-frame encoding with height%16!=0
michaelni
parents:
360
diff
changeset
|
1103 int x,y, offset; |
6b6332e7008a
segfault fix for b-frame encoding with height%16!=0
michaelni
parents:
360
diff
changeset
|
1104 uint8_t *p_pic; |
6b6332e7008a
segfault fix for b-frame encoding with height%16!=0
michaelni
parents:
360
diff
changeset
|
1105 |
6b6332e7008a
segfault fix for b-frame encoding with height%16!=0
michaelni
parents:
360
diff
changeset
|
1106 x= s->mb_x*16; |
6b6332e7008a
segfault fix for b-frame encoding with height%16!=0
michaelni
parents:
360
diff
changeset
|
1107 y= s->mb_y*16; |
6b6332e7008a
segfault fix for b-frame encoding with height%16!=0
michaelni
parents:
360
diff
changeset
|
1108 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
|
1109 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
|
1110 |
6b6332e7008a
segfault fix for b-frame encoding with height%16!=0
michaelni
parents:
360
diff
changeset
|
1111 offset= x + y*s->linesize; |
903 | 1112 p_pic= s->new_picture.data[0] + offset; |
2967 | 1113 |
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
|
1114 s->mb_skipped=1; |
331 | 1115 for(i=0; i<s->max_b_frames; i++){ |
339 | 1116 uint8_t *b_pic; |
1117 int diff; | |
903 | 1118 Picture *pic= s->reordered_input_picture[i+1]; |
1119 | |
6481 | 1120 if(pic==NULL || pic->pict_type!=FF_B_TYPE) break; |
903 | 1121 |
3068 | 1122 b_pic= pic->data[0] + offset; |
1123 if(pic->type != FF_BUFFER_TYPE_SHARED) | |
1124 b_pic+= INPLACE_OFFSET; | |
2979 | 1125 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
|
1126 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
|
1127 s->mb_skipped=0; |
331 | 1128 break; |
1129 } | |
1130 } | |
1131 }else | |
2967 | 1132 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
|
1133 |
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
|
1134 if(s->mb_skipped==1){ |
331 | 1135 /* skip macroblock */ |
1136 put_bits(&s->pb, 1, 1); | |
453 | 1137 |
1138 if(interleaved_stats){ | |
1139 s->misc_bits++; | |
1140 s->last_bits++; | |
1141 } | |
331 | 1142 s->skip_count++; |
2967 | 1143 |
331 | 1144 return; |
1145 } | |
295 | 1146 } |
364
6b6332e7008a
segfault fix for b-frame encoding with height%16!=0
michaelni
parents:
360
diff
changeset
|
1147 |
2979 | 1148 put_bits(&s->pb, 1, 0); /* mb coded */ |
1633 | 1149 cbpc = cbp & 3; |
1150 cbpy = cbp >> 2; | |
1151 cbpy ^= 0xf; | |
324 | 1152 if(s->mv_type==MV_TYPE_16X16){ |
690
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
1153 if(s->dquant) cbpc+= 8; |
324 | 1154 put_bits(&s->pb, |
1155 inter_MCBPC_bits[cbpc], | |
1156 inter_MCBPC_code[cbpc]); | |
690
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
1157 |
453 | 1158 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
|
1159 if(s->dquant) |
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
1160 put_bits(pb2, 2, dquant_code[s->dquant+2]); |
697 | 1161 |
1162 if(!s->progressive_sequence){ | |
1163 if(cbp) | |
1164 put_bits(pb2, 1, s->interlaced_dct); | |
1708 | 1165 put_bits(pb2, 1, 0); |
697 | 1166 } |
2967 | 1167 |
453 | 1168 if(interleaved_stats){ |
1164 | 1169 s->misc_bits+= get_bits_diff(s); |
453 | 1170 } |
324 | 1171 |
1172 /* motion vectors: 16x16 mode */ | |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1936
diff
changeset
|
1173 h263_pred_motion(s, 0, 0, &pred_x, &pred_y); |
2967 | 1174 |
2502 | 1175 ff_h263_encode_motion_vector(s, motion_x - pred_x, |
1176 motion_y - pred_y, s->f_code); | |
1708 | 1177 }else if(s->mv_type==MV_TYPE_FIELD){ |
1178 if(s->dquant) cbpc+= 8; | |
1179 put_bits(&s->pb, | |
1180 inter_MCBPC_bits[cbpc], | |
1181 inter_MCBPC_code[cbpc]); | |
1182 | |
1183 put_bits(pb2, cbpy_tab[cbpy][1], cbpy_tab[cbpy][0]); | |
1184 if(s->dquant) | |
1185 put_bits(pb2, 2, dquant_code[s->dquant+2]); | |
1186 | |
1187 assert(!s->progressive_sequence); | |
1188 if(cbp) | |
1189 put_bits(pb2, 1, s->interlaced_dct); | |
1190 put_bits(pb2, 1, 1); | |
2967 | 1191 |
1708 | 1192 if(interleaved_stats){ |
1193 s->misc_bits+= get_bits_diff(s); | |
1194 } | |
1195 | |
1196 /* motion vectors: 16x8 interlaced mode */ | |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1936
diff
changeset
|
1197 h263_pred_motion(s, 0, 0, &pred_x, &pred_y); |
1708 | 1198 pred_y /=2; |
2967 | 1199 |
1708 | 1200 put_bits(&s->pb, 1, s->field_select[0][0]); |
1201 put_bits(&s->pb, 1, s->field_select[0][1]); | |
2967 | 1202 |
2502 | 1203 ff_h263_encode_motion_vector(s, s->mv[0][0][0] - pred_x, |
1204 s->mv[0][0][1] - pred_y, s->f_code); | |
1205 ff_h263_encode_motion_vector(s, s->mv[0][1][0] - pred_x, | |
1206 s->mv[0][1][1] - pred_y, s->f_code); | |
324 | 1207 }else{ |
1708 | 1208 assert(s->mv_type==MV_TYPE_8X8); |
324 | 1209 put_bits(&s->pb, |
1633 | 1210 inter_MCBPC_bits[cbpc+16], |
1211 inter_MCBPC_code[cbpc+16]); | |
453 | 1212 put_bits(pb2, cbpy_tab[cbpy][1], cbpy_tab[cbpy][0]); |
1213 | |
757 | 1214 if(!s->progressive_sequence){ |
1215 if(cbp) | |
1216 put_bits(pb2, 1, s->interlaced_dct); | |
1217 } | |
2967 | 1218 |
453 | 1219 if(interleaved_stats){ |
1164 | 1220 s->misc_bits+= get_bits_diff(s); |
453 | 1221 } |
324 | 1222 |
1223 for(i=0; i<4; i++){ | |
1224 /* motion vectors: 8x8 mode*/ | |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1936
diff
changeset
|
1225 h263_pred_motion(s, i, 0, &pred_x, &pred_y); |
324 | 1226 |
2502 | 1227 ff_h263_encode_motion_vector(s, s->current_picture.motion_val[0][ s->block_index[i] ][0] - pred_x, |
1228 s->current_picture.motion_val[0][ s->block_index[i] ][1] - pred_y, s->f_code); | |
324 | 1229 } |
1230 } | |
453 | 1231 |
2967 | 1232 if(interleaved_stats){ |
1164 | 1233 s->mv_bits+= get_bits_diff(s); |
453 | 1234 } |
324 | 1235 |
2502 | 1236 mpeg4_encode_blocks(s, block, NULL, NULL, NULL, tex_pb); |
453 | 1237 |
1238 if(interleaved_stats){ | |
1164 | 1239 s->p_tex_bits+= get_bits_diff(s); |
453 | 1240 } |
656
e47fa3e3f2d5
statistics for forw & back p-MBs instead of just one counter for both
michaelni
parents:
654
diff
changeset
|
1241 s->f_count++; |
295 | 1242 } |
265
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
1243 } else { |
324 | 1244 int cbp; |
2967 | 1245 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
|
1246 int dir[6]; //prediction direction |
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
1247 int zigzag_last_index[6]; |
2979 | 1248 uint8_t *scan_table[6]; |
1057 | 1249 int i; |
265
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
1250 |
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
1251 for(i=0; i<6; i++){ |
2003 | 1252 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
|
1253 } |
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
1254 |
1492 | 1255 if(s->flags & CODEC_FLAG_AC_PRED){ |
1256 s->ac_pred= decide_ac_pred(s, block, dir, scan_table, zigzag_last_index); | |
1257 if(!s->ac_pred) | |
1258 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
|
1259 }else{ |
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
1260 for(i=0; i<6; i++) |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
702
diff
changeset
|
1261 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
|
1262 } |
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
1263 |
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
1264 /* compute cbp */ |
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
1265 cbp = 0; |
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
1266 for (i = 0; i < 6; i++) { |
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
1267 if (s->block_last_index[i] >= 1) |
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
1268 cbp |= 1 << (5 - i); |
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
1269 } |
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
1270 |
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
1271 cbpc = cbp & 3; |
6481 | 1272 if (s->pict_type == FF_I_TYPE) { |
690
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
1273 if(s->dquant) cbpc+=4; |
265
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
1274 put_bits(&s->pb, |
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
1275 intra_MCBPC_bits[cbpc], |
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
1276 intra_MCBPC_code[cbpc]); |
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
1277 } else { |
690
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
1278 if(s->dquant) cbpc+=8; |
2979 | 1279 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
|
1280 put_bits(&s->pb, |
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
1281 inter_MCBPC_bits[cbpc + 4], |
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
1282 inter_MCBPC_code[cbpc + 4]); |
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
1283 } |
453 | 1284 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
|
1285 cbpy = cbp >> 2; |
453 | 1286 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
|
1287 if(s->dquant) |
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
676
diff
changeset
|
1288 put_bits(dc_pb, 2, dquant_code[s->dquant+2]); |
453 | 1289 |
697 | 1290 if(!s->progressive_sequence){ |
1291 put_bits(dc_pb, 1, s->interlaced_dct); | |
1292 } | |
1293 | |
453 | 1294 if(interleaved_stats){ |
1164 | 1295 s->misc_bits+= get_bits_diff(s); |
453 | 1296 } |
286 | 1297 |
2502 | 1298 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
|
1299 |
453 | 1300 if(interleaved_stats){ |
1164 | 1301 s->i_tex_bits+= get_bits_diff(s); |
453 | 1302 } |
286 | 1303 s->i_count++; |
1304 | |
265
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
1305 /* restore ac coeffs & last_index stuff if we messed them up with the prediction */ |
1492 | 1306 if(s->ac_pred) |
1307 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
|
1308 } |
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
1309 } |
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
1310 |
10752
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1311 /** |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1312 * encodes a 8x8 block. |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1313 * @param block the 8x8 block |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1314 * @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
|
1315 */ |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1316 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
|
1317 { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1318 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
|
1319 RLTable *rl; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1320 |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1321 rl = &rl_inter; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1322 if (s->mb_intra && !s->h263_aic) { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1323 /* DC coef */ |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1324 level = block[0]; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1325 /* 255 cannot be represented, so we clamp */ |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1326 if (level > 254) { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1327 level = 254; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1328 block[0] = 254; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1329 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1330 /* 0 cannot be represented also */ |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1331 else if (level < 1) { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1332 level = 1; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1333 block[0] = 1; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1334 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1335 if (level == 128) //FIXME check rv10 |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1336 put_bits(&s->pb, 8, 0xff); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1337 else |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1338 put_bits(&s->pb, 8, level); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1339 i = 1; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1340 } else { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1341 i = 0; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1342 if (s->h263_aic && s->mb_intra) |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1343 rl = &rl_intra_aic; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1344 |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1345 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
|
1346 int aic_vlc_bits=0; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1347 int inter_vlc_bits=0; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1348 int wrong_pos=-1; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1349 int aic_code; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1350 |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1351 last_index = s->block_last_index[n]; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1352 last_non_zero = i - 1; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1353 for (; i <= last_index; i++) { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1354 j = s->intra_scantable.permutated[i]; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1355 level = block[j]; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1356 if (level) { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1357 run = i - last_non_zero - 1; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1358 last = (i == last_index); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1359 |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1360 if(level<0) level= -level; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1361 |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1362 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
|
1363 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
|
1364 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
|
1365 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
|
1366 |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1367 if (code == rl->n) { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1368 inter_vlc_bits += 1+6+8-1; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1369 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1370 if (aic_code == rl_intra_aic.n) { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1371 aic_vlc_bits += 1+6+8-1; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1372 wrong_pos += run + 1; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1373 }else |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1374 wrong_pos += wrong_run[aic_code]; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1375 last_non_zero = i; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1376 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1377 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1378 i = 0; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1379 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
|
1380 rl = &rl_intra_aic; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1381 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1382 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1383 |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1384 /* AC coefs */ |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1385 last_index = s->block_last_index[n]; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1386 last_non_zero = i - 1; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1387 for (; i <= last_index; i++) { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1388 j = s->intra_scantable.permutated[i]; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1389 level = block[j]; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1390 if (level) { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1391 run = i - last_non_zero - 1; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1392 last = (i == last_index); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1393 sign = 0; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1394 slevel = level; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1395 if (level < 0) { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1396 sign = 1; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1397 level = -level; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1398 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1399 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
|
1400 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
|
1401 if (code == rl->n) { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1402 if(s->h263_flv <= 1){ |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1403 put_bits(&s->pb, 1, last); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1404 put_bits(&s->pb, 6, run); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1405 |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1406 assert(slevel != 0); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1407 |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1408 if(level < 128) |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1409 put_sbits(&s->pb, 8, slevel); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1410 else{ |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1411 put_bits(&s->pb, 8, 128); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1412 put_sbits(&s->pb, 5, slevel); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1413 put_sbits(&s->pb, 6, slevel>>5); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1414 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1415 }else{ |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1416 if(level < 64) { // 7-bit level |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1417 put_bits(&s->pb, 1, 0); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1418 put_bits(&s->pb, 1, last); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1419 put_bits(&s->pb, 6, run); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1420 |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1421 put_sbits(&s->pb, 7, slevel); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1422 } else { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1423 /* 11-bit level */ |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1424 put_bits(&s->pb, 1, 1); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1425 put_bits(&s->pb, 1, last); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1426 put_bits(&s->pb, 6, run); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1427 |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1428 put_sbits(&s->pb, 11, slevel); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1429 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1430 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1431 } else { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1432 put_bits(&s->pb, 1, sign); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1433 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1434 last_non_zero = i; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1435 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1436 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1437 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1438 |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1439 /* 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
|
1440 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
|
1441 { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1442 short sval = 0; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1443 short i = 0; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1444 short n_bits = 0; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1445 short temp_val; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1446 int code = 0; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1447 int tcode; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1448 |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1449 if ( val == 0) |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1450 put_bits(&s->pb, 1, 1); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1451 else if (val == 1) |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1452 put_bits(&s->pb, 3, 0); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1453 else if (val == -1) |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1454 put_bits(&s->pb, 3, 2); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1455 else { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1456 |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1457 sval = ((val < 0) ? (short)(-val):(short)val); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1458 temp_val = sval; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1459 |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1460 while (temp_val != 0) { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1461 temp_val = temp_val >> 1; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1462 n_bits++; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1463 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1464 |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1465 i = n_bits - 1; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1466 while (i > 0) { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1467 tcode = (sval & (1 << (i-1))) >> (i-1); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1468 tcode = (tcode << 1) | 1; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1469 code = (code << 2) | tcode; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1470 i--; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1471 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1472 code = ((code << 1) | (val < 0)) << 1; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1473 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
|
1474 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1475 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1476 |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1477 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
|
1478 { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1479 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
|
1480 int16_t *dc_val; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1481 |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1482 /* find prediction */ |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1483 if (n < 4) { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1484 x = 2 * s->mb_x + (n & 1); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1485 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
|
1486 wrap = s->b8_stride; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1487 dc_val = s->dc_val[0]; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1488 } else { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1489 x = s->mb_x; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1490 y = s->mb_y; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1491 wrap = s->mb_stride; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1492 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
|
1493 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1494 /* B C |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1495 * A X |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1496 */ |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1497 a = dc_val[(x - 1) + (y) * wrap]; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1498 c = dc_val[(x) + (y - 1) * wrap]; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1499 |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1500 /* No prediction outside GOB boundary */ |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1501 if(s->first_slice_line && n!=3){ |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1502 if(n!=2) c= 1024; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1503 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
|
1504 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1505 /* just DC prediction */ |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1506 if (a != 1024 && c != 1024) |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1507 pred_dc = (a + c) >> 1; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1508 else if (a != 1024) |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1509 pred_dc = a; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1510 else |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1511 pred_dc = c; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1512 |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1513 /* we assume pred is positive */ |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1514 *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
|
1515 return pred_dc; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1516 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
1517 |
0 | 1518 void h263_encode_mb(MpegEncContext * s, |
2979 | 1519 DCTELEM block[6][64], |
1520 int motion_x, int motion_y) | |
0 | 1521 { |
1522 int cbpc, cbpy, i, cbp, pred_x, pred_y; | |
1064 | 1523 int16_t pred_dc; |
1524 int16_t rec_intradc[6]; | |
3781 | 1525 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
|
1526 const int interleaved_stats= (s->flags&CODEC_FLAG_PASS1); |
2967 | 1527 |
324 | 1528 if (!s->mb_intra) { |
350
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1529 /* compute cbp */ |
1490
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1483
diff
changeset
|
1530 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
|
1531 |
1789 | 1532 if ((cbp | motion_x | motion_y | s->dquant | (s->mv_type - MV_TYPE_16X16)) == 0) { |
324 | 1533 /* skip macroblock */ |
1534 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
|
1535 if(interleaved_stats){ |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
1536 s->misc_bits++; |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
1537 s->last_bits++; |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
1538 } |
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
|
1539 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
|
1540 |
324 | 1541 return; |
1542 } | |
2979 | 1543 put_bits(&s->pb, 1, 0); /* mb coded */ |
2967 | 1544 |
324 | 1545 cbpc = cbp & 3; |
1637 | 1546 cbpy = cbp >> 2; |
1547 if(s->alt_inter_vlc==0 || cbpc!=3) | |
1548 cbpy ^= 0xF; | |
695 | 1549 if(s->dquant) cbpc+= 8; |
1633 | 1550 if(s->mv_type==MV_TYPE_16X16){ |
1551 put_bits(&s->pb, | |
1552 inter_MCBPC_bits[cbpc], | |
1553 inter_MCBPC_code[cbpc]); | |
1554 | |
1555 put_bits(&s->pb, cbpy_tab[cbpy][1], cbpy_tab[cbpy][0]); | |
1556 if(s->dquant) | |
1557 put_bits(&s->pb, 2, dquant_code[s->dquant+2]); | |
2967 | 1558 |
1633 | 1559 if(interleaved_stats){ |
1560 s->misc_bits+= get_bits_diff(s); | |
1561 } | |
1562 | |
1563 /* motion vectors: 16x16 mode */ | |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1936
diff
changeset
|
1564 h263_pred_motion(s, 0, 0, &pred_x, &pred_y); |
2967 | 1565 |
1566 if (!s->umvplus) { | |
2502 | 1567 ff_h263_encode_motion_vector(s, motion_x - pred_x, |
1568 motion_y - pred_y, 1); | |
1633 | 1569 } |
1570 else { | |
1571 h263p_encode_umotion(s, motion_x - pred_x); | |
1572 h263p_encode_umotion(s, motion_y - pred_y); | |
1573 if (((motion_x - pred_x) == 1) && ((motion_y - pred_y) == 1)) | |
1574 /* To prevent Start Code emulation */ | |
1575 put_bits(&s->pb,1,1); | |
1576 } | |
1577 }else{ | |
1578 put_bits(&s->pb, | |
1579 inter_MCBPC_bits[cbpc+16], | |
1580 inter_MCBPC_code[cbpc+16]); | |
1581 put_bits(&s->pb, cbpy_tab[cbpy][1], cbpy_tab[cbpy][0]); | |
1582 if(s->dquant) | |
1583 put_bits(&s->pb, 2, dquant_code[s->dquant+2]); | |
1584 | |
1585 if(interleaved_stats){ | |
1586 s->misc_bits+= get_bits_diff(s); | |
1587 } | |
1588 | |
1589 for(i=0; i<4; i++){ | |
1590 /* motion vectors: 8x8 mode*/ | |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1936
diff
changeset
|
1591 h263_pred_motion(s, i, 0, &pred_x, &pred_y); |
1633 | 1592 |
1668
30746f429df6
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1666
diff
changeset
|
1593 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
|
1594 motion_y= s->current_picture.motion_val[0][ s->block_index[i] ][1]; |
2967 | 1595 if (!s->umvplus) { |
2502 | 1596 ff_h263_encode_motion_vector(s, motion_x - pred_x, |
1597 motion_y - pred_y, 1); | |
1633 | 1598 } |
1599 else { | |
1600 h263p_encode_umotion(s, motion_x - pred_x); | |
1601 h263p_encode_umotion(s, motion_y - pred_y); | |
1602 if (((motion_x - pred_x) == 1) && ((motion_y - pred_y) == 1)) | |
1603 /* To prevent Start Code emulation */ | |
1604 put_bits(&s->pb,1,1); | |
1605 } | |
1606 } | |
324 | 1607 } |
1353
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
1608 |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
1609 if(interleaved_stats){ |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
1610 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
|
1611 } |
350
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1612 } else { |
1639 | 1613 assert(s->mb_intra); |
2967 | 1614 |
350
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1615 cbp = 0; |
1666 | 1616 if (s->h263_aic) { |
350
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1617 /* Predict DC */ |
1666 | 1618 for(i=0; i<6; i++) { |
1064 | 1619 int16_t level = block[i][0]; |
1666 | 1620 int scale; |
2967 | 1621 |
1666 | 1622 if(i<4) scale= s->y_dc_scale; |
1623 else scale= s->c_dc_scale; | |
1624 | |
350
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1625 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
|
1626 level -= pred_dc; |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1627 /* Quant */ |
1666 | 1628 if (level >= 0) |
1629 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
|
1630 else |
1666 | 1631 level = (level - (scale>>1))/scale; |
2967 | 1632 |
350
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1633 /* AIC can change CBP */ |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1634 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
|
1635 s->block_last_index[i] = -1; |
1666 | 1636 |
1637 if(!s->modified_quant){ | |
1638 if (level < -127) | |
1639 level = -127; | |
1640 else if (level > 127) | |
1641 level = 127; | |
1642 } | |
1643 | |
350
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1644 block[i][0] = level; |
2967 | 1645 /* Reconstruction */ |
1666 | 1646 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
|
1647 /* Oddify */ |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1648 rec_intradc[i] |= 1; |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1649 //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
|
1650 // rec_intradc[i]++; |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1651 /* Clipping */ |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1652 if (rec_intradc[i] < 0) |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1653 rec_intradc[i] = 0; |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1654 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
|
1655 rec_intradc[i] = 2047; |
2967 | 1656 |
350
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1657 /* Update AC/DC tables */ |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1658 *dc_ptr[i] = rec_intradc[i]; |
1666 | 1659 if (s->block_last_index[i] >= 0) |
1660 cbp |= 1 << (5 - i); | |
350
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1661 } |
1666 | 1662 }else{ |
1663 for(i=0; i<6; i++) { | |
1664 /* compute cbp */ | |
1665 if (s->block_last_index[i] >= 1) | |
1666 cbp |= 1 << (5 - i); | |
1667 } | |
350
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1668 } |
0 | 1669 |
350
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1670 cbpc = cbp & 3; |
6481 | 1671 if (s->pict_type == FF_I_TYPE) { |
695 | 1672 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
|
1673 put_bits(&s->pb, |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1674 intra_MCBPC_bits[cbpc], |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1675 intra_MCBPC_code[cbpc]); |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1676 } else { |
695 | 1677 if(s->dquant) cbpc+=8; |
2979 | 1678 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
|
1679 put_bits(&s->pb, |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1680 inter_MCBPC_bits[cbpc + 4], |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1681 inter_MCBPC_code[cbpc + 4]); |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1682 } |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1683 if (s->h263_aic) { |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1684 /* XXX: currently, we do not try to use ac prediction */ |
2979 | 1685 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
|
1686 } |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1687 cbpy = cbp >> 2; |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1688 put_bits(&s->pb, cbpy_tab[cbpy][1], cbpy_tab[cbpy][0]); |
695 | 1689 if(s->dquant) |
1690 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
|
1691 |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
1692 if(interleaved_stats){ |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
1693 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
|
1694 } |
0 | 1695 } |
1696 | |
350
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1697 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
|
1698 /* encode each block */ |
1354 | 1699 h263_encode_block(s, block[i], i); |
2967 | 1700 |
350
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1701 /* Update INTRADC for decoding */ |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1702 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
|
1703 block[i][0] = rec_intradc[i]; |
2967 | 1704 |
350
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1705 } |
0 | 1706 } |
1353
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
1707 |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
1708 if(interleaved_stats){ |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
1709 if (!s->mb_intra) { |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
1710 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
|
1711 s->f_count++; |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
1712 }else{ |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
1713 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
|
1714 s->i_count++; |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
1715 } |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
1716 } |
0 | 1717 } |
815
78accc54493b
put a few large tables under #ifdef CONFIG_ENCODERS or dynamically allocate them
michaelni
parents:
770
diff
changeset
|
1718 #endif |
0 | 1719 |
1656 | 1720 void ff_h263_loop_filter(MpegEncContext * s){ |
1644 | 1721 int qp_c; |
1722 const int linesize = s->linesize; | |
1723 const int uvlinesize= s->uvlinesize; | |
1724 const int xy = s->mb_y * s->mb_stride + s->mb_x; | |
1725 uint8_t *dest_y = s->dest[0]; | |
1726 uint8_t *dest_cb= s->dest[1]; | |
1727 uint8_t *dest_cr= s->dest[2]; | |
2967 | 1728 |
6481 | 1729 // if(s->pict_type==FF_B_TYPE && !s->readable) return; |
1644 | 1730 |
1731 /* | |
1732 Diag Top | |
1733 Left Center | |
1734 */ | |
1735 if(!IS_SKIP(s->current_picture.mb_type[xy])){ | |
1736 qp_c= s->qscale; | |
1737 s->dsp.h263_v_loop_filter(dest_y+8*linesize , linesize, qp_c); | |
1738 s->dsp.h263_v_loop_filter(dest_y+8*linesize+8, linesize, qp_c); | |
1739 }else | |
1740 qp_c= 0; | |
1741 | |
1742 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
|
1743 int qp_dt, qp_tt, qp_tc; |
1644 | 1744 |
1745 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
|
1746 qp_tt=0; |
2967 | 1747 else |
8297
20e0f0809b27
s/qp_t/qp_tt/ to avoid bad examples that could lead to issues with reserved
michael
parents:
8288
diff
changeset
|
1748 qp_tt= s->current_picture.qscale_table[xy-s->mb_stride]; |
1644 | 1749 |
2967 | 1750 if(qp_c) |
1644 | 1751 qp_tc= qp_c; |
1752 else | |
8297
20e0f0809b27
s/qp_t/qp_tt/ to avoid bad examples that could lead to issues with reserved
michael
parents:
8288
diff
changeset
|
1753 qp_tc= qp_tt; |
2967 | 1754 |
1644 | 1755 if(qp_tc){ |
1756 const int chroma_qp= s->chroma_qscale_table[qp_tc]; | |
1757 s->dsp.h263_v_loop_filter(dest_y , linesize, qp_tc); | |
1758 s->dsp.h263_v_loop_filter(dest_y+8, linesize, qp_tc); | |
2967 | 1759 |
1644 | 1760 s->dsp.h263_v_loop_filter(dest_cb , uvlinesize, chroma_qp); |
1761 s->dsp.h263_v_loop_filter(dest_cr , uvlinesize, chroma_qp); | |
1762 } | |
2967 | 1763 |
8297
20e0f0809b27
s/qp_t/qp_tt/ to avoid bad examples that could lead to issues with reserved
michael
parents:
8288
diff
changeset
|
1764 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
|
1765 s->dsp.h263_h_loop_filter(dest_y-8*linesize+8 , linesize, qp_tt); |
2967 | 1766 |
1644 | 1767 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
|
1768 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
|
1769 qp_dt= qp_tt; |
1644 | 1770 else |
1771 qp_dt= s->current_picture.qscale_table[xy-1-s->mb_stride]; | |
2967 | 1772 |
1644 | 1773 if(qp_dt){ |
1774 const int chroma_qp= s->chroma_qscale_table[qp_dt]; | |
1775 s->dsp.h263_h_loop_filter(dest_y -8*linesize , linesize, qp_dt); | |
1776 s->dsp.h263_h_loop_filter(dest_cb-8*uvlinesize, uvlinesize, chroma_qp); | |
2178 | 1777 s->dsp.h263_h_loop_filter(dest_cr-8*uvlinesize, uvlinesize, chroma_qp); |
1644 | 1778 } |
1779 } | |
1780 } | |
1781 | |
1782 if(qp_c){ | |
1783 s->dsp.h263_h_loop_filter(dest_y +8, linesize, qp_c); | |
1784 if(s->mb_y + 1 == s->mb_height) | |
1785 s->dsp.h263_h_loop_filter(dest_y+8*linesize+8, linesize, qp_c); | |
1786 } | |
2967 | 1787 |
1644 | 1788 if(s->mb_x){ |
1789 int qp_lc; | |
1790 if(qp_c || IS_SKIP(s->current_picture.mb_type[xy-1])) | |
1791 qp_lc= qp_c; | |
1792 else | |
1793 qp_lc= s->current_picture.qscale_table[xy-1]; | |
2967 | 1794 |
1644 | 1795 if(qp_lc){ |
1796 s->dsp.h263_h_loop_filter(dest_y, linesize, qp_lc); | |
1797 if(s->mb_y + 1 == s->mb_height){ | |
1798 const int chroma_qp= s->chroma_qscale_table[qp_lc]; | |
1799 s->dsp.h263_h_loop_filter(dest_y +8* linesize, linesize, qp_lc); | |
1800 s->dsp.h263_h_loop_filter(dest_cb , uvlinesize, chroma_qp); | |
1801 s->dsp.h263_h_loop_filter(dest_cr , uvlinesize, chroma_qp); | |
1802 } | |
1803 } | |
1804 } | |
1805 } | |
1806 | |
1057 | 1807 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
|
1808 { |
249
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
1809 int x, y, wrap, a, c, pred_dc, scale, i; |
3781 | 1810 int16_t *dc_val, *ac_val, *ac_val1; |
248
56ee684c48bb
- H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents:
245
diff
changeset
|
1811 |
56ee684c48bb
- H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents:
245
diff
changeset
|
1812 /* find prediction */ |
56ee684c48bb
- H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents:
245
diff
changeset
|
1813 if (n < 4) { |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1936
diff
changeset
|
1814 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
|
1815 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
|
1816 wrap = s->b8_stride; |
248
56ee684c48bb
- H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents:
245
diff
changeset
|
1817 dc_val = s->dc_val[0]; |
249
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
1818 ac_val = s->ac_val[0][0]; |
248
56ee684c48bb
- H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents:
245
diff
changeset
|
1819 scale = s->y_dc_scale; |
56ee684c48bb
- H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents:
245
diff
changeset
|
1820 } else { |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1936
diff
changeset
|
1821 x = s->mb_x; |
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1936
diff
changeset
|
1822 y = s->mb_y; |
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1936
diff
changeset
|
1823 wrap = s->mb_stride; |
248
56ee684c48bb
- H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents:
245
diff
changeset
|
1824 dc_val = s->dc_val[n - 4 + 1]; |
249
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
1825 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
|
1826 scale = s->c_dc_scale; |
56ee684c48bb
- H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents:
245
diff
changeset
|
1827 } |
2967 | 1828 |
249
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
1829 ac_val += ((y) * wrap + (x)) * 16; |
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
1830 ac_val1 = ac_val; |
2967 | 1831 |
248
56ee684c48bb
- H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents:
245
diff
changeset
|
1832 /* B C |
2967 | 1833 * A X |
248
56ee684c48bb
- H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents:
245
diff
changeset
|
1834 */ |
56ee684c48bb
- H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents:
245
diff
changeset
|
1835 a = dc_val[(x - 1) + (y) * wrap]; |
56ee684c48bb
- H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents:
245
diff
changeset
|
1836 c = dc_val[(x) + (y - 1) * wrap]; |
2967 | 1837 |
350
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
346
diff
changeset
|
1838 /* No prediction outside GOB boundary */ |
1639 | 1839 if(s->first_slice_line && n!=3){ |
1840 if(n!=2) c= 1024; | |
1841 if(n!=1 && s->mb_x == s->resync_mb_x) a= 1024; | |
1842 } | |
2967 | 1843 |
248
56ee684c48bb
- H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents:
245
diff
changeset
|
1844 if (s->ac_pred) { |
1639 | 1845 pred_dc = 1024; |
248
56ee684c48bb
- H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents:
245
diff
changeset
|
1846 if (s->h263_aic_dir) { |
56ee684c48bb
- H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents:
245
diff
changeset
|
1847 /* left prediction */ |
249
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
1848 if (a != 1024) { |
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
1849 ac_val -= 16; |
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
1850 for(i=1;i<8;i++) { |
1092 | 1851 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
|
1852 } |
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
1853 pred_dc = a; |
248
56ee684c48bb
- H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents:
245
diff
changeset
|
1854 } |
56ee684c48bb
- H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents:
245
diff
changeset
|
1855 } else { |
56ee684c48bb
- H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents:
245
diff
changeset
|
1856 /* top prediction */ |
249
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
1857 if (c != 1024) { |
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
1858 ac_val -= 16 * wrap; |
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
1859 for(i=1;i<8;i++) { |
1092 | 1860 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
|
1861 } |
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
1862 pred_dc = c; |
248
56ee684c48bb
- H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents:
245
diff
changeset
|
1863 } |
56ee684c48bb
- H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents:
245
diff
changeset
|
1864 } |
249
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
1865 } else { |
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
1866 /* just DC prediction */ |
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
1867 if (a != 1024 && c != 1024) |
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
1868 pred_dc = (a + c) >> 1; |
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
1869 else if (a != 1024) |
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
1870 pred_dc = a; |
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
1871 else |
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
1872 pred_dc = c; |
248
56ee684c48bb
- H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents:
245
diff
changeset
|
1873 } |
2967 | 1874 |
249
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
1875 /* we assume pred is positive */ |
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
1876 block[0]=block[0]*scale + pred_dc; |
2967 | 1877 |
249
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
1878 if (block[0] < 0) |
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
1879 block[0] = 0; |
2967 | 1880 else |
1639 | 1881 block[0] |= 1; |
2967 | 1882 |
249
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
1883 /* Update AC/DC tables */ |
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
1884 dc_val[(x) + (y) * wrap] = block[0]; |
2967 | 1885 |
248
56ee684c48bb
- H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents:
245
diff
changeset
|
1886 /* left copy */ |
56ee684c48bb
- H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents:
245
diff
changeset
|
1887 for(i=1;i<8;i++) |
1092 | 1888 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
|
1889 /* top copy */ |
56ee684c48bb
- H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents:
245
diff
changeset
|
1890 for(i=1;i<8;i++) |
1092 | 1891 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
|
1892 } |
56ee684c48bb
- H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents:
245
diff
changeset
|
1893 |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1936
diff
changeset
|
1894 int16_t *h263_pred_motion(MpegEncContext * s, int block, int dir, |
0 | 1895 int *px, int *py) |
1896 { | |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1936
diff
changeset
|
1897 int wrap; |
1655 | 1898 int16_t *A, *B, *C, (*mot_val)[2]; |
1899 static const int off[4]= {2, 1, 1, -1}; | |
1900 | |
1901 wrap = s->b8_stride; | |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1936
diff
changeset
|
1902 mot_val = s->current_picture.motion_val[dir] + s->block_index[block]; |
1655 | 1903 |
1904 A = mot_val[ - 1]; | |
1905 /* special case for first (slice) line */ | |
1906 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
|
1907 // we can't just change some MVs to simulate that as we need them for the B frames (and ME) |
1655 | 1908 // and if we ever support non rectangular objects than we need to do a few ifs here anyway :( |
1909 if(block==0){ //most common case | |
1910 if(s->mb_x == s->resync_mb_x){ //rare | |
1911 *px= *py = 0; | |
1912 }else if(s->mb_x + 1 == s->resync_mb_x && s->h263_pred){ //rare | |
1913 C = mot_val[off[block] - wrap]; | |
1914 if(s->mb_x==0){ | |
1915 *px = C[0]; | |
1916 *py = C[1]; | |
1917 }else{ | |
1918 *px = mid_pred(A[0], 0, C[0]); | |
1919 *py = mid_pred(A[1], 0, C[1]); | |
1920 } | |
1921 }else{ | |
1922 *px = A[0]; | |
1923 *py = A[1]; | |
1924 } | |
1925 }else if(block==1){ | |
1926 if(s->mb_x + 1 == s->resync_mb_x && s->h263_pred){ //rare | |
1927 C = mot_val[off[block] - wrap]; | |
1928 *px = mid_pred(A[0], 0, C[0]); | |
1929 *py = mid_pred(A[1], 0, C[1]); | |
1930 }else{ | |
1931 *px = A[0]; | |
1932 *py = A[1]; | |
1933 } | |
1934 }else{ /* block==2*/ | |
1935 B = mot_val[ - wrap]; | |
1936 C = mot_val[off[block] - wrap]; | |
1937 if(s->mb_x == s->resync_mb_x) //rare | |
1938 A[0]=A[1]=0; | |
2967 | 1939 |
1655 | 1940 *px = mid_pred(A[0], B[0], C[0]); |
1941 *py = mid_pred(A[1], B[1], C[1]); | |
1942 } | |
1943 } else { | |
1944 B = mot_val[ - wrap]; | |
1945 C = mot_val[off[block] - wrap]; | |
1946 *px = mid_pred(A[0], B[0], C[0]); | |
1947 *py = mid_pred(A[1], B[1], C[1]); | |
1948 } | |
1949 return *mot_val; | |
1950 } | |
1951 | |
8590 | 1952 #if CONFIG_ENCODERS |
2017 | 1953 void ff_h263_encode_motion(MpegEncContext * s, int val, int f_code) |
0 | 1954 { |
702 | 1955 int range, l, bit_size, sign, code, bits; |
0 | 1956 |
1957 if (val == 0) { | |
1958 /* zero vector */ | |
1959 code = 0; | |
1960 put_bits(&s->pb, mvtab[code][1], mvtab[code][0]); | |
1961 } else { | |
324 | 1962 bit_size = f_code - 1; |
0 | 1963 range = 1 << bit_size; |
1964 /* modulo encoding */ | |
2093 | 1965 l= INT_BIT - 6 - bit_size; |
1966 val = (val<<l)>>l; | |
702 | 1967 sign = val>>31; |
1968 val= (val^sign)-sign; | |
1969 sign&=1; | |
2093 | 1970 |
312 | 1971 val--; |
1972 code = (val >> bit_size) + 1; | |
1973 bits = val & (range - 1); | |
0 | 1974 |
2967 | 1975 put_bits(&s->pb, mvtab[code][1] + 1, (mvtab[code][0] << 1) | sign); |
0 | 1976 if (bit_size > 0) { |
1977 put_bits(&s->pb, bit_size, bits); | |
1978 } | |
1979 } | |
1980 } | |
1981 | |
277
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
274
diff
changeset
|
1982 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
|
1983 { |
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
274
diff
changeset
|
1984 int f_code; |
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
274
diff
changeset
|
1985 int mv; |
2967 | 1986 |
277
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
274
diff
changeset
|
1987 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
|
1988 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
|
1989 int len; |
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
274
diff
changeset
|
1990 |
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
274
diff
changeset
|
1991 if(mv==0) len= mvtab[0][1]; |
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
274
diff
changeset
|
1992 else{ |
9465
9dcb191f1df3
Remove unused variable in init_mv_penalty_and_fcode() found by CSA.
michael
parents:
9458
diff
changeset
|
1993 int val, bit_size, code; |
277
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
274
diff
changeset
|
1994 |
1893
779bdf5063ce
1000000l (using uninitalized variable for initalizing bits per MV table)
michael
parents:
1873
diff
changeset
|
1995 bit_size = f_code - 1; |
277
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
274
diff
changeset
|
1996 |
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
274
diff
changeset
|
1997 val=mv; |
2967 | 1998 if (val < 0) |
277
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
274
diff
changeset
|
1999 val = -val; |
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
274
diff
changeset
|
2000 val--; |
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
274
diff
changeset
|
2001 code = (val >> bit_size) + 1; |
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
274
diff
changeset
|
2002 if(code<33){ |
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
274
diff
changeset
|
2003 len= mvtab[code][1] + 1 + bit_size; |
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
274
diff
changeset
|
2004 }else{ |
2985 | 2005 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
|
2006 } |
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
274
diff
changeset
|
2007 } |
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
274
diff
changeset
|
2008 |
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
274
diff
changeset
|
2009 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
|
2010 } |
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
274
diff
changeset
|
2011 } |
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
274
diff
changeset
|
2012 |
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
274
diff
changeset
|
2013 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
|
2014 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
|
2015 fcode_tab[mv+MAX_MV]= f_code; |
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
274
diff
changeset
|
2016 } |
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
274
diff
changeset
|
2017 } |
287 | 2018 |
2019 for(mv=0; mv<MAX_MV*2+1; mv++){ | |
2020 umv_fcode_tab[mv]= 1; | |
2021 } | |
277
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
274
diff
changeset
|
2022 } |
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
|
2023 |
468 | 2024 static void init_uni_dc_tab(void) |
293 | 2025 { |
2026 int level, uni_code, uni_len; | |
2027 | |
312 | 2028 for(level=-256; level<256; level++){ |
293 | 2029 int size, v, l; |
2030 /* find number of bits */ | |
2031 size = 0; | |
2032 v = abs(level); | |
2033 while (v) { | |
2034 v >>= 1; | |
2979 | 2035 size++; |
293 | 2036 } |
2037 | |
2038 if (level < 0) | |
2039 l= (-level) ^ ((1 << size) - 1); | |
2040 else | |
2041 l= level; | |
2042 | |
2043 /* luminance */ | |
2044 uni_code= DCtab_lum[size][0]; | |
2045 uni_len = DCtab_lum[size][1]; | |
2046 | |
2047 if (size > 0) { | |
2048 uni_code<<=size; uni_code|=l; | |
2049 uni_len+=size; | |
2050 if (size > 8){ | |
2051 uni_code<<=1; uni_code|=1; | |
2052 uni_len++; | |
2053 } | |
2054 } | |
1013 | 2055 uni_DCtab_lum_bits[level+256]= uni_code; |
2056 uni_DCtab_lum_len [level+256]= uni_len; | |
293 | 2057 |
2058 /* chrominance */ | |
2059 uni_code= DCtab_chrom[size][0]; | |
2060 uni_len = DCtab_chrom[size][1]; | |
2967 | 2061 |
293 | 2062 if (size > 0) { |
2063 uni_code<<=size; uni_code|=l; | |
2064 uni_len+=size; | |
2065 if (size > 8){ | |
2066 uni_code<<=1; uni_code|=1; | |
2067 uni_len++; | |
2068 } | |
2069 } | |
1013 | 2070 uni_DCtab_chrom_bits[level+256]= uni_code; |
2071 uni_DCtab_chrom_len [level+256]= uni_len; | |
293 | 2072 |
2073 } | |
2074 } | |
2075 | |
1064 | 2076 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
|
2077 int slevel, run, last; |
2967 | 2078 |
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
|
2079 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
|
2080 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
|
2081 |
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
|
2082 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
|
2083 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
|
2084 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
|
2085 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
|
2086 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
|
2087 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
|
2088 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
|
2089 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
|
2090 int level1, run1; |
2967 | 2091 |
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
|
2092 len_tab[index]= 100; |
2967 | 2093 |
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
|
2094 /* 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
|
2095 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
|
2096 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
|
2097 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
|
2098 bits=bits*2+sign; len++; |
2967 | 2099 |
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
|
2100 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
|
2101 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
|
2102 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
|
2103 } |
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
|
2104 /* 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
|
2105 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
|
2106 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
|
2107 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
|
2108 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
|
2109 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
|
2110 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
|
2111 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
|
2112 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
|
2113 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
|
2114 bits=bits*2+sign; len++; |
2967 | 2115 |
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
|
2116 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
|
2117 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
|
2118 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
|
2119 } |
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
|
2120 } |
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
|
2121 /* 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
|
2122 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
|
2123 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
|
2124 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
|
2125 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
|
2126 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
|
2127 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
|
2128 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
|
2129 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
|
2130 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
|
2131 bits=bits*2+sign; len++; |
2967 | 2132 |
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
|
2133 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
|
2134 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
|
2135 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
|
2136 } |
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
|
2137 } |
2967 | 2138 /* 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
|
2139 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
|
2140 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
|
2141 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
|
2142 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
|
2143 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
|
2144 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
|
2145 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
|
2146 bits=bits*2+1; len++; //marker |
2967 | 2147 |
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
|
2148 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
|
2149 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
|
2150 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
|
2151 } |
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
|
2152 } |
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
|
2153 } |
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
|
2154 } |
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
|
2155 } |
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
|
2156 |
2253 | 2157 static void init_uni_h263_rl_tab(RLTable *rl, uint32_t *bits_tab, uint8_t *len_tab){ |
2158 int slevel, run, last; | |
2967 | 2159 |
2253 | 2160 assert(MAX_LEVEL >= 64); |
2161 assert(MAX_RUN >= 63); | |
2162 | |
2163 for(slevel=-64; slevel<64; slevel++){ | |
2164 if(slevel==0) continue; | |
2165 for(run=0; run<64; run++){ | |
2166 for(last=0; last<=1; last++){ | |
2167 const int index= UNI_MPEG4_ENC_INDEX(last, run, slevel+64); | |
2168 int level= slevel < 0 ? -slevel : slevel; | |
2169 int sign= slevel < 0 ? 1 : 0; | |
2170 int bits, len, code; | |
2967 | 2171 |
2253 | 2172 len_tab[index]= 100; |
2967 | 2173 |
2253 | 2174 /* ESC0 */ |
2175 code= get_rl_index(rl, last, run, level); | |
2176 bits= rl->table_vlc[code][0]; | |
2177 len= rl->table_vlc[code][1]; | |
2178 bits=bits*2+sign; len++; | |
2967 | 2179 |
2253 | 2180 if(code!=rl->n && len < len_tab[index]){ |
2181 if(bits_tab) bits_tab[index]= bits; | |
2182 len_tab [index]= len; | |
2183 } | |
2184 /* ESC */ | |
2185 bits= rl->table_vlc[rl->n][0]; | |
2186 len = rl->table_vlc[rl->n][1]; | |
2187 bits=bits*2+last; len++; | |
2188 bits=bits*64+run; len+=6; | |
2189 bits=bits*256+(level&0xff); len+=8; | |
2967 | 2190 |
2253 | 2191 if(len < len_tab[index]){ |
2192 if(bits_tab) bits_tab[index]= bits; | |
2193 len_tab [index]= len; | |
2194 } | |
2195 } | |
2196 } | |
2197 } | |
2198 } | |
2199 | |
277
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
274
diff
changeset
|
2200 void h263_encode_init(MpegEncContext *s) |
0 | 2201 { |
2202 static int done = 0; | |
2203 | |
2204 if (!done) { | |
2205 done = 1; | |
293 | 2206 |
2207 init_uni_dc_tab(); | |
2208 | |
4668 | 2209 init_rl(&rl_inter, static_rl_table_store[0]); |
2210 init_rl(&rl_intra, static_rl_table_store[1]); | |
2211 init_rl(&rl_intra_aic, static_rl_table_store[2]); | |
2967 | 2212 |
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
|
2213 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
|
2214 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
|
2215 |
2253 | 2216 init_uni_h263_rl_tab(&rl_intra_aic, NULL, uni_h263_intra_aic_rl_len); |
2217 init_uni_h263_rl_tab(&rl_inter , NULL, uni_h263_inter_rl_len); | |
2218 | |
277
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
274
diff
changeset
|
2219 init_mv_penalty_and_fcode(s); |
0 | 2220 } |
936 | 2221 s->me.mv_penalty= mv_penalty; //FIXME exact table for msmpeg4 & h263p |
2967 | 2222 |
2253 | 2223 s->intra_ac_vlc_length =s->inter_ac_vlc_length = uni_h263_inter_rl_len; |
2224 s->intra_ac_vlc_last_length=s->inter_ac_vlc_last_length= uni_h263_inter_rl_len + 128*64; | |
2225 if(s->h263_aic){ | |
2226 s->intra_ac_vlc_length = uni_h263_intra_aic_rl_len; | |
2227 s->intra_ac_vlc_last_length= uni_h263_intra_aic_rl_len + 128*64; | |
2228 } | |
2229 s->ac_esc_length= 7+1+6+8; | |
2230 | |
287 | 2231 // use fcodes >1 only for mpeg4 & h263 & h263p FIXME |
344 | 2232 switch(s->codec_id){ |
2233 case CODEC_ID_MPEG4: | |
2234 s->fcode_tab= fcode_tab; | |
2235 s->min_qcoeff= -2048; | |
2236 s->max_qcoeff= 2047; | |
945 | 2237 s->intra_ac_vlc_length = uni_mpeg4_intra_rl_len; |
2238 s->intra_ac_vlc_last_length= uni_mpeg4_intra_rl_len + 128*64; | |
2239 s->inter_ac_vlc_length = uni_mpeg4_inter_rl_len; | |
2240 s->inter_ac_vlc_last_length= uni_mpeg4_inter_rl_len + 128*64; | |
1013 | 2241 s->luma_dc_vlc_length= uni_DCtab_lum_len; |
2242 s->chroma_dc_vlc_length= uni_DCtab_chrom_len; | |
945 | 2243 s->ac_esc_length= 7+2+1+6+1+12+1; |
1799 | 2244 s->y_dc_scale_table= ff_mpeg4_y_dc_scale_table; |
2245 s->c_dc_scale_table= ff_mpeg4_c_dc_scale_table; | |
2246 | |
1424 | 2247 if(s->flags & CODEC_FLAG_GLOBAL_HEADER){ |
1483 | 2248 |
1424 | 2249 s->avctx->extradata= av_malloc(1024); |
1522
79dddc5cd990
removed the obsolete and unused parameters of init_put_bits
alex
parents:
1521
diff
changeset
|
2250 init_put_bits(&s->pb, s->avctx->extradata, 1024); |
2967 | 2251 |
2572
c22ad129a91b
support omiting various headers in mpeg4 as WMP seems to have difficulty with them
michael
parents:
2554
diff
changeset
|
2252 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
|
2253 mpeg4_encode_visual_object_header(s); |
1424 | 2254 mpeg4_encode_vol_header(s, 0, 0); |
2255 | |
2256 // ff_mpeg4_stuffing(&s->pb); ? | |
2257 flush_put_bits(&s->pb); | |
1786 | 2258 s->avctx->extradata_size= (put_bits_count(&s->pb)+7)>>3; |
1424 | 2259 } |
2967 | 2260 |
344 | 2261 break; |
2262 case CODEC_ID_H263P: | |
1666 | 2263 if(s->umvplus) |
2264 s->fcode_tab= umv_fcode_tab; | |
2265 if(s->modified_quant){ | |
2266 s->min_qcoeff= -2047; | |
2267 s->max_qcoeff= 2047; | |
2268 }else{ | |
2269 s->min_qcoeff= -127; | |
2270 s->max_qcoeff= 127; | |
2271 } | |
344 | 2272 break; |
2967 | 2273 //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
|
2274 case CODEC_ID_FLV1: |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
2275 if (s->h263_flv > 1) { |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
2276 s->min_qcoeff= -1023; |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
2277 s->max_qcoeff= 1023; |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
2278 } else { |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
2279 s->min_qcoeff= -127; |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
2280 s->max_qcoeff= 127; |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
2281 } |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
2282 s->y_dc_scale_table= |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
2283 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
|
2284 break; |
2646
c735e3e60ca7
Even More spelling errors. patch by (Kevin Baragona <kevinmb500 gawab com)
michael
parents:
2639
diff
changeset
|
2285 default: //nothing needed - default table already set in mpegvideo.c |
1089 | 2286 s->min_qcoeff= -127; |
344 | 2287 s->max_qcoeff= 127; |
498 | 2288 s->y_dc_scale_table= |
2289 s->c_dc_scale_table= ff_mpeg1_dc_scale_table; | |
344 | 2290 } |
0 | 2291 } |
2292 | |
2293 /***************************************************/ | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
2294 /** |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
2295 * add mpeg4 stuffing bits (01...1) |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
2296 */ |
453 | 2297 void ff_mpeg4_stuffing(PutBitContext * pbc) |
262 | 2298 { |
2299 int length; | |
2300 put_bits(pbc, 1, 0); | |
1786 | 2301 length= (-put_bits_count(pbc))&7; |
453 | 2302 if(length) put_bits(pbc, length, (1<<length)-1); |
262 | 2303 } |
2304 | |
327 | 2305 /* must be called before writing the header */ |
5273
101f20612a94
Split ff_set_mpeg4_time() and move the non mpeg4 specific part
aurel
parents:
5268
diff
changeset
|
2306 void ff_set_mpeg4_time(MpegEncContext * s){ |
6481 | 2307 if(s->pict_type==FF_B_TYPE){ |
3247 | 2308 ff_mpeg4_init_direct_mv(s); |
327 | 2309 }else{ |
2310 s->last_time_base= s->time_base; | |
5273
101f20612a94
Split ff_set_mpeg4_time() and move the non mpeg4 specific part
aurel
parents:
5268
diff
changeset
|
2311 s->time_base= s->time/s->avctx->time_base.den; |
327 | 2312 } |
2313 } | |
2314 | |
942 | 2315 static void mpeg4_encode_gop_header(MpegEncContext * s){ |
2316 int hours, minutes, seconds; | |
1763
951403db901f
first coded vs. first displayed pts (segfault & pts fix if b frames are used)
michael
parents:
1760
diff
changeset
|
2317 int64_t time; |
2967 | 2318 |
942 | 2319 put_bits(&s->pb, 16, 0); |
2320 put_bits(&s->pb, 16, GOP_STARTCODE); | |
2967 | 2321 |
1831
cd2d7fcfab7a
use AVFrame.pts=AV_NOPTS_VALUE instead of AVFrame.pts=0
michael
parents:
1829
diff
changeset
|
2322 time= s->current_picture_ptr->pts; |
cd2d7fcfab7a
use AVFrame.pts=AV_NOPTS_VALUE instead of AVFrame.pts=0
michael
parents:
1829
diff
changeset
|
2323 if(s->reordered_input_picture[1]) |
cd2d7fcfab7a
use AVFrame.pts=AV_NOPTS_VALUE instead of AVFrame.pts=0
michael
parents:
1829
diff
changeset
|
2324 time= FFMIN(time, s->reordered_input_picture[1]->pts); |
2637 | 2325 time= time*s->avctx->time_base.num; |
2326 | |
2327 seconds= time/s->avctx->time_base.den; | |
942 | 2328 minutes= seconds/60; seconds %= 60; |
2329 hours= minutes/60; minutes %= 60; | |
2330 hours%=24; | |
2331 | |
2332 put_bits(&s->pb, 5, hours); | |
2333 put_bits(&s->pb, 6, minutes); | |
2334 put_bits(&s->pb, 1, 1); | |
2335 put_bits(&s->pb, 6, seconds); | |
2967 | 2336 |
2337 put_bits(&s->pb, 1, !!(s->flags&CODEC_FLAG_CLOSED_GOP)); | |
942 | 2338 put_bits(&s->pb, 1, 0); //broken link == NO |
2967 | 2339 |
2340 s->last_time_base= time / s->avctx->time_base.den; | |
942 | 2341 |
2342 ff_mpeg4_stuffing(&s->pb); | |
2343 } | |
2344 | |
2345 static void mpeg4_encode_visual_object_header(MpegEncContext * s){ | |
2346 int profile_and_level_indication; | |
2347 int vo_ver_id; | |
2967 | 2348 |
2167 | 2349 if(s->avctx->profile != FF_PROFILE_UNKNOWN){ |
2350 profile_and_level_indication = s->avctx->profile << 4; | |
2351 }else if(s->max_b_frames || s->quarter_sample){ | |
2352 profile_and_level_indication= 0xF0; // adv simple | |
2353 }else{ | |
2354 profile_and_level_indication= 0x00; // simple | |
2355 } | |
2356 | |
2357 if(s->avctx->level != FF_LEVEL_UNKNOWN){ | |
2358 profile_and_level_indication |= s->avctx->level; | |
2359 }else{ | |
2360 profile_and_level_indication |= 1; //level 1 | |
2361 } | |
2362 | |
2363 if(profile_and_level_indication>>4 == 0xF){ | |
942 | 2364 vo_ver_id= 5; |
2365 }else{ | |
2366 vo_ver_id= 1; | |
2367 } | |
2167 | 2368 |
942 | 2369 //FIXME levels |
2370 | |
2371 put_bits(&s->pb, 16, 0); | |
2372 put_bits(&s->pb, 16, VOS_STARTCODE); | |
1350
e7c8051e1849
the reference sw doesnt like some legal headers ...
michaelni
parents:
1346
diff
changeset
|
2373 |
942 | 2374 put_bits(&s->pb, 8, profile_and_level_indication); |
1350
e7c8051e1849
the reference sw doesnt like some legal headers ...
michaelni
parents:
1346
diff
changeset
|
2375 |
942 | 2376 put_bits(&s->pb, 16, 0); |
2377 put_bits(&s->pb, 16, VISUAL_OBJ_STARTCODE); | |
2967 | 2378 |
942 | 2379 put_bits(&s->pb, 1, 1); |
2380 put_bits(&s->pb, 4, vo_ver_id); | |
2381 put_bits(&s->pb, 3, 1); //priority | |
2967 | 2382 |
942 | 2383 put_bits(&s->pb, 4, 1); //visual obj type== video obj |
2967 | 2384 |
942 | 2385 put_bits(&s->pb, 1, 0); //video signal type == no clue //FIXME |
2386 | |
2387 ff_mpeg4_stuffing(&s->pb); | |
2388 } | |
2389 | |
2390 static void mpeg4_encode_vol_header(MpegEncContext * s, int vo_number, int vol_number) | |
0 | 2391 { |
942 | 2392 int vo_ver_id; |
336 | 2393 |
8596
68e959302527
replace all occurrence of ENABLE_ by the corresponding CONFIG_, HAVE_ or ARCH_
aurel
parents:
8590
diff
changeset
|
2394 if (!CONFIG_MPEG4_ENCODER) return; |
5275
91416b4f1929
Better place to disable some mpeg4 code and ensure that
aurel
parents:
5274
diff
changeset
|
2395 |
942 | 2396 if(s->max_b_frames || s->quarter_sample){ |
2397 vo_ver_id= 5; | |
923 | 2398 s->vo_type= ADV_SIMPLE_VO_TYPE; |
2399 }else{ | |
942 | 2400 vo_ver_id= 1; |
923 | 2401 s->vo_type= SIMPLE_VO_TYPE; |
2402 } | |
336 | 2403 |
263 | 2404 put_bits(&s->pb, 16, 0); |
942 | 2405 put_bits(&s->pb, 16, 0x100 + vo_number); /* video obj */ |
263 | 2406 put_bits(&s->pb, 16, 0); |
942 | 2407 put_bits(&s->pb, 16, 0x120 + vol_number); /* video obj layer */ |
263 | 2408 |
2979 | 2409 put_bits(&s->pb, 1, 0); /* random access vol */ |
2410 put_bits(&s->pb, 8, s->vo_type); /* video obj type indication */ | |
2572
c22ad129a91b
support omiting various headers in mpeg4 as WMP seems to have difficulty with them
michael
parents:
2554
diff
changeset
|
2411 if(s->workaround_bugs & FF_BUG_MS) { |
2979 | 2412 put_bits(&s->pb, 1, 0); /* is obj layer id= no */ |
2572
c22ad129a91b
support omiting various headers in mpeg4 as WMP seems to have difficulty with them
michael
parents:
2554
diff
changeset
|
2413 } else { |
2979 | 2414 put_bits(&s->pb, 1, 1); /* is obj layer id= yes */ |
2415 put_bits(&s->pb, 4, vo_ver_id); /* is obj layer ver id */ | |
2416 put_bits(&s->pb, 3, 1); /* is obj layer priority */ | |
2572
c22ad129a91b
support omiting various headers in mpeg4 as WMP seems to have difficulty with them
michael
parents:
2554
diff
changeset
|
2417 } |
2967 | 2418 |
1548 | 2419 aspect_to_info(s, s->avctx->sample_aspect_ratio); |
880 | 2420 |
2421 put_bits(&s->pb, 4, s->aspect_ratio_info);/* aspect ratio info */ | |
1548 | 2422 if (s->aspect_ratio_info == FF_ASPECT_EXTENDED){ |
2423 put_bits(&s->pb, 8, s->avctx->sample_aspect_ratio.num); | |
2424 put_bits(&s->pb, 8, s->avctx->sample_aspect_ratio.den); | |
669
b4bddbde44f3
aspect (ext. par too) support for h263 and mpeg4 (inc. build becouse of new vars)
al3x
parents:
667
diff
changeset
|
2425 } |
336 | 2426 |
2572
c22ad129a91b
support omiting various headers in mpeg4 as WMP seems to have difficulty with them
michael
parents:
2554
diff
changeset
|
2427 if(s->workaround_bugs & FF_BUG_MS) { // |
2979 | 2428 put_bits(&s->pb, 1, 0); /* vol control parameters= no @@@ */ |
2572
c22ad129a91b
support omiting various headers in mpeg4 as WMP seems to have difficulty with them
michael
parents:
2554
diff
changeset
|
2429 } else { |
2979 | 2430 put_bits(&s->pb, 1, 1); /* vol control parameters= yes */ |
2431 put_bits(&s->pb, 2, 1); /* chroma format YUV 420/YV12 */ | |
2572
c22ad129a91b
support omiting various headers in mpeg4 as WMP seems to have difficulty with them
michael
parents:
2554
diff
changeset
|
2432 put_bits(&s->pb, 1, s->low_delay); |
2979 | 2433 put_bits(&s->pb, 1, 0); /* vbv parameters= no */ |
2434 } | |
2435 | |
2436 put_bits(&s->pb, 2, RECT_SHAPE); /* vol shape= rectangle */ | |
2437 put_bits(&s->pb, 1, 1); /* marker bit */ | |
2967 | 2438 |
2637 | 2439 put_bits(&s->pb, 16, s->avctx->time_base.den); |
263 | 2440 if (s->time_increment_bits < 1) |
2441 s->time_increment_bits = 1; | |
2979 | 2442 put_bits(&s->pb, 1, 1); /* marker bit */ |
2443 put_bits(&s->pb, 1, 0); /* fixed vop rate=no */ | |
2444 put_bits(&s->pb, 1, 1); /* marker bit */ | |
2445 put_bits(&s->pb, 13, s->width); /* vol width */ | |
2446 put_bits(&s->pb, 1, 1); /* marker bit */ | |
2447 put_bits(&s->pb, 13, s->height); /* vol height */ | |
2448 put_bits(&s->pb, 1, 1); /* marker bit */ | |
697 | 2449 put_bits(&s->pb, 1, s->progressive_sequence ? 0 : 1); |
2979 | 2450 put_bits(&s->pb, 1, 1); /* obmc disable */ |
263 | 2451 if (vo_ver_id == 1) { |
2979 | 2452 put_bits(&s->pb, 1, s->vol_sprite_usage); /* sprite enable */ |
942 | 2453 }else{ |
2979 | 2454 put_bits(&s->pb, 2, s->vol_sprite_usage); /* sprite enable */ |
2455 } | |
2456 | |
2457 put_bits(&s->pb, 1, 0); /* not 8 bit == false */ | |
2458 put_bits(&s->pb, 1, s->mpeg_quant); /* quant type= (0=h263 style)*/ | |
1411 | 2459 |
2460 if(s->mpeg_quant){ | |
2461 ff_write_quant_matrix(&s->pb, s->avctx->intra_matrix); | |
2462 ff_write_quant_matrix(&s->pb, s->avctx->inter_matrix); | |
2463 } | |
599 | 2464 |
263 | 2465 if (vo_ver_id != 1) |
936 | 2466 put_bits(&s->pb, 1, s->quarter_sample); |
2979 | 2467 put_bits(&s->pb, 1, 1); /* complexity estimation disable */ |
453 | 2468 s->resync_marker= s->rtp_mode; |
2469 put_bits(&s->pb, 1, s->resync_marker ? 0 : 1);/* resync marker disable */ | |
2470 put_bits(&s->pb, 1, s->data_partitioning ? 1 : 0); | |
2471 if(s->data_partitioning){ | |
2979 | 2472 put_bits(&s->pb, 1, 0); /* no rvlc */ |
453 | 2473 } |
2474 | |
263 | 2475 if (vo_ver_id != 1){ |
2979 | 2476 put_bits(&s->pb, 1, 0); /* newpred */ |
2477 put_bits(&s->pb, 1, 0); /* reduced res vop */ | |
2478 } | |
2479 put_bits(&s->pb, 1, 0); /* scalability */ | |
2967 | 2480 |
453 | 2481 ff_mpeg4_stuffing(&s->pb); |
676 | 2482 |
2483 /* user data */ | |
1092 | 2484 if(!(s->flags & CODEC_FLAG_BITEXACT)){ |
676 | 2485 put_bits(&s->pb, 16, 0); |
2979 | 2486 put_bits(&s->pb, 16, 0x1B2); /* user_data */ |
2487 ff_put_string(&s->pb, LIBAVCODEC_IDENT, 0); | |
676 | 2488 } |
263 | 2489 } |
2490 | |
2491 /* write mpeg4 VOP header */ | |
2492 void mpeg4_encode_picture_header(MpegEncContext * s, int picture_number) | |
2493 { | |
324 | 2494 int time_incr; |
2495 int time_div, time_mod; | |
2967 | 2496 |
6481 | 2497 if(s->pict_type==FF_I_TYPE){ |
953 | 2498 if(!(s->flags&CODEC_FLAG_GLOBAL_HEADER)){ |
2658
d1609cfeb1d0
#defines for strict_std_compliance and split between inofficial extensions and non standarized things
michael
parents:
2646
diff
changeset
|
2499 if(s->strict_std_compliance < FF_COMPLIANCE_VERY_STRICT) //HACK, the reference sw is buggy |
1350
e7c8051e1849
the reference sw doesnt like some legal headers ...
michaelni
parents:
1346
diff
changeset
|
2500 mpeg4_encode_visual_object_header(s); |
2658
d1609cfeb1d0
#defines for strict_std_compliance and split between inofficial extensions and non standarized things
michael
parents:
2646
diff
changeset
|
2501 if(s->strict_std_compliance < FF_COMPLIANCE_VERY_STRICT || picture_number==0) //HACK, the reference sw is buggy |
1350
e7c8051e1849
the reference sw doesnt like some legal headers ...
michaelni
parents:
1346
diff
changeset
|
2502 mpeg4_encode_vol_header(s, 0, 0); |
942 | 2503 } |
2572
c22ad129a91b
support omiting various headers in mpeg4 as WMP seems to have difficulty with them
michael
parents:
2554
diff
changeset
|
2504 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
|
2505 mpeg4_encode_gop_header(s); |
453 | 2506 } |
2967 | 2507 |
6481 | 2508 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
|
2509 |
2979 | 2510 put_bits(&s->pb, 16, 0); /* vop header */ |
2511 put_bits(&s->pb, 16, VOP_STARTCODE); /* vop header */ | |
2512 put_bits(&s->pb, 2, s->pict_type - 1); /* pict type: I = 0 , P = 1 */ | |
324 | 2513 |
2679 | 2514 assert(s->time>=0); |
2637 | 2515 time_div= s->time/s->avctx->time_base.den; |
2516 time_mod= s->time%s->avctx->time_base.den; | |
324 | 2517 time_incr= time_div - s->last_time_base; |
1936
e5b0b33cf8aa
assert(time_incr >= 0) so its clear that this MUST be the case
michael
parents:
1914
diff
changeset
|
2518 assert(time_incr >= 0); |
324 | 2519 while(time_incr--) |
2520 put_bits(&s->pb, 1, 1); | |
2967 | 2521 |
0 | 2522 put_bits(&s->pb, 1, 0); |
2523 | |
2979 | 2524 put_bits(&s->pb, 1, 1); /* marker */ |
2525 put_bits(&s->pb, s->time_increment_bits, time_mod); /* time increment */ | |
2526 put_bits(&s->pb, 1, 1); /* marker */ | |
2527 put_bits(&s->pb, 1, 1); /* vop coded */ | |
6481 | 2528 if ( s->pict_type == FF_P_TYPE |
2529 || (s->pict_type == FF_S_TYPE && s->vol_sprite_usage==GMC_SPRITE)) { | |
2979 | 2530 put_bits(&s->pb, 1, s->no_rounding); /* rounding type */ |
2531 } | |
2532 put_bits(&s->pb, 3, 0); /* intra dc VLC threshold */ | |
697 | 2533 if(!s->progressive_sequence){ |
1659 | 2534 put_bits(&s->pb, 1, s->current_picture_ptr->top_field_first); |
697 | 2535 put_bits(&s->pb, 1, s->alternate_scan); |
2536 } | |
263 | 2537 //FIXME sprite stuff |
0 | 2538 |
2539 put_bits(&s->pb, 5, s->qscale); | |
2540 | |
6481 | 2541 if (s->pict_type != FF_I_TYPE) |
2979 | 2542 put_bits(&s->pb, 3, s->f_code); /* fcode_for */ |
6481 | 2543 if (s->pict_type == FF_B_TYPE) |
2979 | 2544 put_bits(&s->pb, 3, s->b_code); /* fcode_back */ |
0 | 2545 } |
2546 | |
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
|
2547 #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
|
2548 |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
2549 /** |
1034 | 2550 * predicts the ac. |
2551 * @param n block index (0-3 are luma, 4-5 are chroma) | |
2552 * @param dir the ac prediction direction | |
2553 */ | |
1008 | 2554 void mpeg4_pred_ac(MpegEncContext * s, DCTELEM *block, int n, |
0 | 2555 int dir) |
2556 { | |
266 | 2557 int i; |
1064 | 2558 int16_t *ac_val, *ac_val1; |
903 | 2559 int8_t * const qscale_table= s->current_picture.qscale_table; |
0 | 2560 |
2561 /* find prediction */ | |
266 | 2562 ac_val = s->ac_val[0][0] + s->block_index[n] * 16; |
0 | 2563 ac_val1 = ac_val; |
2564 if (s->ac_pred) { | |
2565 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
|
2566 const int xy= s->mb_x-1 + s->mb_y*s->mb_stride; |
0 | 2567 /* left prediction */ |
2568 ac_val -= 16; | |
2967 | 2569 |
903 | 2570 if(s->mb_x==0 || s->qscale == qscale_table[xy] || n==1 || n==3){ |
575 | 2571 /* same qscale */ |
2572 for(i=1;i<8;i++) { | |
1092 | 2573 block[s->dsp.idct_permutation[i<<3]] += ac_val[i]; |
575 | 2574 } |
2575 }else{ | |
2576 /* different qscale, we must rescale */ | |
2577 for(i=1;i<8;i++) { | |
1092 | 2578 block[s->dsp.idct_permutation[i<<3]] += ROUNDED_DIV(ac_val[i]*qscale_table[xy], s->qscale); |
575 | 2579 } |
0 | 2580 } |
2581 } 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
|
2582 const int xy= s->mb_x + s->mb_y*s->mb_stride - s->mb_stride; |
0 | 2583 /* top prediction */ |
266 | 2584 ac_val -= 16 * s->block_wrap[n]; |
575 | 2585 |
903 | 2586 if(s->mb_y==0 || s->qscale == qscale_table[xy] || n==2 || n==3){ |
575 | 2587 /* same qscale */ |
2588 for(i=1;i<8;i++) { | |
1092 | 2589 block[s->dsp.idct_permutation[i]] += ac_val[i + 8]; |
575 | 2590 } |
2591 }else{ | |
2592 /* different qscale, we must rescale */ | |
2593 for(i=1;i<8;i++) { | |
1092 | 2594 block[s->dsp.idct_permutation[i]] += ROUNDED_DIV(ac_val[i + 8]*qscale_table[xy], s->qscale); |
575 | 2595 } |
0 | 2596 } |
2597 } | |
2598 } | |
2599 /* left copy */ | |
2600 for(i=1;i<8;i++) | |
1092 | 2601 ac_val1[i ] = block[s->dsp.idct_permutation[i<<3]]; |
591 | 2602 |
0 | 2603 /* top copy */ |
2604 for(i=1;i<8;i++) | |
1092 | 2605 ac_val1[8 + i] = block[s->dsp.idct_permutation[i ]]; |
591 | 2606 |
0 | 2607 } |
2608 | |
8590 | 2609 #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
|
2610 |
1034 | 2611 /** |
2612 * encodes the dc value. | |
2613 * @param n block index (0-3 are luma, 4-5 are chroma) | |
2614 */ | |
453 | 2615 static inline void mpeg4_encode_dc(PutBitContext * s, int level, int n) |
265
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
2616 { |
293 | 2617 #if 1 |
2618 level+=256; | |
2619 if (n < 4) { | |
2979 | 2620 /* luminance */ |
2621 put_bits(s, uni_DCtab_lum_len[level], uni_DCtab_lum_bits[level]); | |
293 | 2622 } else { |
2979 | 2623 /* chrominance */ |
2624 put_bits(s, uni_DCtab_chrom_len[level], uni_DCtab_chrom_bits[level]); | |
293 | 2625 } |
2626 #else | |
265
4e9e728021d8
use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents:
264
diff
changeset
|
2627 int size, v; |
0 | 2628 /* find number of bits */ |
2629 size = 0; | |
2630 v = abs(level); | |
2631 while (v) { | |
2979 | 2632 v >>= 1; |
2633 size++; | |
0 | 2634 } |
2635 | |
2636 if (n < 4) { | |
2979 | 2637 /* luminance */ |
2638 put_bits(&s->pb, DCtab_lum[size][1], DCtab_lum[size][0]); | |
0 | 2639 } else { |
2979 | 2640 /* chrominance */ |
2641 put_bits(&s->pb, DCtab_chrom[size][1], DCtab_chrom[size][0]); | |
0 | 2642 } |
2643 | |
2644 /* encode remaining bits */ | |
2645 if (size > 0) { | |
2979 | 2646 if (level < 0) |
2647 level = (-level) ^ ((1 << size) - 1); | |
2648 put_bits(&s->pb, size, level); | |
2649 if (size > 8) | |
2650 put_bits(&s->pb, 1, 1); | |
0 | 2651 } |
293 | 2652 #endif |
0 | 2653 } |
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
|
2654 |
2502 | 2655 static inline int mpeg4_get_dc_length(int level, int n){ |
2656 if (n < 4) { | |
2657 return uni_DCtab_lum_len[level + 256]; | |
2658 } else { | |
2659 return uni_DCtab_chrom_len[level + 256]; | |
2660 } | |
2661 } | |
2662 | |
1034 | 2663 /** |
2664 * encodes a 8x8 block | |
2665 * @param n block index (0-3 are luma, 4-5 are chroma) | |
2666 */ | |
2967 | 2667 static inline void mpeg4_encode_block(MpegEncContext * s, DCTELEM * block, int n, int intra_dc, |
1064 | 2668 uint8_t *scan_table, PutBitContext *dc_pb, PutBitContext *ac_pb) |
0 | 2669 { |
751 | 2670 int i, last_non_zero; |
2671 #if 0 //variables for the outcommented version | |
2672 int code, sign, last; | |
2673 #endif | |
0 | 2674 const RLTable *rl; |
1064 | 2675 uint32_t *bits_tab; |
2676 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
|
2677 const int last_index = s->block_last_index[n]; |
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
|
2678 |
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
|
2679 if (s->mb_intra) { //Note gcc (3.2.1 at least) will optimize this away |
2979 | 2680 /* mpeg4 based DC predictor */ |
2681 mpeg4_encode_dc(dc_pb, intra_dc, n); | |
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
|
2682 if(last_index<1) return; |
2979 | 2683 i = 1; |
0 | 2684 rl = &rl_intra; |
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
|
2685 bits_tab= uni_mpeg4_intra_rl_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
|
2686 len_tab = uni_mpeg4_intra_rl_len; |
0 | 2687 } else { |
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
|
2688 if(last_index<0) return; |
2979 | 2689 i = 0; |
0 | 2690 rl = &rl_inter; |
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
|
2691 bits_tab= uni_mpeg4_inter_rl_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
|
2692 len_tab = uni_mpeg4_inter_rl_len; |
0 | 2693 } |
2694 | |
2695 /* AC coefs */ | |
2696 last_non_zero = i - 1; | |
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
|
2697 #if 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
|
2698 for (; i < last_index; i++) { |
2979 | 2699 int level = block[ scan_table[i] ]; |
2700 if (level) { | |
2701 int run = i - last_non_zero - 1; | |
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
|
2702 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
|
2703 if((level&(~127)) == 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
|
2704 const int index= UNI_MPEG4_ENC_INDEX(0, 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
|
2705 put_bits(ac_pb, len_tab[index], bits_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
|
2706 }else{ //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
|
2707 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); |
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
|
2708 } |
2979 | 2709 last_non_zero = i; |
2710 } | |
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
|
2711 } |
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
|
2712 /*if(i<=last_index)*/{ |
2979 | 2713 int level = block[ scan_table[i] ]; |
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
|
2714 int run = i - last_non_zero - 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
|
2715 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
|
2716 if((level&(~127)) == 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
|
2717 const int index= UNI_MPEG4_ENC_INDEX(1, 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
|
2718 put_bits(ac_pb, len_tab[index], bits_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
|
2719 }else{ //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
|
2720 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); |
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
|
2721 } |
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
|
2722 } |
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
|
2723 #else |
0 | 2724 for (; i <= last_index; i++) { |
2979 | 2725 const int slevel = block[ scan_table[i] ]; |
2726 if (slevel) { | |
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
|
2727 int level; |
2979 | 2728 int run = i - last_non_zero - 1; |
2729 last = (i == last_index); | |
2730 sign = 0; | |
2731 level = slevel; | |
2732 if (level < 0) { | |
2733 sign = 1; | |
2734 level = -level; | |
2735 } | |
0 | 2736 code = get_rl_index(rl, last, run, level); |
453 | 2737 put_bits(ac_pb, rl->table_vlc[code][1], rl->table_vlc[code][0]); |
0 | 2738 if (code == rl->n) { |
2739 int level1, run1; | |
2740 level1 = level - rl->max_level[last][run]; | |
2967 | 2741 if (level1 < 1) |
0 | 2742 goto esc2; |
2743 code = get_rl_index(rl, last, run, level1); | |
2744 if (code == rl->n) { | |
2745 esc2: | |
453 | 2746 put_bits(ac_pb, 1, 1); |
0 | 2747 if (level > MAX_LEVEL) |
2748 goto esc3; | |
2749 run1 = run - rl->max_run[last][level] - 1; | |
2750 if (run1 < 0) | |
2751 goto esc3; | |
2752 code = get_rl_index(rl, last, run1, level); | |
2753 if (code == rl->n) { | |
2754 esc3: | |
2755 /* third escape */ | |
453 | 2756 put_bits(ac_pb, 1, 1); |
2757 put_bits(ac_pb, 1, last); | |
2758 put_bits(ac_pb, 6, run); | |
2759 put_bits(ac_pb, 1, 1); | |
7260
3ec34b551aae
bitstream: move put_sbits() from flacenc.c to bitstream.h and use it
ramiro
parents:
7098
diff
changeset
|
2760 put_sbits(ac_pb, 12, slevel); |
453 | 2761 put_bits(ac_pb, 1, 1); |
0 | 2762 } else { |
2763 /* second escape */ | |
453 | 2764 put_bits(ac_pb, 1, 0); |
2765 put_bits(ac_pb, rl->table_vlc[code][1], rl->table_vlc[code][0]); | |
2766 put_bits(ac_pb, 1, sign); | |
0 | 2767 } |
2768 } else { | |
2769 /* first escape */ | |
453 | 2770 put_bits(ac_pb, 1, 0); |
2771 put_bits(ac_pb, rl->table_vlc[code][1], rl->table_vlc[code][0]); | |
2772 put_bits(ac_pb, 1, sign); | |
0 | 2773 } |
2774 } else { | |
453 | 2775 put_bits(ac_pb, 1, sign); |
0 | 2776 } |
2979 | 2777 last_non_zero = i; |
2778 } | |
0 | 2779 } |
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
|
2780 #endif |
0 | 2781 } |
936 | 2782 |
2967 | 2783 static int mpeg4_get_block_length(MpegEncContext * s, DCTELEM * block, int n, int intra_dc, |
1064 | 2784 uint8_t *scan_table) |
936 | 2785 { |
2786 int i, last_non_zero; | |
1064 | 2787 uint8_t *len_tab; |
936 | 2788 const int last_index = s->block_last_index[n]; |
2789 int len=0; | |
2790 | |
2791 if (s->mb_intra) { //Note gcc (3.2.1 at least) will optimize this away | |
2979 | 2792 /* mpeg4 based DC predictor */ |
2793 len += mpeg4_get_dc_length(intra_dc, n); | |
936 | 2794 if(last_index<1) return len; |
2979 | 2795 i = 1; |
936 | 2796 len_tab = uni_mpeg4_intra_rl_len; |
2797 } else { | |
2798 if(last_index<0) return 0; | |
2979 | 2799 i = 0; |
936 | 2800 len_tab = uni_mpeg4_inter_rl_len; |
2801 } | |
2802 | |
2803 /* AC coefs */ | |
2804 last_non_zero = i - 1; | |
2805 for (; i < last_index; i++) { | |
2979 | 2806 int level = block[ scan_table[i] ]; |
2807 if (level) { | |
2808 int run = i - last_non_zero - 1; | |
936 | 2809 level+=64; |
2810 if((level&(~127)) == 0){ | |
2811 const int index= UNI_MPEG4_ENC_INDEX(0, run, level); | |
2812 len += len_tab[index]; | |
2813 }else{ //ESC3 | |
2814 len += 7+2+1+6+1+12+1; | |
2815 } | |
2979 | 2816 last_non_zero = i; |
2817 } | |
936 | 2818 } |
2819 /*if(i<=last_index)*/{ | |
2979 | 2820 int level = block[ scan_table[i] ]; |
936 | 2821 int run = i - last_non_zero - 1; |
2822 level+=64; | |
2823 if((level&(~127)) == 0){ | |
2824 const int index= UNI_MPEG4_ENC_INDEX(1, run, level); | |
2825 len += len_tab[index]; | |
2826 }else{ //ESC3 | |
2827 len += 7+2+1+6+1+12+1; | |
2828 } | |
2829 } | |
2967 | 2830 |
936 | 2831 return len; |
2832 } | |
2833 | |
815
78accc54493b
put a few large tables under #ifdef CONFIG_ENCODERS or dynamically allocate them
michaelni
parents:
770
diff
changeset
|
2834 #endif |
0 | 2835 |
2836 | |
2837 /***********************************************/ | |
2838 /* decoding */ | |
2839 | |
2840 static VLC intra_MCBPC_vlc; | |
2841 static VLC inter_MCBPC_vlc; | |
2842 static VLC cbpy_vlc; | |
2843 static VLC mv_vlc; | |
2844 static VLC dc_lum, dc_chrom; | |
254
b4fed8b24e3a
gmc bitstream decoding support (the real motion compensation isnt implemnted yet)
michaelni
parents:
253
diff
changeset
|
2845 static VLC sprite_trajectory; |
262 | 2846 static VLC mb_type_b_vlc; |
1655 | 2847 static VLC h263_mbtype_b_vlc; |
2848 static VLC cbpc_b_vlc; | |
0 | 2849 |
2850 /* init vlcs */ | |
2851 | |
2852 /* XXX: find a better solution to handle static init */ | |
2853 void h263_decode_init_vlc(MpegEncContext *s) | |
2854 { | |
2855 static int done = 0; | |
2856 | |
2857 if (!done) { | |
2858 done = 1; | |
2859 | |
7098 | 2860 INIT_VLC_STATIC(&intra_MCBPC_vlc, INTRA_MCBPC_VLC_BITS, 9, |
0 | 2861 intra_MCBPC_bits, 1, 1, |
7098 | 2862 intra_MCBPC_code, 1, 1, 72); |
2863 INIT_VLC_STATIC(&inter_MCBPC_vlc, INTER_MCBPC_VLC_BITS, 28, | |
0 | 2864 inter_MCBPC_bits, 1, 1, |
7098 | 2865 inter_MCBPC_code, 1, 1, 198); |
2866 INIT_VLC_STATIC(&cbpy_vlc, CBPY_VLC_BITS, 16, | |
0 | 2867 &cbpy_tab[0][1], 2, 1, |
7098 | 2868 &cbpy_tab[0][0], 2, 1, 64); |
2869 INIT_VLC_STATIC(&mv_vlc, MV_VLC_BITS, 33, | |
0 | 2870 &mvtab[0][1], 2, 1, |
7098 | 2871 &mvtab[0][0], 2, 1, 538); |
4668 | 2872 init_rl(&rl_inter, static_rl_table_store[0]); |
2873 init_rl(&rl_intra, static_rl_table_store[1]); | |
2874 init_rl(&rvlc_rl_inter, static_rl_table_store[3]); | |
2875 init_rl(&rvlc_rl_intra, static_rl_table_store[4]); | |
2876 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
|
2877 INIT_VLC_RL(rl_inter, 554); |
778ecab25dd8
Change init_vlc_rl() so it does not use *alloc_static() anymore.
michael
parents:
6918
diff
changeset
|
2878 INIT_VLC_RL(rl_intra, 554); |
778ecab25dd8
Change init_vlc_rl() so it does not use *alloc_static() anymore.
michael
parents:
6918
diff
changeset
|
2879 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
|
2880 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
|
2881 INIT_VLC_RL(rl_intra_aic, 554); |
7098 | 2882 INIT_VLC_STATIC(&dc_lum, DC_VLC_BITS, 10 /* 13 */, |
0 | 2883 &DCtab_lum[0][1], 2, 1, |
7098 | 2884 &DCtab_lum[0][0], 2, 1, 512); |
2885 INIT_VLC_STATIC(&dc_chrom, DC_VLC_BITS, 10 /* 13 */, | |
0 | 2886 &DCtab_chrom[0][1], 2, 1, |
7098 | 2887 &DCtab_chrom[0][0], 2, 1, 512); |
2888 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
|
2889 &sprite_trajectory_tab[0][1], 4, 2, |
7098 | 2890 &sprite_trajectory_tab[0][0], 4, 2, 128); |
2891 INIT_VLC_STATIC(&mb_type_b_vlc, MB_TYPE_B_VLC_BITS, 4, | |
262 | 2892 &mb_type_b_tab[0][1], 2, 1, |
7098 | 2893 &mb_type_b_tab[0][0], 2, 1, 16); |
2894 INIT_VLC_STATIC(&h263_mbtype_b_vlc, H263_MBTYPE_B_VLC_BITS, 15, | |
1655 | 2895 &h263_mbtype_b_tab[0][1], 2, 1, |
7098 | 2896 &h263_mbtype_b_tab[0][0], 2, 1, 80); |
2897 INIT_VLC_STATIC(&cbpc_b_vlc, CBPC_B_VLC_BITS, 4, | |
1655 | 2898 &cbpc_b_tab[0][1], 2, 1, |
7098 | 2899 &cbpc_b_tab[0][0], 2, 1, 8); |
0 | 2900 } |
2901 } | |
2902 | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
2903 /** |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
2904 * 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
|
2905 */ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
2906 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
|
2907 if (s->height <= 400) |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
2908 return 1; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
2909 else if (s->height <= 800) |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
2910 return 2; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
2911 else |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
2912 return 4; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
2913 } |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
2914 |
1661 | 2915 int ff_h263_decode_mba(MpegEncContext *s) |
2916 { | |
2917 int i, mb_pos; | |
2918 | |
2919 for(i=0; i<6; i++){ | |
1670 | 2920 if(s->mb_num-1 <= ff_mba_max[i]) break; |
1661 | 2921 } |
2922 mb_pos= get_bits(&s->gb, ff_mba_length[i]); | |
2923 s->mb_x= mb_pos % s->mb_width; | |
2924 s->mb_y= mb_pos / s->mb_width; | |
2925 | |
2926 return mb_pos; | |
2927 } | |
2928 | |
2929 void ff_h263_encode_mba(MpegEncContext *s) | |
2930 { | |
2931 int i, mb_pos; | |
2932 | |
2933 for(i=0; i<6; i++){ | |
1670 | 2934 if(s->mb_num-1 <= ff_mba_max[i]) break; |
1661 | 2935 } |
2936 mb_pos= s->mb_x + s->mb_width*s->mb_y; | |
2937 put_bits(&s->pb, ff_mba_length[i], mb_pos); | |
2938 } | |
2939 | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
2940 /** |
1661 | 2941 * decodes the group of blocks header or slice header. |
6524 | 2942 * @return <0 if an error occurred |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
2943 */ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
2944 static int h263_decode_gob_header(MpegEncContext *s) |
162 | 2945 { |
1661 | 2946 unsigned int val, gfid, gob_number; |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
2947 int left; |
2967 | 2948 |
162 | 2949 /* Check for GOB Start Code */ |
2950 val = show_bits(&s->gb, 16); | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
2951 if(val) |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
2952 return -1; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
2953 |
162 | 2954 /* 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
|
2955 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
|
2956 left= get_bits_left(&s->gb); |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
2957 //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
|
2958 for(;left>13; left--){ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
2959 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
|
2960 } |
2967 | 2961 if(left<=13) |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
2962 return -1; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
2963 |
1661 | 2964 if(s->h263_slice_structured){ |
2965 if(get_bits1(&s->gb)==0) | |
2966 return -1; | |
2967 | |
2968 ff_h263_decode_mba(s); | |
2969 | |
2970 if(s->mb_num > 1583) | |
2971 if(get_bits1(&s->gb)==0) | |
2972 return -1; | |
2967 | 2973 |
1661 | 2974 s->qscale = get_bits(&s->gb, 5); /* SQUANT */ |
2975 if(get_bits1(&s->gb)==0) | |
2976 return -1; | |
2977 gfid = get_bits(&s->gb, 2); /* GFID */ | |
2978 }else{ | |
2979 gob_number = get_bits(&s->gb, 5); /* GN */ | |
2980 s->mb_x= 0; | |
2981 s->mb_y= s->gob_index* gob_number; | |
2982 gfid = get_bits(&s->gb, 2); /* GFID */ | |
2983 s->qscale = get_bits(&s->gb, 5); /* GQUANT */ | |
2984 } | |
2967 | 2985 |
2986 if(s->mb_y >= s->mb_height) | |
1661 | 2987 return -1; |
2988 | |
2967 | 2989 if(s->qscale==0) |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
2990 return -1; |
1644 | 2991 |
162 | 2992 return 0; |
2993 } | |
2994 | |
290 | 2995 static inline void memsetw(short *tab, int val, int n) |
2996 { | |
2997 int i; | |
2998 for(i=0;i<n;i++) | |
2999 tab[i] = val; | |
3000 } | |
3001 | |
8590 | 3002 #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
|
3003 |
453 | 3004 void ff_mpeg4_init_partitions(MpegEncContext *s) |
3005 { | |
9431 | 3006 uint8_t *start= put_bits_ptr(&s->pb); |
1799 | 3007 uint8_t *end= s->pb.buf_end; |
3008 int size= end - start; | |
9259 | 3009 int pb_size = (((intptr_t)start + size/3)&(~3)) - (intptr_t)start; |
1912 | 3010 int tex_size= (size - 2*pb_size)&(~3); |
2967 | 3011 |
1799 | 3012 set_put_bits_buffer_size(&s->pb, pb_size); |
3013 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
|
3014 init_put_bits(&s->pb2 , start + pb_size + tex_size, pb_size); |
453 | 3015 } |
3016 | |
3017 void ff_mpeg4_merge_partitions(MpegEncContext *s) | |
290 | 3018 { |
1786 | 3019 const int pb2_len = put_bits_count(&s->pb2 ); |
3020 const int tex_pb_len= put_bits_count(&s->tex_pb); | |
3021 const int bits= put_bits_count(&s->pb); | |
453 | 3022 |
6481 | 3023 if(s->pict_type==FF_I_TYPE){ |
453 | 3024 put_bits(&s->pb, 19, DC_MARKER); |
3025 s->misc_bits+=19 + pb2_len + bits - s->last_bits; | |
3026 s->i_tex_bits+= tex_pb_len; | |
3027 }else{ | |
3028 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
|
3029 s->misc_bits+=17 + pb2_len; |
453 | 3030 s->mv_bits+= bits - s->last_bits; |
3031 s->p_tex_bits+= tex_pb_len; | |
3032 } | |
3033 | |
3034 flush_put_bits(&s->pb2); | |
3035 flush_put_bits(&s->tex_pb); | |
3036 | |
1799 | 3037 set_put_bits_buffer_size(&s->pb, s->pb2.buf_end - s->pb.buf); |
3038 ff_copy_bits(&s->pb, s->pb2.buf , pb2_len); | |
3039 ff_copy_bits(&s->pb, s->tex_pb.buf, tex_pb_len); | |
1786 | 3040 s->last_bits= put_bits_count(&s->pb); |
453 | 3041 } |
3042 | |
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
|
3043 #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
|
3044 |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3045 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
|
3046 switch(s->pict_type){ |
6481 | 3047 case FF_I_TYPE: |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3048 return 16; |
6481 | 3049 case FF_P_TYPE: |
3050 case FF_S_TYPE: | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3051 return s->f_code+15; |
6481 | 3052 case FF_B_TYPE: |
6655
22cca5d3173a
Implement FFMAX3(a,b,c) - maximum over three arguments.
voroshil
parents:
6524
diff
changeset
|
3053 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
|
3054 default: |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3055 return -1; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3056 } |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3057 } |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3058 |
8590 | 3059 #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
|
3060 |
453 | 3061 void ff_mpeg4_encode_video_packet_header(MpegEncContext *s) |
3062 { | |
3063 int mb_num_bits= av_log2(s->mb_num - 1) + 1; | |
3064 | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3065 put_bits(&s->pb, ff_mpeg4_get_video_packet_prefix_length(s), 0); |
453 | 3066 put_bits(&s->pb, 1, 1); |
2967 | 3067 |
453 | 3068 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
|
3069 put_bits(&s->pb, s->quant_precision, s->qscale); |
453 | 3070 put_bits(&s->pb, 1, 0); /* no HEC */ |
3071 } | |
3072 | |
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
|
3073 #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
|
3074 |
453 | 3075 /** |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3076 * 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
|
3077 * @return 0 if not |
453 | 3078 */ |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3079 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
|
3080 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
|
3081 int v= show_bits(&s->gb, 16); |
2967 | 3082 |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3083 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
|
3084 return 0; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3085 } |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3086 |
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
|
3087 while(v<=0xFF){ |
6481 | 3088 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
|
3089 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
|
3090 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
|
3091 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
|
3092 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
|
3093 } |
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
|
3094 |
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
|
3095 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
|
3096 v>>=8; |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3097 v|= 0x7F >> (7-(bits_count&7)); |
2967 | 3098 |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3099 if(v==0x7F) |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3100 return 1; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3101 }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
|
3102 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
|
3103 int len; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3104 GetBitContext gb= s->gb; |
2967 | 3105 |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3106 skip_bits(&s->gb, 1); |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3107 align_get_bits(&s->gb); |
2967 | 3108 |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3109 for(len=0; len<32; len++){ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3110 if(get_bits1(&s->gb)) break; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3111 } |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3112 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3113 s->gb= gb; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3114 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3115 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
|
3116 return 1; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3117 } |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3118 } |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3119 return 0; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3120 } |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3121 |
10753
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3122 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
|
3123 { |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3124 int i; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3125 int a= 2<<s->sprite_warping_accuracy; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3126 int rho= 3-s->sprite_warping_accuracy; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3127 int r=16/a; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3128 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
|
3129 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
|
3130 int sprite_ref[4][2]; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3131 int virtual_ref[2][2]; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3132 int w2, h2, w3, h3; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3133 int alpha=0, beta=0; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3134 int w= s->width; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3135 int h= s->height; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3136 int min_ab; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3137 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3138 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
|
3139 int length; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3140 int x=0, y=0; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3141 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3142 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
|
3143 if(length){ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3144 x= get_xbits(gb, length); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3145 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3146 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
|
3147 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3148 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
|
3149 if(length){ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3150 y=get_xbits(gb, length); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3151 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3152 skip_bits1(gb); /* marker bit */ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3153 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
|
3154 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
|
3155 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3156 for(; i<4; i++) |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3157 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
|
3158 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3159 while((1<<alpha)<w) alpha++; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3160 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
|
3161 w2= 1<<alpha; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3162 h2= 1<<beta; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3163 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3164 // 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
|
3165 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
|
3166 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
|
3167 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
|
3168 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
|
3169 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
|
3170 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
|
3171 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
|
3172 } else { |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3173 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
|
3174 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
|
3175 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
|
3176 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
|
3177 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
|
3178 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
|
3179 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3180 /* 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
|
3181 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
|
3182 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3183 // 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
|
3184 // 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
|
3185 // 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
|
3186 // 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
|
3187 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
|
3188 + 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
|
3189 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
|
3190 + 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
|
3191 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
|
3192 + 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
|
3193 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
|
3194 + 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
|
3195 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3196 switch(s->num_sprite_warping_points) |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3197 { |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3198 case 0: |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3199 s->sprite_offset[0][0]= 0; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3200 s->sprite_offset[0][1]= 0; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3201 s->sprite_offset[1][0]= 0; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3202 s->sprite_offset[1][1]= 0; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3203 s->sprite_delta[0][0]= a; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3204 s->sprite_delta[0][1]= 0; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3205 s->sprite_delta[1][0]= 0; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3206 s->sprite_delta[1][1]= a; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3207 s->sprite_shift[0]= 0; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3208 s->sprite_shift[1]= 0; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3209 break; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3210 case 1: //GMC only |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3211 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
|
3212 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
|
3213 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
|
3214 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
|
3215 s->sprite_delta[0][0]= a; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3216 s->sprite_delta[0][1]= 0; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3217 s->sprite_delta[1][0]= 0; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3218 s->sprite_delta[1][1]= a; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3219 s->sprite_shift[0]= 0; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3220 s->sprite_shift[1]= 0; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3221 break; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3222 case 2: |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3223 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
|
3224 + (-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
|
3225 + ( 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
|
3226 + (1<<(alpha+rho-1)); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3227 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
|
3228 + (-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
|
3229 + (-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
|
3230 + (1<<(alpha+rho-1)); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3231 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
|
3232 +( 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
|
3233 +2*w2*r*sprite_ref[0][0] |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3234 - 16*w2 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3235 + (1<<(alpha+rho+1))); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3236 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
|
3237 +(-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
|
3238 +2*w2*r*sprite_ref[0][1] |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3239 - 16*w2 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3240 + (1<<(alpha+rho+1))); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3241 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
|
3242 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
|
3243 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
|
3244 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
|
3245 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3246 s->sprite_shift[0]= alpha+rho; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3247 s->sprite_shift[1]= alpha+rho+2; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3248 break; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3249 case 3: |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3250 min_ab= FFMIN(alpha, beta); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3251 w3= w2>>min_ab; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3252 h3= h2>>min_ab; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3253 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
|
3254 + (-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
|
3255 + (-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
|
3256 + (1<<(alpha+beta+rho-min_ab-1)); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3257 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
|
3258 + (-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
|
3259 + (-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
|
3260 + (1<<(alpha+beta+rho-min_ab-1)); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3261 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
|
3262 + (-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
|
3263 + 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
|
3264 - 16*w2*h3 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3265 + (1<<(alpha+beta+rho-min_ab+1)); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3266 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
|
3267 + (-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
|
3268 + 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
|
3269 - 16*w2*h3 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3270 + (1<<(alpha+beta+rho-min_ab+1)); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3271 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
|
3272 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
|
3273 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
|
3274 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
|
3275 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3276 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
|
3277 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
|
3278 break; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3279 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3280 /* try to simplify the situation */ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3281 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
|
3282 && s->sprite_delta[0][1] == 0 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3283 && s->sprite_delta[1][0] == 0 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3284 && 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
|
3285 { |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3286 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
|
3287 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
|
3288 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
|
3289 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
|
3290 s->sprite_delta[0][0]= a; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3291 s->sprite_delta[0][1]= 0; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3292 s->sprite_delta[1][0]= 0; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3293 s->sprite_delta[1][1]= a; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3294 s->sprite_shift[0]= 0; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3295 s->sprite_shift[1]= 0; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3296 s->real_sprite_warping_points=1; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3297 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3298 else{ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3299 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
|
3300 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
|
3301 for(i=0; i<2; i++){ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3302 s->sprite_offset[0][i]<<= shift_y; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3303 s->sprite_offset[1][i]<<= shift_c; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3304 s->sprite_delta[0][i]<<= shift_y; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3305 s->sprite_delta[1][i]<<= shift_y; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3306 s->sprite_shift[i]= 16; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3307 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3308 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
|
3309 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3310 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3311 |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3312 /** |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3313 * decodes the next video packet. |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3314 * @return <0 if something went wrong |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3315 */ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3316 static int mpeg4_decode_video_packet_header(MpegEncContext *s) |
453 | 3317 { |
290 | 3318 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
|
3319 int header_extension=0, mb_num, len; |
2967 | 3320 |
453 | 3321 /* 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
|
3322 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
|
3323 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3324 for(len=0; len<32; len++){ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3325 if(get_bits1(&s->gb)) break; |
453 | 3326 } |
3327 | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3328 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
|
3329 av_log(s->avctx, AV_LOG_ERROR, "marker does not match f_code\n"); |
453 | 3330 return -1; |
3331 } | |
2967 | 3332 |
453 | 3333 if(s->shape != RECT_SHAPE){ |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3334 header_extension= get_bits1(&s->gb); |
453 | 3335 //FIXME more stuff here |
3336 } | |
3337 | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3338 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
|
3339 if(mb_num>=s->mb_num){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
3340 av_log(s->avctx, AV_LOG_ERROR, "illegal mb_num in video packet (%d %d) \n", mb_num, s->mb_num); |
453 | 3341 return -1; |
3342 } | |
6481 | 3343 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
|
3344 while(s->next_picture.mbskip_table[ s->mb_index2xy[ mb_num ] ]) mb_num++; |
6497 | 3345 if(mb_num >= s->mb_num) return -1; // slice contains just skipped MBs which where already decoded |
1176 | 3346 } |
2967 | 3347 |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3348 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
|
3349 s->mb_y= mb_num / s->mb_width; |
453 | 3350 |
3351 if(s->shape != BIN_ONLY_SHAPE){ | |
2967 | 3352 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
|
3353 if(qscale) |
1644 | 3354 s->chroma_qscale=s->qscale= qscale; |
290 | 3355 } |
3356 | |
3357 if(s->shape == RECT_SHAPE){ | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3358 header_extension= get_bits1(&s->gb); |
290 | 3359 } |
3360 if(header_extension){ | |
453 | 3361 int time_increment; |
290 | 3362 int time_incr=0; |
453 | 3363 |
2967 | 3364 while (get_bits1(&s->gb) != 0) |
290 | 3365 time_incr++; |
3366 | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3367 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
|
3368 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
|
3369 check_marker(&s->gb, "before vop_coding_type in video packed header"); |
2967 | 3370 |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3371 skip_bits(&s->gb, 2); /* vop coding type */ |
290 | 3372 //FIXME not rect stuff here |
3373 | |
3374 if(s->shape != BIN_ONLY_SHAPE){ | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3375 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
|
3376 //FIXME don't just ignore everything |
6481 | 3377 if(s->pict_type == FF_S_TYPE && s->vol_sprite_usage==GMC_SPRITE){ |
1914 | 3378 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
|
3379 av_log(s->avctx, AV_LOG_ERROR, "untested\n"); |
290 | 3380 } |
3381 | |
3382 //FIXME reduced res stuff here | |
2967 | 3383 |
6481 | 3384 if (s->pict_type != FF_I_TYPE) { |
2979 | 3385 int f_code = get_bits(&s->gb, 3); /* fcode_for */ |
660 | 3386 if(f_code==0){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
3387 av_log(s->avctx, AV_LOG_ERROR, "Error, video packet header damaged (f_code=0)\n"); |
290 | 3388 } |
3389 } | |
6481 | 3390 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
|
3391 int b_code = get_bits(&s->gb, 3); |
660 | 3392 if(b_code==0){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
3393 av_log(s->avctx, AV_LOG_ERROR, "Error, video packet header damaged (b_code=0)\n"); |
660 | 3394 } |
2967 | 3395 } |
290 | 3396 } |
3397 } | |
3398 //FIXME new-pred stuff | |
2967 | 3399 |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3400 return 0; |
453 | 3401 } |
3402 | |
3403 void ff_mpeg4_clean_buffers(MpegEncContext *s) | |
3404 { | |
3405 int c_wrap, c_xy, l_wrap, l_xy; | |
290 | 3406 |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1936
diff
changeset
|
3407 l_wrap= s->b8_stride; |
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1936
diff
changeset
|
3408 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
|
3409 c_wrap= s->mb_stride; |
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1936
diff
changeset
|
3410 c_xy= (s->mb_y-1)*c_wrap + s->mb_x - 1; |
290 | 3411 |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3412 #if 0 |
290 | 3413 /* clean DC */ |
453 | 3414 memsetw(s->dc_val[0] + l_xy, 1024, l_wrap*2+1); |
3415 memsetw(s->dc_val[1] + c_xy, 1024, c_wrap+1); | |
3416 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
|
3417 #endif |
290 | 3418 |
3419 /* clean AC */ | |
1064 | 3420 memset(s->ac_val[0] + l_xy, 0, (l_wrap*2+1)*16*sizeof(int16_t)); |
3421 memset(s->ac_val[1] + c_xy, 0, (c_wrap +1)*16*sizeof(int16_t)); | |
3422 memset(s->ac_val[2] + c_xy, 0, (c_wrap +1)*16*sizeof(int16_t)); | |
290 | 3423 |
3424 /* clean MV */ | |
2646
c735e3e60ca7
Even More spelling errors. patch by (Kevin Baragona <kevinmb500 gawab com)
michael
parents:
2639
diff
changeset
|
3425 // we can't clear the MVs as they might be needed by a b frame |
1064 | 3426 // memset(s->motion_val + l_xy, 0, (l_wrap*2+1)*2*sizeof(int16_t)); |
3427 // memset(s->motion_val, 0, 2*sizeof(int16_t)*(2 + s->mb_width*2)*(2 + s->mb_height*2)); | |
453 | 3428 s->last_mv[0][0][0]= |
3429 s->last_mv[0][0][1]= | |
3430 s->last_mv[1][0][0]= | |
3431 s->last_mv[1][0][1]= 0; | |
3432 } | |
3433 | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3434 /** |
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
|
3435 * 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
|
3436 * @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
|
3437 * @param end pointer to the end of the buffer |
2bf694251330
Add ff_h263_find_resync_marker() to find the bit position of the next resync_marker, if any.
michael
parents:
9008
diff
changeset
|
3438 * @return pointer to the next resync_marker, or \p end if none was found |
2bf694251330
Add ff_h263_find_resync_marker() to find the bit position of the next resync_marker, if any.
michael
parents:
9008
diff
changeset
|
3439 */ |
2bf694251330
Add ff_h263_find_resync_marker() to find the bit position of the next resync_marker, if any.
michael
parents:
9008
diff
changeset
|
3440 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
|
3441 { |
2bf694251330
Add ff_h263_find_resync_marker() to find the bit position of the next resync_marker, if any.
michael
parents:
9008
diff
changeset
|
3442 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
|
3443 |
2bf694251330
Add ff_h263_find_resync_marker() to find the bit position of the next resync_marker, if any.
michael
parents:
9008
diff
changeset
|
3444 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
|
3445 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
|
3446 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
|
3447 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
|
3448 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
|
3449 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
|
3450 } |
2bf694251330
Add ff_h263_find_resync_marker() to find the bit position of the next resync_marker, if any.
michael
parents:
9008
diff
changeset
|
3451 } |
2bf694251330
Add ff_h263_find_resync_marker() to find the bit position of the next resync_marker, if any.
michael
parents:
9008
diff
changeset
|
3452 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
|
3453 } |
2bf694251330
Add ff_h263_find_resync_marker() to find the bit position of the next resync_marker, if any.
michael
parents:
9008
diff
changeset
|
3454 |
2bf694251330
Add ff_h263_find_resync_marker() to find the bit position of the next resync_marker, if any.
michael
parents:
9008
diff
changeset
|
3455 /** |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3456 * 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
|
3457 * @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
|
3458 */ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3459 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
|
3460 int left, pos, ret; |
2967 | 3461 |
1521 | 3462 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
|
3463 skip_bits1(&s->gb); |
1521 | 3464 align_get_bits(&s->gb); |
3465 } | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3466 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3467 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
|
3468 pos= get_bits_count(&s->gb); |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3469 if(s->codec_id==CODEC_ID_MPEG4) |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3470 ret= mpeg4_decode_video_packet_header(s); |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3471 else |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3472 ret= h263_decode_gob_header(s); |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3473 if(ret>=0) |
8691
25aa5388fa97
Make ff_h263_resync() return the bit position of the resync_marker or
benoit
parents:
8690
diff
changeset
|
3474 return pos; |
453 | 3475 } |
5129 | 3476 //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
|
3477 s->gb= s->last_resync_gb; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3478 align_get_bits(&s->gb); |
10535
95f3daa991a2
Use get_bits_left() instead of size_in_bits - get_bits_count().
rbultje
parents:
9999
diff
changeset
|
3479 left= get_bits_left(&s->gb); |
2967 | 3480 |
3481 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
|
3482 if(show_bits(&s->gb, 16)==0){ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3483 GetBitContext bak= s->gb; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3484 |
8691
25aa5388fa97
Make ff_h263_resync() return the bit position of the resync_marker or
benoit
parents:
8690
diff
changeset
|
3485 pos= get_bits_count(&s->gb); |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3486 if(s->codec_id==CODEC_ID_MPEG4) |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3487 ret= mpeg4_decode_video_packet_header(s); |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3488 else |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3489 ret= h263_decode_gob_header(s); |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3490 if(ret>=0) |
8691
25aa5388fa97
Make ff_h263_resync() return the bit position of the resync_marker or
benoit
parents:
8690
diff
changeset
|
3491 return pos; |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3492 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3493 s->gb= bak; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3494 } |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3495 skip_bits(&s->gb, 8); |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3496 } |
2967 | 3497 |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3498 return -1; |
453 | 3499 } |
3500 | |
10752
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3501 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
|
3502 { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3503 int code, val, sign, shift, l; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3504 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
|
3505 |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3506 if (code == 0) |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3507 return pred; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3508 if (code < 0) |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3509 return 0xffff; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3510 |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3511 sign = get_bits1(&s->gb); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3512 shift = f_code - 1; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3513 val = code; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3514 if (shift) { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3515 val = (val - 1) << shift; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3516 val |= get_bits(&s->gb, shift); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3517 val++; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3518 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3519 if (sign) |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3520 val = -val; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3521 val += pred; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3522 |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3523 /* modulo decoding */ |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3524 if (!s->h263_long_vectors) { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3525 l = INT_BIT - 5 - f_code; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3526 val = (val<<l)>>l; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3527 } else { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3528 /* horrible h263 long vector mode */ |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3529 if (pred < -31 && val < -63) |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3530 val += 64; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3531 if (pred > 32 && val > 63) |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3532 val -= 64; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3533 |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3534 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3535 return val; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3536 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
3537 |
453 | 3538 /** |
1034 | 3539 * gets the average motion vector for a GMC MB. |
753 | 3540 * @param n either 0 for the x component or 1 for y |
3541 * @returns the average MV for a GMC MB | |
3542 */ | |
3543 static inline int get_amv(MpegEncContext *s, int n){ | |
3544 int x, y, mb_v, sum, dx, dy, shift; | |
3545 int len = 1 << (s->f_code + 4); | |
3546 const int a= s->sprite_warping_accuracy; | |
2967 | 3547 |
1997 | 3548 if(s->workaround_bugs & FF_BUG_AMV) |
3549 len >>= s->quarter_sample; | |
753 | 3550 |
3551 if(s->real_sprite_warping_points==1){ | |
3552 if(s->divx_version==500 && s->divx_build==413) | |
3553 sum= s->sprite_offset[0][n] / (1<<(a - s->quarter_sample)); | |
3554 else | |
3555 sum= RSHIFT(s->sprite_offset[0][n]<<s->quarter_sample, a); | |
3556 }else{ | |
3557 dx= s->sprite_delta[n][0]; | |
3558 dy= s->sprite_delta[n][1]; | |
3559 shift= s->sprite_shift[0]; | |
3560 if(n) dy -= 1<<(shift + a + 1); | |
3561 else dx -= 1<<(shift + a + 1); | |
3562 mb_v= s->sprite_offset[0][n] + dx*s->mb_x*16 + dy*s->mb_y*16; | |
3563 | |
3564 sum=0; | |
3565 for(y=0; y<16; y++){ | |
3566 int v; | |
2967 | 3567 |
753 | 3568 v= mb_v + dy*y; |
3569 //XXX FIXME optimize | |
3570 for(x=0; x<16; x++){ | |
3571 sum+= v>>shift; | |
3572 v+= dx; | |
3573 } | |
3574 } | |
999
74dc4105e147
average motion vector rounding like the reference says and not what the standard says
michaelni
parents:
953
diff
changeset
|
3575 sum= RSHIFT(sum, a+8-s->quarter_sample); |
753 | 3576 } |
3577 | |
3578 if (sum < -len) sum= -len; | |
3579 else if (sum >= len) sum= len-1; | |
3580 | |
3581 return sum; | |
3582 } | |
3583 | |
3584 /** | |
10753
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3585 * decodes the dc value. |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3586 * @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
|
3587 * @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
|
3588 * @return the quantized dc |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3589 */ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3590 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
|
3591 { |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3592 int level, code; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3593 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3594 if (n < 4) |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3595 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
|
3596 else |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3597 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
|
3598 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
|
3599 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
|
3600 return -1; |
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 if (code == 0) { |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3603 level = 0; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3604 } else { |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3605 if(IS_3IV1){ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3606 if(code==1) |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3607 level= 2*get_bits1(&s->gb)-1; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3608 else{ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3609 if(get_bits1(&s->gb)) |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3610 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
|
3611 else |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3612 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
|
3613 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3614 }else{ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3615 level = get_xbits(&s->gb, code); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3616 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3617 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3618 if (code > 8){ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3619 if(get_bits1(&s->gb)==0){ /* marker */ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3620 if(s->error_recognition>=2){ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3621 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
|
3622 return -1; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3623 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3624 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3625 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3626 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3627 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3628 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
|
3629 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3630 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3631 /** |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3632 * decodes first partition. |
6524 | 3633 * @return number of MBs decoded or <0 if an error occurred |
453 | 3634 */ |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3635 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
|
3636 int mb_num; |
1064 | 3637 static const int8_t quant_tab[4] = { -1, -2, 1, 2 }; |
2967 | 3638 |
453 | 3639 /* decode first partition */ |
3640 mb_num=0; | |
290 | 3641 s->first_slice_line=1; |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3642 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
|
3643 ff_init_block_index(s); |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3644 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
|
3645 const int xy= s->mb_x + s->mb_y*s->mb_stride; |
453 | 3646 int cbpc; |
3647 int dir=0; | |
2967 | 3648 |
453 | 3649 mb_num++; |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3650 ff_update_block_index(s); |
453 | 3651 if(s->mb_x == s->resync_mb_x && s->mb_y == s->resync_mb_y+1) |
3652 s->first_slice_line=0; | |
2967 | 3653 |
6481 | 3654 if(s->pict_type==FF_I_TYPE){ |
453 | 3655 int i; |
3656 | |
1482 | 3657 do{ |
1873 | 3658 if(show_bits_long(&s->gb, 19)==DC_MARKER){ |
3659 return mb_num-1; | |
3660 } | |
3661 | |
1482 | 3662 cbpc = get_vlc2(&s->gb, intra_MCBPC_vlc.table, INTRA_MCBPC_VLC_BITS, 2); |
3663 if (cbpc < 0){ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
3664 av_log(s->avctx, AV_LOG_ERROR, "cbpc corrupted at %d %d\n", s->mb_x, s->mb_y); |
1482 | 3665 return -1; |
3666 } | |
3667 }while(cbpc == 8); | |
2967 | 3668 |
453 | 3669 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
|
3670 s->current_picture.mb_type[xy]= MB_TYPE_INTRA; |
453 | 3671 s->mb_intra = 1; |
3672 | |
3673 if(cbpc & 4) { | |
1652 | 3674 ff_set_qscale(s, s->qscale + quant_tab[get_bits(&s->gb, 2)]); |
453 | 3675 } |
903 | 3676 s->current_picture.qscale_table[xy]= s->qscale; |
453 | 3677 |
3678 s->mbintra_table[xy]= 1; | |
3679 for(i=0; i<6; i++){ | |
3680 int dc_pred_dir; | |
2967 | 3681 int dc= mpeg4_decode_dc(s, i, &dc_pred_dir); |
453 | 3682 if(dc < 0){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
3683 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
|
3684 return -1; |
453 | 3685 } |
3686 dir<<=1; | |
3687 if(dc_pred_dir) dir|=1; | |
3688 } | |
3689 s->pred_dir_table[xy]= dir; | |
3690 }else{ /* P/S_TYPE */ | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3691 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
|
3692 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
|
3693 const int stride= s->b8_stride*2; |
453 | 3694 |
1873 | 3695 try_again: |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3696 bits= show_bits(&s->gb, 17); |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3697 if(bits==MOTION_MARKER){ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3698 return mb_num-1; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3699 } |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3700 skip_bits1(&s->gb); |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3701 if(bits&0x10000){ |
453 | 3702 /* skip mb */ |
6481 | 3703 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
|
3704 s->current_picture.mb_type[xy]= MB_TYPE_SKIP | MB_TYPE_16x16 | MB_TYPE_GMC | MB_TYPE_L0; |
753 | 3705 mx= get_amv(s, 0); |
3706 my= get_amv(s, 1); | |
453 | 3707 }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
|
3708 s->current_picture.mb_type[xy]= MB_TYPE_SKIP | MB_TYPE_16x16 | MB_TYPE_L0; |
753 | 3709 mx=my=0; |
453 | 3710 } |
3711 mot_val[0 ]= mot_val[2 ]= | |
3712 mot_val[0+stride]= mot_val[2+stride]= mx; | |
3713 mot_val[1 ]= mot_val[3 ]= | |
3714 mot_val[1+stride]= mot_val[3+stride]= my; | |
3715 | |
3716 if(s->mbintra_table[xy]) | |
3717 ff_clean_intra_table_entries(s); | |
3718 continue; | |
3719 } | |
1482 | 3720 |
544 | 3721 cbpc = get_vlc2(&s->gb, inter_MCBPC_vlc.table, INTER_MCBPC_VLC_BITS, 2); |
453 | 3722 if (cbpc < 0){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
3723 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
|
3724 return -1; |
453 | 3725 } |
1873 | 3726 if(cbpc == 20) |
3727 goto try_again; | |
1482 | 3728 |
453 | 3729 s->cbp_table[xy]= cbpc&(8+3); //8 is dquant |
2967 | 3730 |
453 | 3731 s->mb_intra = ((cbpc & 4) != 0); |
2967 | 3732 |
453 | 3733 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
|
3734 s->current_picture.mb_type[xy]= MB_TYPE_INTRA; |
453 | 3735 s->mbintra_table[xy]= 1; |
2967 | 3736 mot_val[0 ]= mot_val[2 ]= |
453 | 3737 mot_val[0+stride]= mot_val[2+stride]= 0; |
3738 mot_val[1 ]= mot_val[3 ]= | |
3739 mot_val[1+stride]= mot_val[3+stride]= 0; | |
3740 }else{ | |
3741 if(s->mbintra_table[xy]) | |
3742 ff_clean_intra_table_entries(s); | |
3743 | |
6481 | 3744 if(s->pict_type==FF_S_TYPE && s->vol_sprite_usage==GMC_SPRITE && (cbpc & 16) == 0) |
453 | 3745 s->mcsel= get_bits1(&s->gb); |
3746 else s->mcsel= 0; | |
2967 | 3747 |
453 | 3748 if ((cbpc & 16) == 0) { |
3749 /* 16x16 motion prediction */ | |
3750 | |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1936
diff
changeset
|
3751 h263_pred_motion(s, 0, 0, &pred_x, &pred_y); |
753 | 3752 if(!s->mcsel){ |
3753 mx = h263_decode_motion(s, pred_x, s->f_code); | |
3754 if (mx >= 0xffff) | |
3755 return -1; | |
3756 | |
3757 my = h263_decode_motion(s, pred_y, s->f_code); | |
3758 if (my >= 0xffff) | |
3759 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
|
3760 s->current_picture.mb_type[xy]= MB_TYPE_16x16 | MB_TYPE_L0; |
753 | 3761 } else { |
3762 mx = get_amv(s, 0); | |
3763 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
|
3764 s->current_picture.mb_type[xy]= MB_TYPE_16x16 | MB_TYPE_GMC | MB_TYPE_L0; |
453 | 3765 } |
753 | 3766 |
453 | 3767 mot_val[0 ]= mot_val[2 ] = |
3768 mot_val[0+stride]= mot_val[2+stride]= mx; | |
3769 mot_val[1 ]= mot_val[3 ]= | |
3770 mot_val[1+stride]= mot_val[3+stride]= my; | |
3771 } else { | |
3772 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
|
3773 s->current_picture.mb_type[xy]= MB_TYPE_8x8 | MB_TYPE_L0; |
453 | 3774 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
|
3775 int16_t *mot_val= h263_pred_motion(s, i, 0, &pred_x, &pred_y); |
453 | 3776 mx = h263_decode_motion(s, pred_x, s->f_code); |
3777 if (mx >= 0xffff) | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3778 return -1; |
2967 | 3779 |
453 | 3780 my = h263_decode_motion(s, pred_y, s->f_code); |
3781 if (my >= 0xffff) | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3782 return -1; |
453 | 3783 mot_val[0] = mx; |
3784 mot_val[1] = my; | |
3785 } | |
3786 } | |
3787 } | |
3788 } | |
3789 } | |
3790 s->mb_x= 0; | |
3791 } | |
3792 | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3793 return mb_num; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3794 } |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3795 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3796 /** |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3797 * decode second partition. |
6524 | 3798 * @return <0 if an error occurred |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3799 */ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3800 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
|
3801 int mb_num=0; |
1064 | 3802 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
|
3803 |
453 | 3804 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
|
3805 s->first_slice_line=1; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3806 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
|
3807 ff_init_block_index(s); |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3808 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
|
3809 const int xy= s->mb_x + s->mb_y*s->mb_stride; |
453 | 3810 |
3811 mb_num++; | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3812 ff_update_block_index(s); |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3813 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
|
3814 s->first_slice_line=0; |
2967 | 3815 |
6481 | 3816 if(s->pict_type==FF_I_TYPE){ |
453 | 3817 int ac_pred= get_bits1(&s->gb); |
544 | 3818 int cbpy = get_vlc2(&s->gb, cbpy_vlc.table, CBPY_VLC_BITS, 1); |
453 | 3819 if(cbpy<0){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
3820 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
|
3821 return -1; |
453 | 3822 } |
2967 | 3823 |
453 | 3824 s->cbp_table[xy]|= cbpy<<2; |
2967 | 3825 s->current_picture.mb_type[xy] |= ac_pred*MB_TYPE_ACPRED; |
453 | 3826 }else{ /* P || S_TYPE */ |
2967 | 3827 if(IS_INTRA(s->current_picture.mb_type[xy])){ |
453 | 3828 int dir=0,i; |
3829 int ac_pred = get_bits1(&s->gb); | |
544 | 3830 int cbpy = get_vlc2(&s->gb, cbpy_vlc.table, CBPY_VLC_BITS, 1); |
453 | 3831 |
3832 if(cbpy<0){ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
3833 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
|
3834 return -1; |
453 | 3835 } |
2967 | 3836 |
453 | 3837 if(s->cbp_table[xy] & 8) { |
1652 | 3838 ff_set_qscale(s, s->qscale + quant_tab[get_bits(&s->gb, 2)]); |
453 | 3839 } |
903 | 3840 s->current_picture.qscale_table[xy]= s->qscale; |
453 | 3841 |
3842 for(i=0; i<6; i++){ | |
3843 int dc_pred_dir; | |
2967 | 3844 int dc= mpeg4_decode_dc(s, i, &dc_pred_dir); |
453 | 3845 if(dc < 0){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
3846 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
|
3847 return -1; |
453 | 3848 } |
3849 dir<<=1; | |
3850 if(dc_pred_dir) dir|=1; | |
3851 } | |
3852 s->cbp_table[xy]&= 3; //remove dquant | |
3853 s->cbp_table[xy]|= cbpy<<2; | |
2967 | 3854 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
|
3855 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
|
3856 }else if(IS_SKIP(s->current_picture.mb_type[xy])){ |
903 | 3857 s->current_picture.qscale_table[xy]= s->qscale; |
453 | 3858 s->cbp_table[xy]= 0; |
3859 }else{ | |
544 | 3860 int cbpy = get_vlc2(&s->gb, cbpy_vlc.table, CBPY_VLC_BITS, 1); |
453 | 3861 |
3862 if(cbpy<0){ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
3863 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
|
3864 return -1; |
453 | 3865 } |
2967 | 3866 |
453 | 3867 if(s->cbp_table[xy] & 8) { |
1652 | 3868 ff_set_qscale(s, s->qscale + quant_tab[get_bits(&s->gb, 2)]); |
453 | 3869 } |
903 | 3870 s->current_picture.qscale_table[xy]= s->qscale; |
453 | 3871 |
3872 s->cbp_table[xy]&= 3; //remove dquant | |
3873 s->cbp_table[xy]|= (cbpy^0xf)<<2; | |
3874 } | |
3875 } | |
3876 } | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3877 if(mb_num >= mb_count) return 0; |
453 | 3878 s->mb_x= 0; |
3879 } | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3880 return 0; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3881 } |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3882 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3883 /** |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3884 * decodes the first & second partition |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3885 * @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
|
3886 */ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3887 int ff_mpeg4_decode_partitions(MpegEncContext *s) |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3888 { |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3889 int mb_num; |
6481 | 3890 const int part_a_error= s->pict_type==FF_I_TYPE ? (DC_ERROR|MV_ERROR) : MV_ERROR; |
3891 const int part_a_end = s->pict_type==FF_I_TYPE ? (DC_END |MV_END) : MV_END; | |
2967 | 3892 |
3893 mb_num= mpeg4_decode_partition_a(s); | |
1144 | 3894 if(mb_num<0){ |
3895 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
|
3896 return -1; |
1144 | 3897 } |
2967 | 3898 |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3899 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
|
3900 av_log(s->avctx, AV_LOG_ERROR, "slice below monitor ...\n"); |
1144 | 3901 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
|
3902 return -1; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3903 } |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3904 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3905 s->mb_num_left= mb_num; |
2967 | 3906 |
6481 | 3907 if(s->pict_type==FF_I_TYPE){ |
1873 | 3908 while(show_bits(&s->gb, 9) == 1) |
3909 skip_bits(&s->gb, 9); | |
1257 | 3910 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
|
3911 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
|
3912 return -1; |
1144 | 3913 } |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3914 }else{ |
1873 | 3915 while(show_bits(&s->gb, 10) == 1) |
3916 skip_bits(&s->gb, 10); | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3917 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
|
3918 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
|
3919 return -1; |
1144 | 3920 } |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3921 } |
1144 | 3922 ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y, s->mb_x-1, s->mb_y, part_a_end); |
2967 | 3923 |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3924 if( mpeg4_decode_partition_b(s, mb_num) < 0){ |
6481 | 3925 if(s->pict_type==FF_P_TYPE) |
1144 | 3926 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
|
3927 return -1; |
1144 | 3928 }else{ |
6481 | 3929 if(s->pict_type==FF_P_TYPE) |
1144 | 3930 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
|
3931 } |
453 | 3932 |
2967 | 3933 return 0; |
453 | 3934 } |
3935 | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
3936 /** |
10753
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3937 * decodes a block. |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3938 * @return <0 if an error occurred |
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 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
|
3941 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
|
3942 { |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3943 int level, i, last, run; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3944 int dc_pred_dir; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3945 RLTable * rl; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3946 RL_VLC_ELEM * rl_vlc; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3947 const uint8_t * scan_table; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3948 int qmul, qadd; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3949 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3950 //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
|
3951 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3952 if(intra) { |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3953 if(s->use_intra_dc_vlc){ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3954 /* DC coef */ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3955 if(s->partitioned_frame){ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3956 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
|
3957 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
|
3958 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
|
3959 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
|
3960 }else{ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3961 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
|
3962 if (level < 0) |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3963 return -1; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3964 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3965 block[0] = level; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3966 i = 0; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3967 }else{ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3968 i = -1; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3969 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
|
3970 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3971 if (!coded) |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3972 goto not_coded; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3973 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3974 if(rvlc){ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3975 rl = &rvlc_rl_intra; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3976 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
|
3977 }else{ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3978 rl = &rl_intra; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3979 rl_vlc = rl_intra.rl_vlc[0]; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3980 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3981 if (s->ac_pred) { |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3982 if (dc_pred_dir == 0) |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3983 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
|
3984 else |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3985 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
|
3986 } else { |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3987 scan_table = s->intra_scantable.permutated; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3988 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3989 qmul=1; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3990 qadd=0; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3991 } else { |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3992 i = -1; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3993 if (!coded) { |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3994 s->block_last_index[n] = i; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3995 return 0; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3996 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3997 if(rvlc) rl = &rvlc_rl_inter; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3998 else rl = &rl_inter; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
3999 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4000 scan_table = s->intra_scantable.permutated; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4001 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4002 if(s->mpeg_quant){ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4003 qmul=1; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4004 qadd=0; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4005 if(rvlc){ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4006 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
|
4007 }else{ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4008 rl_vlc = rl_inter.rl_vlc[0]; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4009 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4010 }else{ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4011 qmul = s->qscale << 1; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4012 qadd = (s->qscale - 1) | 1; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4013 if(rvlc){ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4014 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
|
4015 }else{ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4016 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
|
4017 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4018 } |
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 { |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4021 OPEN_READER(re, &s->gb); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4022 for(;;) { |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4023 UPDATE_CACHE(re, &s->gb); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4024 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
|
4025 if (level==0) { |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4026 /* escape */ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4027 if(rvlc){ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4028 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
|
4029 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
|
4030 return -1; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4031 }; SKIP_CACHE(re, &s->gb, 1); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4032 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4033 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
|
4034 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
|
4035 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
|
4036 UPDATE_CACHE(re, &s->gb); |
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(SHOW_UBITS(re, &s->gb, 1)==0){ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4039 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
|
4040 return -1; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4041 }; SKIP_CACHE(re, &s->gb, 1); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4042 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4043 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
|
4044 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4045 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
|
4046 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
|
4047 return -1; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4048 }; SKIP_CACHE(re, &s->gb, 5); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4049 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4050 level= level * qmul + qadd; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4051 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
|
4052 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
|
4053 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4054 i+= run + 1; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4055 if(last) i+=192; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4056 }else{ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4057 int cache; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4058 cache= GET_CACHE(re, &s->gb); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4059 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4060 if(IS_3IV1) |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4061 cache ^= 0xC0000000; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4062 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4063 if (cache&0x80000000) { |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4064 if (cache&0x40000000) { |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4065 /* third escape */ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4066 SKIP_CACHE(re, &s->gb, 2); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4067 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
|
4068 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
|
4069 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
|
4070 UPDATE_CACHE(re, &s->gb); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4071 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4072 if(IS_3IV1){ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4073 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
|
4074 }else{ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4075 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
|
4076 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
|
4077 return -1; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4078 }; SKIP_CACHE(re, &s->gb, 1); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4079 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4080 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
|
4081 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4082 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
|
4083 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
|
4084 return -1; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4085 }; LAST_SKIP_CACHE(re, &s->gb, 1); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4086 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4087 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
|
4088 } |
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 0 |
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 const int abs_level= FFABS(level); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4093 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
|
4094 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
|
4095 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
|
4096 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
|
4097 return -1; |
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 if(s->error_recognition > FF_ER_COMPLIANT){ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4100 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
|
4101 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
|
4102 return -1; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4103 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4104 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
|
4105 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
|
4106 return -1; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4107 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4108 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4109 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4110 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4111 #endif |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4112 if (level>0) level= level * qmul + qadd; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4113 else level= level * qmul - qadd; |
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 if((unsigned)(level + 2048) > 4095){ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4116 if(s->error_recognition > FF_ER_COMPLIANT){ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4117 if(level > 2560 || level<-2560){ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4118 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
|
4119 return -1; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4120 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4121 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4122 level= level<0 ? -2048 : 2047; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4123 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4124 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4125 i+= run + 1; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4126 if(last) i+=192; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4127 } else { |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4128 /* second escape */ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4129 #if MIN_CACHE_BITS < 20 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4130 LAST_SKIP_BITS(re, &s->gb, 2); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4131 UPDATE_CACHE(re, &s->gb); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4132 #else |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4133 SKIP_BITS(re, &s->gb, 2); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4134 #endif |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4135 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
|
4136 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
|
4137 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
|
4138 LAST_SKIP_BITS(re, &s->gb, 1); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4139 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4140 } else { |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4141 /* first escape */ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4142 #if MIN_CACHE_BITS < 19 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4143 LAST_SKIP_BITS(re, &s->gb, 1); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4144 UPDATE_CACHE(re, &s->gb); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4145 #else |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4146 SKIP_BITS(re, &s->gb, 1); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4147 #endif |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4148 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
|
4149 i+= run; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4150 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
|
4151 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
|
4152 LAST_SKIP_BITS(re, &s->gb, 1); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4153 } |
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 } else { |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4156 i+= run; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4157 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
|
4158 LAST_SKIP_BITS(re, &s->gb, 1); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4159 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4160 if (i > 62){ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4161 i-= 192; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4162 if(i&(~63)){ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4163 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
|
4164 return -1; |
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 block[scan_table[i]] = level; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4168 break; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4169 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4170 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4171 block[scan_table[i]] = level; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4172 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4173 CLOSE_READER(re, &s->gb); |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4174 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4175 not_coded: |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4176 if (intra) { |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4177 if(!s->use_intra_dc_vlc){ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4178 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
|
4179 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4180 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
|
4181 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4182 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4183 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
|
4184 if (s->ac_pred) { |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4185 i = 63; /* XXX: not optimal */ |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4186 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4187 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4188 s->block_last_index[n] = i; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4189 return 0; |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4190 } |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4191 |
3790420a84b6
cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents:
10752
diff
changeset
|
4192 /** |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
4193 * decode partition C of one MB. |
6524 | 4194 * @return <0 if an error occurred |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
4195 */ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
4196 static int mpeg4_decode_partitioned_mb(MpegEncContext *s, DCTELEM block[6][64]) |
453 | 4197 { |
4198 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
|
4199 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
|
4200 |
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
|
4201 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
|
4202 cbp = s->cbp_table[xy]; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
4203 |
3282 | 4204 s->use_intra_dc_vlc= s->qscale < s->intra_dc_threshold; |
4205 | |
903 | 4206 if(s->current_picture.qscale_table[xy] != s->qscale){ |
1652 | 4207 ff_set_qscale(s, s->current_picture.qscale_table[xy] ); |
453 | 4208 } |
2967 | 4209 |
6481 | 4210 if (s->pict_type == FF_P_TYPE || s->pict_type==FF_S_TYPE) { |
453 | 4211 int i; |
4212 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
|
4213 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
|
4214 s->mv[0][i][1] = s->current_picture.motion_val[0][ s->block_index[i] ][1]; |
453 | 4215 } |
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
|
4216 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
|
4217 |
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
|
4218 if (IS_SKIP(mb_type)) { |
453 | 4219 /* skip mb */ |
4220 for(i=0;i<6;i++) | |
4221 s->block_last_index[i] = -1; | |
4222 s->mv_dir = MV_DIR_FORWARD; | |
4223 s->mv_type = MV_TYPE_16X16; | |
6481 | 4224 if(s->pict_type==FF_S_TYPE && s->vol_sprite_usage==GMC_SPRITE){ |
453 | 4225 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
|
4226 s->mb_skipped = 0; |
453 | 4227 }else{ |
4228 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
|
4229 s->mb_skipped = 1; |
453 | 4230 } |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
4231 }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
|
4232 s->ac_pred = IS_ACPRED(s->current_picture.mb_type[xy]); |
453 | 4233 }else if(!s->mb_intra){ |
4234 // s->mcsel= 0; //FIXME do we need to init that | |
2967 | 4235 |
453 | 4236 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
|
4237 if (IS_8X8(mb_type)) { |
453 | 4238 s->mv_type = MV_TYPE_8X8; |
4239 } else { | |
4240 s->mv_type = MV_TYPE_16X16; | |
4241 } | |
4242 } | |
4243 } else { /* I-Frame */ | |
4244 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
|
4245 s->ac_pred = IS_ACPRED(s->current_picture.mb_type[xy]); |
1132 | 4246 } |
4247 | |
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
|
4248 if (!IS_SKIP(mb_type)) { |
1132 | 4249 int i; |
2632 | 4250 s->dsp.clear_blocks(s->block[0]); |
453 | 4251 /* decode each block */ |
4252 for (i = 0; i < 6; i++) { | |
1132 | 4253 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
|
4254 av_log(s->avctx, AV_LOG_ERROR, "texture corrupted at %d %d %d\n", s->mb_x, s->mb_y, s->mb_intra); |
453 | 4255 return -1; |
4256 } | |
718 | 4257 cbp+=cbp; |
453 | 4258 } |
4259 } | |
290 | 4260 |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
4261 /* per-MB end of slice check */ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
4262 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
4263 if(--s->mb_num_left <= 0){ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
4264 if(mpeg4_is_resync(s)) |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
4265 return SLICE_END; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
4266 else |
2967 | 4267 return SLICE_NOEND; |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
4268 }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
|
4269 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
|
4270 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
|
4271 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
|
4272 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
|
4273 } |
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
|
4274 return SLICE_OK; |
619
2be2cc8fd0a1
mpeg4 interlaced decoding support (not completly implemented/tested due to lack of samples)
michaelni
parents:
617
diff
changeset
|
4275 } |
2be2cc8fd0a1
mpeg4 interlaced decoding support (not completly implemented/tested due to lack of samples)
michaelni
parents:
617
diff
changeset
|
4276 } |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
4277 |
10752
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4278 /* Decodes RVLC of H.263+ UMV */ |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4279 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
|
4280 { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4281 int code = 0, sign; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4282 |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4283 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
|
4284 return pred; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4285 |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4286 code = 2 + get_bits1(&s->gb); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4287 |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4288 while (get_bits1(&s->gb)) |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4289 { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4290 code <<= 1; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4291 code += get_bits1(&s->gb); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4292 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4293 sign = code & 1; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4294 code >>= 1; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4295 |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4296 code = (sign) ? (pred - code) : (pred + code); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4297 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
|
4298 return code; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4299 |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4300 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4301 |
1633 | 4302 /** |
4303 * read the next MVs for OBMC. yes this is a ugly hack, feel free to send a patch :) | |
4304 */ | |
4305 static void preview_obmc(MpegEncContext *s){ | |
4306 GetBitContext gb= s->gb; | |
2967 | 4307 |
1633 | 4308 int cbpc, i, pred_x, pred_y, mx, my; |
4309 int16_t *mot_val; | |
4310 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
|
4311 const int stride= s->b8_stride*2; |
2967 | 4312 |
1633 | 4313 for(i=0; i<4; i++) |
4314 s->block_index[i]+= 2; | |
4315 for(i=4; i<6; i++) | |
4316 s->block_index[i]+= 1; | |
4317 s->mb_x++; | |
2967 | 4318 |
6481 | 4319 assert(s->pict_type == FF_P_TYPE); |
1633 | 4320 |
4321 do{ | |
4322 if (get_bits1(&s->gb)) { | |
4323 /* 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
|
4324 mot_val = s->current_picture.motion_val[0][ s->block_index[0] ]; |
2967 | 4325 mot_val[0 ]= mot_val[2 ]= |
1633 | 4326 mot_val[0+stride]= mot_val[2+stride]= 0; |
4327 mot_val[1 ]= mot_val[3 ]= | |
4328 mot_val[1+stride]= mot_val[3+stride]= 0; | |
2967 | 4329 |
1633 | 4330 s->current_picture.mb_type[xy]= MB_TYPE_SKIP | MB_TYPE_16x16 | MB_TYPE_L0; |
4331 goto end; | |
4332 } | |
4333 cbpc = get_vlc2(&s->gb, inter_MCBPC_vlc.table, INTER_MCBPC_VLC_BITS, 2); | |
4334 }while(cbpc == 20); | |
2967 | 4335 |
1633 | 4336 if(cbpc & 4){ |
4337 s->current_picture.mb_type[xy]= MB_TYPE_INTRA; | |
4338 }else{ | |
4339 get_vlc2(&s->gb, cbpy_vlc.table, CBPY_VLC_BITS, 1); | |
4340 if (cbpc & 8) { | |
1656 | 4341 if(s->modified_quant){ |
4342 if(get_bits1(&s->gb)) skip_bits(&s->gb, 1); | |
4343 else skip_bits(&s->gb, 5); | |
4344 }else | |
4345 skip_bits(&s->gb, 2); | |
1633 | 4346 } |
2967 | 4347 |
1633 | 4348 if ((cbpc & 16) == 0) { |
2967 | 4349 s->current_picture.mb_type[xy]= MB_TYPE_16x16 | MB_TYPE_L0; |
1633 | 4350 /* 16x16 motion prediction */ |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1936
diff
changeset
|
4351 mot_val= h263_pred_motion(s, 0, 0, &pred_x, &pred_y); |
1633 | 4352 if (s->umvplus) |
4353 mx = h263p_decode_umotion(s, pred_x); | |
4354 else | |
1655 | 4355 mx = h263_decode_motion(s, pred_x, 1); |
2967 | 4356 |
1633 | 4357 if (s->umvplus) |
4358 my = h263p_decode_umotion(s, pred_y); | |
4359 else | |
1655 | 4360 my = h263_decode_motion(s, pred_y, 1); |
2967 | 4361 |
4362 mot_val[0 ]= mot_val[2 ]= | |
1633 | 4363 mot_val[0+stride]= mot_val[2+stride]= mx; |
4364 mot_val[1 ]= mot_val[3 ]= | |
4365 mot_val[1+stride]= mot_val[3+stride]= my; | |
4366 } else { | |
2967 | 4367 s->current_picture.mb_type[xy]= MB_TYPE_8x8 | MB_TYPE_L0; |
1633 | 4368 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
|
4369 mot_val = h263_pred_motion(s, i, 0, &pred_x, &pred_y); |
1633 | 4370 if (s->umvplus) |
4371 mx = h263p_decode_umotion(s, pred_x); | |
4372 else | |
1655 | 4373 mx = h263_decode_motion(s, pred_x, 1); |
2967 | 4374 |
1633 | 4375 if (s->umvplus) |
4376 my = h263p_decode_umotion(s, pred_y); | |
2967 | 4377 else |
1655 | 4378 my = h263_decode_motion(s, pred_y, 1); |
1633 | 4379 if (s->umvplus && (mx - pred_x) == 1 && (my - pred_y) == 1) |
4380 skip_bits1(&s->gb); /* Bit stuffing to prevent PSC */ | |
4381 mot_val[0] = mx; | |
4382 mot_val[1] = my; | |
4383 } | |
4384 } | |
4385 } | |
4386 end: | |
2967 | 4387 |
1633 | 4388 for(i=0; i<4; i++) |
4389 s->block_index[i]-= 2; | |
4390 for(i=4; i<6; i++) | |
4391 s->block_index[i]-= 1; | |
4392 s->mb_x--; | |
4393 | |
4394 s->gb= gb; | |
4395 } | |
4396 | |
1656 | 4397 static void h263_decode_dquant(MpegEncContext *s){ |
4398 static const int8_t quant_tab[4] = { -1, -2, 1, 2 }; | |
4399 | |
4400 if(s->modified_quant){ | |
4401 if(get_bits1(&s->gb)) | |
4402 s->qscale= modified_quant_tab[get_bits1(&s->gb)][ s->qscale ]; | |
4403 else | |
4404 s->qscale= get_bits(&s->gb, 5); | |
4405 }else | |
4406 s->qscale += quant_tab[get_bits(&s->gb, 2)]; | |
4407 ff_set_qscale(s, s->qscale); | |
4408 } | |
4409 | |
10752
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4410 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
|
4411 int n, int coded) |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4412 { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4413 int code, level, i, j, last, run; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4414 RLTable *rl = &rl_inter; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4415 const uint8_t *scan_table; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4416 GetBitContext gb= s->gb; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4417 |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4418 scan_table = s->intra_scantable.permutated; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4419 if (s->h263_aic && s->mb_intra) { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4420 rl = &rl_intra_aic; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4421 i = 0; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4422 if (s->ac_pred) { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4423 if (s->h263_aic_dir) |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4424 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
|
4425 else |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4426 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
|
4427 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4428 } else if (s->mb_intra) { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4429 /* DC coef */ |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4430 if(s->codec_id == CODEC_ID_RV10){ |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4431 #if CONFIG_RV10_DECODER |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4432 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
|
4433 int component, diff; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4434 component = (n <= 3 ? 0 : n - 4 + 1); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4435 level = s->last_dc[component]; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4436 if (s->rv10_first_dc_coded[component]) { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4437 diff = rv_decode_dc(s, n); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4438 if (diff == 0xffff) |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4439 return -1; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4440 level += diff; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4441 level = level & 0xff; /* handle wrap round */ |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4442 s->last_dc[component] = level; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4443 } else { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4444 s->rv10_first_dc_coded[component] = 1; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4445 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4446 } else { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4447 level = get_bits(&s->gb, 8); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4448 if (level == 255) |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4449 level = 128; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4450 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4451 #endif |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4452 }else{ |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4453 level = get_bits(&s->gb, 8); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4454 if((level&0x7F) == 0){ |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4455 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
|
4456 if(s->error_recognition >= FF_ER_COMPLIANT) |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4457 return -1; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4458 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4459 if (level == 255) |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4460 level = 128; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4461 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4462 block[0] = level; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4463 i = 1; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4464 } else { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4465 i = 0; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4466 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4467 if (!coded) { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4468 if (s->mb_intra && s->h263_aic) |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4469 goto not_coded; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4470 s->block_last_index[n] = i - 1; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4471 return 0; |
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 retry: |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4474 for(;;) { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4475 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
|
4476 if (code < 0){ |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4477 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
|
4478 return -1; |
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 if (code == rl->n) { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4481 /* escape */ |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4482 if (s->h263_flv > 1) { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4483 int is11 = get_bits1(&s->gb); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4484 last = get_bits1(&s->gb); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4485 run = get_bits(&s->gb, 6); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4486 if(is11){ |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4487 level = get_sbits(&s->gb, 11); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4488 } else { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4489 level = get_sbits(&s->gb, 7); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4490 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4491 } else { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4492 last = get_bits1(&s->gb); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4493 run = get_bits(&s->gb, 6); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4494 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
|
4495 if(level == -128){ |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4496 if (s->codec_id == CODEC_ID_RV10) { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4497 /* XXX: should patch encoder too */ |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4498 level = get_sbits(&s->gb, 12); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4499 }else{ |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4500 level = get_bits(&s->gb, 5); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4501 level |= get_sbits(&s->gb, 6)<<5; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4502 } |
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 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4505 } else { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4506 run = rl->table_run[code]; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4507 level = rl->table_level[code]; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4508 last = code >= rl->last; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4509 if (get_bits1(&s->gb)) |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4510 level = -level; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4511 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4512 i += run; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4513 if (i >= 64){ |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4514 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
|
4515 //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
|
4516 rl = &rl_intra_aic; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4517 i = 0; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4518 s->gb= gb; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4519 s->dsp.clear_block(block); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4520 goto retry; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4521 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4522 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
|
4523 return -1; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4524 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4525 j = scan_table[i]; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4526 block[j] = level; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4527 if (last) |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4528 break; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4529 i++; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4530 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4531 not_coded: |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4532 if (s->mb_intra && s->h263_aic) { |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4533 h263_pred_acdc(s, block, n); |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4534 i = 63; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4535 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4536 s->block_last_index[n] = i; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4537 return 0; |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4538 } |
56e57dc0fe19
cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents:
10726
diff
changeset
|
4539 |
9103
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4540 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
|
4541 { |
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4542 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
|
4543 int i, mbi; |
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4544 |
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4545 /* 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
|
4546 * 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
|
4547 */ |
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4548 mbi = s->mb_intra; |
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4549 s->mb_intra = 0; |
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4550 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
|
4551 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
|
4552 return -1; |
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4553 cbp+=cbp; |
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4554 } |
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4555 s->mb_intra = mbi; |
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4556 return 0; |
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4557 } |
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4558 |
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4559 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
|
4560 { |
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4561 int c, mv = 1; |
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4562 |
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4563 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
|
4564 c = get_bits1(gb); |
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4565 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
|
4566 mv = !get_bits1(gb); |
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4567 } 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
|
4568 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
|
4569 c = mv & 1; |
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4570 mv = !!(mv & 2); |
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4571 } |
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4572 if(c) |
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4573 *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
|
4574 return mv; |
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4575 } |
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4576 |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
4577 int ff_h263_decode_mb(MpegEncContext *s, |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
4578 DCTELEM block[6][64]) |
0 | 4579 { |
4580 int cbpc, cbpy, i, cbp, pred_x, pred_y, mx, my, dquant; | |
1064 | 4581 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
|
4582 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
|
4583 int cbpb = 0, pb_mv_count = 0; |
2967 | 4584 |
1649
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4585 assert(!s->h263_pred); |
2967 | 4586 |
6481 | 4587 if (s->pict_type == FF_P_TYPE) { |
1649
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4588 do{ |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4589 if (get_bits1(&s->gb)) { |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4590 /* skip mb */ |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4591 s->mb_intra = 0; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4592 for(i=0;i<6;i++) |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4593 s->block_last_index[i] = -1; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4594 s->mv_dir = MV_DIR_FORWARD; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4595 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
|
4596 s->current_picture.mb_type[xy]= MB_TYPE_SKIP | MB_TYPE_16x16 | MB_TYPE_L0; |
255 | 4597 s->mv[0][0][0] = 0; |
4598 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
|
4599 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
|
4600 goto end; |
255 | 4601 } |
1649
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4602 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
|
4603 if (cbpc < 0){ |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4604 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
|
4605 return -1; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4606 } |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4607 }while(cbpc == 20); |
2967 | 4608 |
2632 | 4609 s->dsp.clear_blocks(s->block[0]); |
2967 | 4610 |
0 | 4611 dquant = cbpc & 8; |
4612 s->mb_intra = ((cbpc & 4) != 0); | |
262 | 4613 if (s->mb_intra) goto intra; |
2967 | 4614 |
9103
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4615 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
|
4616 pb_mv_count = h263_get_modb(&s->gb, s->pb_frame, &cbpb); |
544 | 4617 cbpy = get_vlc2(&s->gb, cbpy_vlc.table, CBPY_VLC_BITS, 1); |
2967 | 4618 |
1637 | 4619 if(s->alt_inter_vlc==0 || (cbpc & 3)!=3) |
4620 cbpy ^= 0xF; | |
2967 | 4621 |
1637 | 4622 cbp = (cbpc & 3) | (cbpy << 2); |
0 | 4623 if (dquant) { |
1656 | 4624 h263_decode_dquant(s); |
0 | 4625 } |
2967 | 4626 |
1649
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4627 s->mv_dir = MV_DIR_FORWARD; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4628 if ((cbpc & 16) == 0) { |
2967 | 4629 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
|
4630 /* 16x16 motion prediction */ |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4631 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
|
4632 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
|
4633 if (s->umvplus) |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4634 mx = h263p_decode_umotion(s, pred_x); |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4635 else |
1655 | 4636 mx = h263_decode_motion(s, pred_x, 1); |
2967 | 4637 |
1649
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4638 if (mx >= 0xffff) |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4639 return -1; |
2967 | 4640 |
1649
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4641 if (s->umvplus) |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4642 my = h263p_decode_umotion(s, pred_y); |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4643 else |
1655 | 4644 my = h263_decode_motion(s, pred_y, 1); |
2967 | 4645 |
1649
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4646 if (my >= 0xffff) |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4647 return -1; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4648 s->mv[0][0][0] = mx; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4649 s->mv[0][0][1] = my; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4650 |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4651 if (s->umvplus && (mx - pred_x) == 1 && (my - pred_y) == 1) |
2967 | 4652 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
|
4653 } else { |
2967 | 4654 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
|
4655 s->mv_type = MV_TYPE_8X8; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4656 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
|
4657 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
|
4658 if (s->umvplus) |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4659 mx = h263p_decode_umotion(s, pred_x); |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4660 else |
1655 | 4661 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
|
4662 if (mx >= 0xffff) |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4663 return -1; |
2967 | 4664 |
1649
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4665 if (s->umvplus) |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4666 my = h263p_decode_umotion(s, pred_y); |
2967 | 4667 else |
1655 | 4668 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
|
4669 if (my >= 0xffff) |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4670 return -1; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4671 s->mv[0][i][0] = mx; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4672 s->mv[0][i][1] = my; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4673 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
|
4674 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
|
4675 mot_val[0] = mx; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4676 mot_val[1] = my; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4677 } |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4678 } |
6481 | 4679 } else if(s->pict_type==FF_B_TYPE) { |
1655 | 4680 int mb_type; |
4681 const int stride= s->b8_stride; | |
1701 | 4682 int16_t *mot_val0 = s->current_picture.motion_val[0][ 2*(s->mb_x + s->mb_y*stride) ]; |
4683 int16_t *mot_val1 = s->current_picture.motion_val[1][ 2*(s->mb_x + s->mb_y*stride) ]; | |
1655 | 4684 // const int mv_xy= s->mb_x + 1 + s->mb_y * s->mb_stride; |
4685 | |
2967 | 4686 //FIXME ugly |
4687 mot_val0[0 ]= mot_val0[2 ]= mot_val0[0+2*stride]= mot_val0[2+2*stride]= | |
4688 mot_val0[1 ]= mot_val0[3 ]= mot_val0[1+2*stride]= mot_val0[3+2*stride]= | |
4689 mot_val1[0 ]= mot_val1[2 ]= mot_val1[0+2*stride]= mot_val1[2+2*stride]= | |
1701 | 4690 mot_val1[1 ]= mot_val1[3 ]= mot_val1[1+2*stride]= mot_val1[3+2*stride]= 0; |
1655 | 4691 |
4692 do{ | |
4693 mb_type= get_vlc2(&s->gb, h263_mbtype_b_vlc.table, H263_MBTYPE_B_VLC_BITS, 2); | |
4694 if (mb_type < 0){ | |
4695 av_log(s->avctx, AV_LOG_ERROR, "b mb_type damaged at %d %d\n", s->mb_x, s->mb_y); | |
4696 return -1; | |
4697 } | |
4698 | |
4699 mb_type= h263_mb_type_b_map[ mb_type ]; | |
4700 }while(!mb_type); | |
4701 | |
4702 s->mb_intra = IS_INTRA(mb_type); | |
4703 if(HAS_CBP(mb_type)){ | |
2632 | 4704 s->dsp.clear_blocks(s->block[0]); |
1655 | 4705 cbpc = get_vlc2(&s->gb, cbpc_b_vlc.table, CBPC_B_VLC_BITS, 1); |
4706 if(s->mb_intra){ | |
4707 dquant = IS_QUANT(mb_type); | |
4708 goto intra; | |
4709 } | |
4710 | |
4711 cbpy = get_vlc2(&s->gb, cbpy_vlc.table, CBPY_VLC_BITS, 1); | |
4712 | |
4713 if (cbpy < 0){ | |
4714 av_log(s->avctx, AV_LOG_ERROR, "b cbpy damaged at %d %d\n", s->mb_x, s->mb_y); | |
4715 return -1; | |
4716 } | |
2967 | 4717 |
1655 | 4718 if(s->alt_inter_vlc==0 || (cbpc & 3)!=3) |
4719 cbpy ^= 0xF; | |
2967 | 4720 |
1655 | 4721 cbp = (cbpc & 3) | (cbpy << 2); |
4722 }else | |
4723 cbp=0; | |
2967 | 4724 |
1655 | 4725 assert(!s->mb_intra); |
4726 | |
4727 if(IS_QUANT(mb_type)){ | |
1656 | 4728 h263_decode_dquant(s); |
1655 | 4729 } |
4730 | |
4731 if(IS_DIRECT(mb_type)){ | |
4732 s->mv_dir = MV_DIR_FORWARD | MV_DIR_BACKWARD | MV_DIRECT; | |
4733 mb_type |= ff_mpeg4_set_direct_mv(s, 0, 0); | |
4734 }else{ | |
4735 s->mv_dir = 0; | |
4736 s->mv_type= MV_TYPE_16X16; | |
4737 //FIXME UMV | |
4738 | |
4739 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
|
4740 int16_t *mot_val= h263_pred_motion(s, 0, 0, &mx, &my); |
1655 | 4741 s->mv_dir = MV_DIR_FORWARD; |
4742 | |
4743 mx = h263_decode_motion(s, mx, 1); | |
4744 my = h263_decode_motion(s, my, 1); | |
2967 | 4745 |
1655 | 4746 s->mv[0][0][0] = mx; |
4747 s->mv[0][0][1] = my; | |
1701 | 4748 mot_val[0 ]= mot_val[2 ]= mot_val[0+2*stride]= mot_val[2+2*stride]= mx; |
4749 mot_val[1 ]= mot_val[3 ]= mot_val[1+2*stride]= mot_val[3+2*stride]= my; | |
1655 | 4750 } |
2967 | 4751 |
1655 | 4752 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
|
4753 int16_t *mot_val= h263_pred_motion(s, 0, 1, &mx, &my); |
1655 | 4754 s->mv_dir |= MV_DIR_BACKWARD; |
2967 | 4755 |
1655 | 4756 mx = h263_decode_motion(s, mx, 1); |
4757 my = h263_decode_motion(s, my, 1); | |
1701 | 4758 |
1655 | 4759 s->mv[1][0][0] = mx; |
4760 s->mv[1][0][1] = my; | |
1701 | 4761 mot_val[0 ]= mot_val[2 ]= mot_val[0+2*stride]= mot_val[2+2*stride]= mx; |
4762 mot_val[1 ]= mot_val[3 ]= mot_val[1+2*stride]= mot_val[3+2*stride]= my; | |
1655 | 4763 } |
4764 } | |
2967 | 4765 |
1655 | 4766 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
|
4767 } else { /* I-Frame */ |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4768 do{ |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4769 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
|
4770 if (cbpc < 0){ |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4771 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
|
4772 return -1; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4773 } |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4774 }while(cbpc == 8); |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4775 |
2632 | 4776 s->dsp.clear_blocks(s->block[0]); |
4777 | |
1649
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4778 dquant = cbpc & 4; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4779 s->mb_intra = 1; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4780 intra: |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4781 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
|
4782 if (s->h263_aic) { |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4783 s->ac_pred = get_bits1(&s->gb); |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4784 if(s->ac_pred){ |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4785 s->current_picture.mb_type[xy]= MB_TYPE_INTRA | MB_TYPE_ACPRED; |
2967 | 4786 |
1649
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4787 s->h263_aic_dir = get_bits1(&s->gb); |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4788 } |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4789 }else |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4790 s->ac_pred = 0; |
2967 | 4791 |
9103
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4792 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
|
4793 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
|
4794 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
|
4795 if(cbpy<0){ |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4796 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
|
4797 return -1; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4798 } |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4799 cbp = (cbpc & 3) | (cbpy << 2); |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4800 if (dquant) { |
1656 | 4801 h263_decode_dquant(s); |
1649
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4802 } |
9103
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4803 |
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4804 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
|
4805 } |
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4806 |
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4807 while(pb_mv_count--){ |
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4808 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
|
4809 h263_decode_motion(s, 0, 1); |
9093 | 4810 } |
4811 | |
4812 /* decode each block */ | |
4813 for (i = 0; i < 6; i++) { | |
4814 if (h263_decode_block(s, block[i], i, cbp&32) < 0) | |
4815 return -1; | |
4816 cbp+=cbp; | |
4817 } | |
4818 | |
9103
b626fed816d7
Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents:
9093
diff
changeset
|
4819 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
|
4820 return -1; |
9093 | 4821 if(s->obmc && !s->mb_intra){ |
4822 if(s->pict_type == FF_P_TYPE && s->mb_x+1<s->mb_width && s->mb_num_left != 1) | |
4823 preview_obmc(s); | |
1649
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4824 } |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4825 end: |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4826 |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4827 /* per-MB end of slice check */ |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4828 { |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4829 int v= show_bits(&s->gb, 16); |
2967 | 4830 |
1649
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4831 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
|
4832 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
|
4833 } |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4834 |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4835 if(v==0) |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4836 return SLICE_END; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4837 } |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4838 |
2967 | 4839 return SLICE_OK; |
1649
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4840 } |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4841 |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4842 int ff_mpeg4_decode_mb(MpegEncContext *s, |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4843 DCTELEM block[6][64]) |
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 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
|
4846 int16_t *mot_val; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4847 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
|
4848 const int xy= s->mb_x + s->mb_y * s->mb_stride; |
2967 | 4849 |
1649
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4850 assert(s->h263_pred); |
2967 | 4851 |
6481 | 4852 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
|
4853 do{ |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4854 if (get_bits1(&s->gb)) { |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4855 /* skip mb */ |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4856 s->mb_intra = 0; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4857 for(i=0;i<6;i++) |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4858 s->block_last_index[i] = -1; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4859 s->mv_dir = MV_DIR_FORWARD; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4860 s->mv_type = MV_TYPE_16X16; |
6481 | 4861 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
|
4862 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
|
4863 s->mcsel=1; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4864 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
|
4865 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
|
4866 |
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
|
4867 s->mb_skipped = 0; |
1649
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4868 }else{ |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4869 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
|
4870 s->mcsel=0; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4871 s->mv[0][0][0] = 0; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4872 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
|
4873 s->mb_skipped = 1; |
1649
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4874 } |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4875 goto end; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4876 } |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4877 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
|
4878 if (cbpc < 0){ |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4879 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
|
4880 return -1; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4881 } |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4882 }while(cbpc == 20); |
2967 | 4883 |
2632 | 4884 s->dsp.clear_blocks(s->block[0]); |
1649
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4885 dquant = cbpc & 8; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4886 s->mb_intra = ((cbpc & 4) != 0); |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4887 if (s->mb_intra) goto intra; |
2967 | 4888 |
6481 | 4889 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
|
4890 s->mcsel= get_bits1(&s->gb); |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4891 else s->mcsel= 0; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4892 cbpy = get_vlc2(&s->gb, cbpy_vlc.table, CBPY_VLC_BITS, 1) ^ 0x0F; |
2967 | 4893 |
1649
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4894 cbp = (cbpc & 3) | (cbpy << 2); |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4895 if (dquant) { |
1652 | 4896 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
|
4897 } |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
4898 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
|
4899 s->interlaced_dct= get_bits1(&s->gb); |
2967 | 4900 |
0 | 4901 s->mv_dir = MV_DIR_FORWARD; |
4902 if ((cbpc & 16) == 0) { | |
619
2be2cc8fd0a1
mpeg4 interlaced decoding support (not completly implemented/tested due to lack of samples)
michaelni
parents:
617
diff
changeset
|
4903 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
|
4904 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
|
4905 /* 16x16 global motion prediction */ |
2be2cc8fd0a1
mpeg4 interlaced decoding support (not completly implemented/tested due to lack of samples)
michaelni
parents:
617
diff
changeset
|
4906 s->mv_type = MV_TYPE_16X16; |
753 | 4907 mx= get_amv(s, 0); |
4908 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
|
4909 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
|
4910 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
|
4911 }else if((!s->progressive_sequence) && get_bits1(&s->gb)){ |
2967 | 4912 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
|
4913 /* 16x8 field motion prediction */ |
2be2cc8fd0a1
mpeg4 interlaced decoding support (not completly implemented/tested due to lack of samples)
michaelni
parents:
617
diff
changeset
|
4914 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
|
4915 |
2be2cc8fd0a1
mpeg4 interlaced decoding support (not completly implemented/tested due to lack of samples)
michaelni
parents:
617
diff
changeset
|
4916 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
|
4917 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
|
4918 |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1936
diff
changeset
|
4919 h263_pred_motion(s, 0, 0, &pred_x, &pred_y); |
2967 | 4920 |
619
2be2cc8fd0a1
mpeg4 interlaced decoding support (not completly implemented/tested due to lack of samples)
michaelni
parents:
617
diff
changeset
|
4921 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
|
4922 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
|
4923 if (mx >= 0xffff) |
2be2cc8fd0a1
mpeg4 interlaced decoding support (not completly implemented/tested due to lack of samples)
michaelni
parents:
617
diff
changeset
|
4924 return -1; |
2967 | 4925 |
619
2be2cc8fd0a1
mpeg4 interlaced decoding support (not completly implemented/tested due to lack of samples)
michaelni
parents:
617
diff
changeset
|
4926 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
|
4927 if (my >= 0xffff) |
2be2cc8fd0a1
mpeg4 interlaced decoding support (not completly implemented/tested due to lack of samples)
michaelni
parents:
617
diff
changeset
|
4928 return -1; |
2be2cc8fd0a1
mpeg4 interlaced decoding support (not completly implemented/tested due to lack of samples)
michaelni
parents:
617
diff
changeset
|
4929 |
2be2cc8fd0a1
mpeg4 interlaced decoding support (not completly implemented/tested due to lack of samples)
michaelni
parents:
617
diff
changeset
|
4930 s->mv[0][i][0] = mx; |
661 | 4931 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
|
4932 } |
2be2cc8fd0a1
mpeg4 interlaced decoding support (not completly implemented/tested due to lack of samples)
michaelni
parents:
617
diff
changeset
|
4933 }else{ |
2967 | 4934 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
|
4935 /* 16x16 motion prediction */ |
2be2cc8fd0a1
mpeg4 interlaced decoding support (not completly implemented/tested due to lack of samples)
michaelni
parents:
617
diff
changeset
|
4936 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
|
4937 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
|
4938 mx = h263_decode_motion(s, pred_x, s->f_code); |
2967 | 4939 |
619
2be2cc8fd0a1
mpeg4 interlaced decoding support (not completly implemented/tested due to lack of samples)
michaelni
parents:
617
diff
changeset
|
4940 if (mx >= 0xffff) |
2be2cc8fd0a1
mpeg4 interlaced decoding support (not completly implemented/tested due to lack of samples)
michaelni
parents:
617
diff
changeset
|
4941 return -1; |
2967 | 4942 |
1649
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4943 my = h263_decode_motion(s, pred_y, s->f_code); |
2967 | 4944 |
619
2be2cc8fd0a1
mpeg4 interlaced decoding support (not completly implemented/tested due to lack of samples)
michaelni
parents:
617
diff
changeset
|
4945 if (my >= 0xffff) |
2be2cc8fd0a1
mpeg4 interlaced decoding support (not completly implemented/tested due to lack of samples)
michaelni
parents:
617
diff
changeset
|
4946 return -1; |
2be2cc8fd0a1
mpeg4 interlaced decoding support (not completly implemented/tested due to lack of samples)
michaelni
parents:
617
diff
changeset
|
4947 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
|
4948 s->mv[0][0][1] = my; |
255 | 4949 } |
0 | 4950 } else { |
2967 | 4951 s->current_picture.mb_type[xy]= MB_TYPE_8x8 | MB_TYPE_L0; |
0 | 4952 s->mv_type = MV_TYPE_8X8; |
4953 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
|
4954 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
|
4955 mx = h263_decode_motion(s, pred_x, s->f_code); |
0 | 4956 if (mx >= 0xffff) |
4957 return -1; | |
2967 | 4958 |
1649
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
4959 my = h263_decode_motion(s, pred_y, s->f_code); |
0 | 4960 if (my >= 0xffff) |
4961 return -1; | |
4962 s->mv[0][i][0] = mx; | |
4963 s->mv[0][i][1] = my; | |
4964 mot_val[0] = mx; | |
4965 mot_val[1] = my; | |
4966 } | |
4967 } | |
6481 | 4968 } else if(s->pict_type==FF_B_TYPE) { |
262 | 4969 int modb1; // first bit of modb |
4970 int modb2; // second bit of modb | |
4971 int mb_type; | |
4972 | |
4973 s->mb_intra = 0; //B-frames never contain intra blocks | |
4974 s->mcsel=0; // ... true gmc blocks | |
4975 | |
4976 if(s->mb_x==0){ | |
674 | 4977 for(i=0; i<2; i++){ |
2967 | 4978 s->last_mv[i][0][0]= |
4979 s->last_mv[i][0][1]= | |
4980 s->last_mv[i][1][0]= | |
674 | 4981 s->last_mv[i][1][1]= 0; |
4982 } | |
262 | 4983 } |
4984 | |
4985 /* 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
|
4986 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
|
4987 |
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
|
4988 if(s->mb_skipped){ |
262 | 4989 /* skip mb */ |
4990 for(i=0;i<6;i++) | |
4991 s->block_last_index[i] = -1; | |
4992 | |
4993 s->mv_dir = MV_DIR_FORWARD; | |
4994 s->mv_type = MV_TYPE_16X16; | |
4995 s->mv[0][0][0] = 0; | |
4996 s->mv[0][0][1] = 0; | |
4997 s->mv[1][0][0] = 0; | |
4998 s->mv[1][0][1] = 0; | |
2967 | 4999 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
|
5000 goto end; |
262 | 5001 } |
5002 | |
2967 | 5003 modb1= get_bits1(&s->gb); |
666 | 5004 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
|
5005 mb_type= MB_TYPE_DIRECT2 | MB_TYPE_SKIP | MB_TYPE_L0L1; //like MB_TYPE_B_DIRECT but no vectors coded |
666 | 5006 cbp=0; |
5007 }else{ | |
262 | 5008 modb2= get_bits1(&s->gb); |
544 | 5009 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
|
5010 if(mb_type<0){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
5011 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
|
5012 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
|
5013 } |
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
|
5014 mb_type= mb_type_b_map[ mb_type ]; |
666 | 5015 if(modb2) cbp= 0; |
2632 | 5016 else{ |
5017 s->dsp.clear_blocks(s->block[0]); | |
5018 cbp= get_bits(&s->gb, 6); | |
5019 } | |
666 | 5020 |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1176
diff
changeset
|
5021 if ((!IS_DIRECT(mb_type)) && cbp) { |
262 | 5022 if(get_bits1(&s->gb)){ |
1652 | 5023 ff_set_qscale(s, s->qscale + get_bits1(&s->gb)*4 - 2); |
262 | 5024 } |
5025 } | |
664 | 5026 |
5027 if(!s->progressive_sequence){ | |
5028 if(cbp) | |
5029 s->interlaced_dct= get_bits1(&s->gb); | |
5030 | |
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
|
5031 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
|
5032 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
|
5033 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
|
5034 |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1176
diff
changeset
|
5035 if(USES_LIST(mb_type, 0)){ |
667 | 5036 s->field_select[0][0]= get_bits1(&s->gb); |
5037 s->field_select[0][1]= get_bits1(&s->gb); | |
5038 } | |
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
|
5039 if(USES_LIST(mb_type, 1)){ |
667 | 5040 s->field_select[1][0]= get_bits1(&s->gb); |
5041 s->field_select[1][1]= get_bits1(&s->gb); | |
5042 } | |
5043 } | |
666 | 5044 } |
5045 | |
667 | 5046 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
|
5047 if((mb_type & (MB_TYPE_DIRECT2|MB_TYPE_INTERLACED)) == 0){ |
666 | 5048 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
|
5049 |
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
|
5050 if(USES_LIST(mb_type, 0)){ |
666 | 5051 s->mv_dir = MV_DIR_FORWARD; |
5052 | |
5053 mx = h263_decode_motion(s, s->last_mv[0][0][0], s->f_code); | |
5054 my = h263_decode_motion(s, s->last_mv[0][0][1], s->f_code); | |
5055 s->last_mv[0][1][0]= s->last_mv[0][0][0]= s->mv[0][0][0] = mx; | |
5056 s->last_mv[0][1][1]= s->last_mv[0][0][1]= s->mv[0][0][1] = my; | |
667 | 5057 } |
2967 | 5058 |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1176
diff
changeset
|
5059 if(USES_LIST(mb_type, 1)){ |
666 | 5060 s->mv_dir |= MV_DIR_BACKWARD; |
5061 | |
5062 mx = h263_decode_motion(s, s->last_mv[1][0][0], s->b_code); | |
5063 my = h263_decode_motion(s, s->last_mv[1][0][1], s->b_code); | |
5064 s->last_mv[1][1][0]= s->last_mv[1][0][0]= s->mv[1][0][0] = mx; | |
5065 s->last_mv[1][1][1]= s->last_mv[1][0][1]= s->mv[1][0][1] = my; | |
5066 } | |
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
|
5067 }else if(!IS_DIRECT(mb_type)){ |
666 | 5068 s->mv_type= MV_TYPE_FIELD; |
667 | 5069 |
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
|
5070 if(USES_LIST(mb_type, 0)){ |
666 | 5071 s->mv_dir = MV_DIR_FORWARD; |
2967 | 5072 |
666 | 5073 for(i=0; i<2; i++){ |
5074 mx = h263_decode_motion(s, s->last_mv[0][i][0] , s->f_code); | |
5075 my = h263_decode_motion(s, s->last_mv[0][i][1]/2, s->f_code); | |
5076 s->last_mv[0][i][0]= s->mv[0][i][0] = mx; | |
5077 s->last_mv[0][i][1]= (s->mv[0][i][1] = my)*2; | |
5078 } | |
667 | 5079 } |
2967 | 5080 |
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
|
5081 if(USES_LIST(mb_type, 1)){ |
666 | 5082 s->mv_dir |= MV_DIR_BACKWARD; |
5083 | |
5084 for(i=0; i<2; i++){ | |
5085 mx = h263_decode_motion(s, s->last_mv[1][i][0] , s->b_code); | |
5086 my = h263_decode_motion(s, s->last_mv[1][i][1]/2, s->b_code); | |
5087 s->last_mv[1][i][0]= s->mv[1][i][0] = mx; | |
5088 s->last_mv[1][i][1]= (s->mv[1][i][1] = my)*2; | |
664 | 5089 } |
5090 } | |
5091 } | |
5092 } | |
2967 | 5093 |
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
|
5094 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
|
5095 if(IS_SKIP(mb_type)) |
666 | 5096 mx=my=0; |
5097 else{ | |
5098 mx = h263_decode_motion(s, 0, 1); | |
5099 my = h263_decode_motion(s, 0, 1); | |
5100 } | |
2967 | 5101 |
262 | 5102 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
|
5103 mb_type |= ff_mpeg4_set_direct_mv(s, mx, my); |
664 | 5104 } |
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
|
5105 s->current_picture.mb_type[xy]= mb_type; |
262 | 5106 } else { /* I-Frame */ |
1482 | 5107 do{ |
5108 cbpc = get_vlc2(&s->gb, intra_MCBPC_vlc.table, INTRA_MCBPC_VLC_BITS, 2); | |
5109 if (cbpc < 0){ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
5110 av_log(s->avctx, AV_LOG_ERROR, "I cbpc damaged at %d %d\n", s->mb_x, s->mb_y); |
1482 | 5111 return -1; |
5112 } | |
5113 }while(cbpc == 8); | |
5114 | |
262 | 5115 dquant = cbpc & 4; |
5116 s->mb_intra = 1; | |
5117 intra: | |
1649
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
5118 s->ac_pred = get_bits1(&s->gb); |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
5119 if(s->ac_pred) |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
5120 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
|
5121 else |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
5122 s->current_picture.mb_type[xy]= MB_TYPE_INTRA; |
2967 | 5123 |
544 | 5124 cbpy = get_vlc2(&s->gb, cbpy_vlc.table, CBPY_VLC_BITS, 1); |
1482 | 5125 if(cbpy<0){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
5126 av_log(s->avctx, AV_LOG_ERROR, "I cbpy damaged at %d %d\n", s->mb_x, s->mb_y); |
1482 | 5127 return -1; |
5128 } | |
0 | 5129 cbp = (cbpc & 3) | (cbpy << 2); |
3282 | 5130 |
5131 s->use_intra_dc_vlc= s->qscale < s->intra_dc_threshold; | |
5132 | |
0 | 5133 if (dquant) { |
1652 | 5134 ff_set_qscale(s, s->qscale + quant_tab[get_bits(&s->gb, 2)]); |
0 | 5135 } |
2967 | 5136 |
619
2be2cc8fd0a1
mpeg4 interlaced decoding support (not completly implemented/tested due to lack of samples)
michaelni
parents:
617
diff
changeset
|
5137 if(!s->progressive_sequence) |
2be2cc8fd0a1
mpeg4 interlaced decoding support (not completly implemented/tested due to lack of samples)
michaelni
parents:
617
diff
changeset
|
5138 s->interlaced_dct= get_bits1(&s->gb); |
575 | 5139 |
2632 | 5140 s->dsp.clear_blocks(s->block[0]); |
575 | 5141 /* decode each block */ |
1649
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
5142 for (i = 0; i < 6; i++) { |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
5143 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
|
5144 return -1; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
5145 cbp+=cbp; |
575 | 5146 } |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
5147 goto end; |
0 | 5148 } |
5149 | |
5150 /* decode each block */ | |
1649
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
5151 for (i = 0; i < 6; i++) { |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
5152 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
|
5153 return -1; |
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
5154 cbp+=cbp; |
0 | 5155 } |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
5156 end: |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
5157 |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
5158 /* per-MB end of slice check */ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
5159 if(s->codec_id==CODEC_ID_MPEG4){ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
5160 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
|
5161 const int delta= s->mb_x + 1 == s->mb_width ? 2 : 1; |
6481 | 5162 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
|
5163 return SLICE_OK; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
5164 return SLICE_END; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
5165 } |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
5166 } |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
5167 |
2967 | 5168 return SLICE_OK; |
0 | 5169 } |
5170 | |
5171 /* most is hardcoded. should extend to handle all h263 streams */ | |
5172 int h263_decode_picture_header(MpegEncContext *s) | |
5173 { | |
1278
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1273
diff
changeset
|
5174 int format, width, height, i; |
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1273
diff
changeset
|
5175 uint32_t startcode; |
2967 | 5176 |
1278
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1273
diff
changeset
|
5177 align_get_bits(&s->gb); |
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1273
diff
changeset
|
5178 |
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1273
diff
changeset
|
5179 startcode= get_bits(&s->gb, 22-8); |
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1273
diff
changeset
|
5180 |
10535
95f3daa991a2
Use get_bits_left() instead of size_in_bits - get_bits_count().
rbultje
parents:
9999
diff
changeset
|
5181 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
|
5182 startcode = ((startcode << 8) | get_bits(&s->gb, 8)) & 0x003FFFFF; |
2967 | 5183 |
1278
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1273
diff
changeset
|
5184 if(startcode == 0x20) |
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1273
diff
changeset
|
5185 break; |
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1273
diff
changeset
|
5186 } |
2967 | 5187 |
1278
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1273
diff
changeset
|
5188 if (startcode != 0x20) { |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
5189 av_log(s->avctx, AV_LOG_ERROR, "Bad picture start code\n"); |
0 | 5190 return -1; |
355 | 5191 } |
5192 /* temporal reference */ | |
1865 | 5193 i = get_bits(&s->gb, 8); /* picture timestamp */ |
5194 if( (s->picture_number&~0xFF)+i < s->picture_number) | |
5195 i+= 256; | |
2886 | 5196 s->current_picture_ptr->pts= |
1865 | 5197 s->picture_number= (s->picture_number&~0xFF) + i; |
355 | 5198 |
2967 | 5199 /* PTYPE starts here */ |
355 | 5200 if (get_bits1(&s->gb) != 1) { |
5201 /* marker */ | |
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, "Bad marker\n"); |
355 | 5203 return -1; |
5204 } | |
5205 if (get_bits1(&s->gb) != 0) { | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
5206 av_log(s->avctx, AV_LOG_ERROR, "Bad H263 id\n"); |
2979 | 5207 return -1; /* h263 id */ |
5208 } | |
5209 skip_bits1(&s->gb); /* split screen off */ | |
5210 skip_bits1(&s->gb); /* camera off */ | |
5211 skip_bits1(&s->gb); /* freeze picture release off */ | |
0 | 5212 |
5213 format = get_bits(&s->gb, 3); | |
355 | 5214 /* |
5215 0 forbidden | |
5216 1 sub-QCIF | |
5217 10 QCIF | |
2979 | 5218 7 extended PTYPE (PLUSPTYPE) |
355 | 5219 */ |
0 | 5220 |
161 | 5221 if (format != 7 && format != 6) { |
0 | 5222 s->h263_plus = 0; |
5223 /* H.263v1 */ | |
5224 width = h263_format[format][0]; | |
5225 height = h263_format[format][1]; | |
5226 if (!width) | |
5227 return -1; | |
2967 | 5228 |
6481 | 5229 s->pict_type = FF_I_TYPE + get_bits1(&s->gb); |
0 | 5230 |
2967 | 5231 s->h263_long_vectors = get_bits1(&s->gb); |
0 | 5232 |
355 | 5233 if (get_bits1(&s->gb) != 0) { |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
5234 av_log(s->avctx, AV_LOG_ERROR, "H263 SAC not supported\n"); |
2979 | 5235 return -1; /* SAC: off */ |
355 | 5236 } |
1633 | 5237 s->obmc= get_bits1(&s->gb); /* Advanced prediction mode */ |
5238 s->unrestricted_mv = s->h263_long_vectors || s->obmc; | |
2967 | 5239 |
9104 | 5240 s->pb_frame = get_bits1(&s->gb); |
1644 | 5241 s->chroma_qscale= s->qscale = get_bits(&s->gb, 5); |
2979 | 5242 skip_bits1(&s->gb); /* Continuous Presence Multipoint mode: off */ |
1393 | 5243 |
5244 s->width = width; | |
5245 s->height = height; | |
1865 | 5246 s->avctx->sample_aspect_ratio= (AVRational){12,11}; |
2637 | 5247 s->avctx->time_base= (AVRational){1001, 30000}; |
0 | 5248 } else { |
161 | 5249 int ufep; |
2967 | 5250 |
0 | 5251 /* H.263v2 */ |
161 | 5252 s->h263_plus = 1; |
5253 ufep = get_bits(&s->gb, 3); /* Update Full Extended PTYPE */ | |
355 | 5254 |
2967 | 5255 /* ufep other than 0 and 1 are reserved */ |
161 | 5256 if (ufep == 1) { |
2967 | 5257 /* OPPTYPE */ |
161 | 5258 format = get_bits(&s->gb, 3); |
4652 | 5259 dprintf(s->avctx, "ufep=1, format: %d\n", format); |
1872 | 5260 s->custom_pcf= get_bits1(&s->gb); |
5513 | 5261 s->umvplus = get_bits1(&s->gb); /* Unrestricted Motion Vector */ |
1644 | 5262 if (get_bits1(&s->gb) != 0) { |
5263 av_log(s->avctx, AV_LOG_ERROR, "Syntax-based Arithmetic Coding (SAC) not supported\n"); | |
5264 } | |
1633 | 5265 s->obmc= get_bits1(&s->gb); /* Advanced prediction mode */ |
5266 s->h263_aic = get_bits1(&s->gb); /* Advanced Intra Coding (AIC) */ | |
1644 | 5267 s->loop_filter= get_bits1(&s->gb); |
5268 s->unrestricted_mv = s->umvplus || s->obmc || s->loop_filter; | |
2967 | 5269 |
1661 | 5270 s->h263_slice_structured= get_bits1(&s->gb); |
1278
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1273
diff
changeset
|
5271 if (get_bits1(&s->gb) != 0) { |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
5272 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
|
5273 } |
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1273
diff
changeset
|
5274 if (get_bits1(&s->gb) != 0) { |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
5275 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
|
5276 } |
1637 | 5277 s->alt_inter_vlc= get_bits1(&s->gb); |
1639 | 5278 s->modified_quant= get_bits1(&s->gb); |
1644 | 5279 if(s->modified_quant) |
5280 s->chroma_qscale_table= ff_h263_chroma_qscale_table; | |
2967 | 5281 |
1278
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1273
diff
changeset
|
5282 skip_bits(&s->gb, 1); /* Prevent start code emulation */ |
355 | 5283 |
161 | 5284 skip_bits(&s->gb, 3); /* Reserved */ |
355 | 5285 } else if (ufep != 0) { |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
5286 av_log(s->avctx, AV_LOG_ERROR, "Bad UFEP type (%d)\n", ufep); |
0 | 5287 return -1; |
355 | 5288 } |
2967 | 5289 |
78 | 5290 /* MPPTYPE */ |
1655 | 5291 s->pict_type = get_bits(&s->gb, 3); |
5292 switch(s->pict_type){ | |
6481 | 5293 case 0: s->pict_type= FF_I_TYPE;break; |
5294 case 1: s->pict_type= FF_P_TYPE;break; | |
9104 | 5295 case 2: s->pict_type= FF_P_TYPE;s->pb_frame = 3;break; |
6481 | 5296 case 3: s->pict_type= FF_B_TYPE;break; |
5297 case 7: s->pict_type= FF_I_TYPE;break; //ZYGO | |
1655 | 5298 default: |
0 | 5299 return -1; |
1655 | 5300 } |
250
3449316664b5
- Bug fix on RTYPE (rounding type) not being honoured by H.263+ decoder.
pulento
parents:
249
diff
changeset
|
5301 skip_bits(&s->gb, 2); |
3449316664b5
- Bug fix on RTYPE (rounding type) not being honoured by H.263+ decoder.
pulento
parents:
249
diff
changeset
|
5302 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
|
5303 skip_bits(&s->gb, 4); |
2967 | 5304 |
78 | 5305 /* Get the picture dimensions */ |
161 | 5306 if (ufep) { |
5307 if (format == 6) { | |
5308 /* Custom Picture Format (CPFMT) */ | |
355 | 5309 s->aspect_ratio_info = get_bits(&s->gb, 4); |
4652 | 5310 dprintf(s->avctx, "aspect: %d\n", s->aspect_ratio_info); |
355 | 5311 /* aspect ratios: |
5312 0 - forbidden | |
5313 1 - 1:1 | |
5314 2 - 12:11 (CIF 4:3) | |
5315 3 - 10:11 (525-type 4:3) | |
5316 4 - 16:11 (CIF 16:9) | |
5317 5 - 40:33 (525-type 16:9) | |
5318 6-14 - reserved | |
5319 */ | |
161 | 5320 width = (get_bits(&s->gb, 9) + 1) * 4; |
5321 skip_bits1(&s->gb); | |
5322 height = get_bits(&s->gb, 9) * 4; | |
4652 | 5323 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
|
5324 if (s->aspect_ratio_info == FF_ASPECT_EXTENDED) { |
355 | 5325 /* aspected dimensions */ |
1548 | 5326 s->avctx->sample_aspect_ratio.num= get_bits(&s->gb, 8); |
5327 s->avctx->sample_aspect_ratio.den= get_bits(&s->gb, 8); | |
887 | 5328 }else{ |
1548 | 5329 s->avctx->sample_aspect_ratio= pixel_aspect[s->aspect_ratio_info]; |
355 | 5330 } |
5331 } else { | |
161 | 5332 width = h263_format[format][0]; |
5333 height = h263_format[format][1]; | |
1865 | 5334 s->avctx->sample_aspect_ratio= (AVRational){12,11}; |
161 | 5335 } |
5336 if ((width == 0) || (height == 0)) | |
5337 return -1; | |
5338 s->width = width; | |
5339 s->height = height; | |
1872 | 5340 |
5341 if(s->custom_pcf){ | |
5342 int gcd; | |
2637 | 5343 s->avctx->time_base.den= 1800000; |
5344 s->avctx->time_base.num= 1000 + get_bits1(&s->gb); | |
5345 s->avctx->time_base.num*= get_bits(&s->gb, 7); | |
5346 if(s->avctx->time_base.num == 0){ | |
1872 | 5347 av_log(s, AV_LOG_ERROR, "zero framerate\n"); |
5348 return -1; | |
5349 } | |
8611 | 5350 gcd= av_gcd(s->avctx->time_base.den, s->avctx->time_base.num); |
2637 | 5351 s->avctx->time_base.den /= gcd; |
5352 s->avctx->time_base.num /= gcd; | |
1872 | 5353 }else{ |
2637 | 5354 s->avctx->time_base= (AVRational){1001, 30000}; |
1872 | 5355 } |
5356 } | |
2967 | 5357 |
1872 | 5358 if(s->custom_pcf){ |
5359 skip_bits(&s->gb, 2); //extended Temporal reference | |
5360 } | |
5361 | |
5362 if (ufep) { | |
1089 | 5363 if (s->umvplus) { |
5364 if(get_bits1(&s->gb)==0) /* Unlimited Unrestricted Motion Vectors Indicator (UUI) */ | |
2967 | 5365 skip_bits1(&s->gb); |
161 | 5366 } |
1661 | 5367 if(s->h263_slice_structured){ |
5368 if (get_bits1(&s->gb) != 0) { | |
5369 av_log(s->avctx, AV_LOG_ERROR, "rectangular slices not supported\n"); | |
5370 } | |
5371 if (get_bits1(&s->gb) != 0) { | |
5372 av_log(s->avctx, AV_LOG_ERROR, "unordered slices not supported\n"); | |
5373 } | |
5374 } | |
78 | 5375 } |
2967 | 5376 |
0 | 5377 s->qscale = get_bits(&s->gb, 5); |
5378 } | |
1670 | 5379 |
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
|
5380 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
|
5381 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
|
5382 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
|
5383 |
9104 | 5384 if (s->pb_frame) { |
5385 skip_bits(&s->gb, 3); /* Temporal reference for B-pictures */ | |
5386 if (s->custom_pcf) | |
5387 skip_bits(&s->gb, 2); //extended Temporal reference | |
5388 skip_bits(&s->gb, 2); /* Quantization information for B-pictures */ | |
5389 } | |
5390 | |
0 | 5391 /* PEI */ |
21 | 5392 while (get_bits1(&s->gb) != 0) { |
5393 skip_bits(&s->gb, 8); | |
0 | 5394 } |
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
|
5395 |
1670 | 5396 if(s->h263_slice_structured){ |
5397 if (get_bits1(&s->gb) != 1) { | |
5398 av_log(s->avctx, AV_LOG_ERROR, "SEPB1 marker missing\n"); | |
5399 return -1; | |
5400 } | |
5401 | |
5402 ff_h263_decode_mba(s); | |
5403 | |
5404 if (get_bits1(&s->gb) != 1) { | |
5405 av_log(s->avctx, AV_LOG_ERROR, "SEPB2 marker missing\n"); | |
5406 return -1; | |
5407 } | |
5408 } | |
0 | 5409 s->f_code = 1; |
2967 | 5410 |
498 | 5411 if(s->h263_aic){ |
2967 | 5412 s->y_dc_scale_table= |
1639 | 5413 s->c_dc_scale_table= ff_aic_dc_scale_table; |
498 | 5414 }else{ |
5415 s->y_dc_scale_table= | |
5416 s->c_dc_scale_table= ff_mpeg1_dc_scale_table; | |
5417 } | |
5418 | |
1278
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1273
diff
changeset
|
5419 if(s->avctx->debug&FF_DEBUG_PICT_INFO){ |
5403 | 5420 show_pict_info(s); |
1278
483db104bb7b
truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents:
1273
diff
changeset
|
5421 } |
8612 | 5422 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
|
5423 int i,j; |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
5424 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
|
5425 av_log(s->avctx, AV_LOG_DEBUG, "\n"); |
1584
3615999a7284
dumping funny numbers from first zygo i frame header
michael
parents:
1583
diff
changeset
|
5426 for(i=0; i<13; i++){ |
3615999a7284
dumping funny numbers from first zygo i frame header
michael
parents:
1583
diff
changeset
|
5427 for(j=0; j<3; j++){ |
3615999a7284
dumping funny numbers from first zygo i frame header
michael
parents:
1583
diff
changeset
|
5428 int v= get_bits(&s->gb, 8); |
3615999a7284
dumping funny numbers from first zygo i frame header
michael
parents:
1583
diff
changeset
|
5429 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
|
5430 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
|
5431 } |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
5432 av_log(s->avctx, AV_LOG_DEBUG, "\n"); |
1584
3615999a7284
dumping funny numbers from first zygo i frame header
michael
parents:
1583
diff
changeset
|
5433 } |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
5434 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
|
5435 } |
3615999a7284
dumping funny numbers from first zygo i frame header
michael
parents:
1583
diff
changeset
|
5436 |
0 | 5437 return 0; |
5438 } | |
5439 | |
942 | 5440 static int mpeg4_decode_gop_header(MpegEncContext * s, GetBitContext *gb){ |
5441 int hours, minutes, seconds; | |
5442 | |
5443 hours= get_bits(gb, 5); | |
5444 minutes= get_bits(gb, 6); | |
5445 skip_bits1(gb); | |
5446 seconds= get_bits(gb, 6); | |
5447 | |
5448 s->time_base= seconds + 60*(minutes + 60*hours); | |
5449 | |
5450 skip_bits1(gb); | |
5451 skip_bits1(gb); | |
2967 | 5452 |
942 | 5453 return 0; |
5454 } | |
5455 | |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5456 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
|
5457 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
|
5458 |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5459 /* vol header */ |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5460 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
|
5461 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
|
5462 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
|
5463 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
|
5464 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
|
5465 } else { |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5466 vo_ver_id = 1; |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5467 } |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5468 s->aspect_ratio_info= get_bits(gb, 4); |
2967 | 5469 if(s->aspect_ratio_info == FF_ASPECT_EXTENDED){ |
1548 | 5470 s->avctx->sample_aspect_ratio.num= get_bits(gb, 8); // par_width |
5471 s->avctx->sample_aspect_ratio.den= get_bits(gb, 8); // par_height | |
887 | 5472 }else{ |
1548 | 5473 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
|
5474 } |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5475 |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5476 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
|
5477 int chroma_format= get_bits(gb, 2); |
8690 | 5478 if(chroma_format!=CHROMA_420){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
5479 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
|
5480 } |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5481 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
|
5482 if(get_bits1(gb)){ /* vbv parameters */ |
2979 | 5483 get_bits(gb, 15); /* first_half_bitrate */ |
5484 skip_bits1(gb); /* marker */ | |
5485 get_bits(gb, 15); /* latter_half_bitrate */ | |
5486 skip_bits1(gb); /* marker */ | |
5487 get_bits(gb, 15); /* first_half_vbv_buffer_size */ | |
5488 skip_bits1(gb); /* marker */ | |
5489 get_bits(gb, 3); /* latter_half_vbv_buffer_size */ | |
5490 get_bits(gb, 11); /* first_half_vbv_occupancy */ | |
5491 skip_bits1(gb); /* marker */ | |
5492 get_bits(gb, 15); /* latter_half_vbv_occupancy */ | |
5493 skip_bits1(gb); /* marker */ | |
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 }else{ |
2646
c735e3e60ca7
Even More spelling errors. patch by (Kevin Baragona <kevinmb500 gawab com)
michael
parents:
2639
diff
changeset
|
5496 // 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
|
5497 if(s->picture_number==0) |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5498 s->low_delay=0; |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5499 } |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5500 |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5501 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
|
5502 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
|
5503 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
|
5504 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
|
5505 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
|
5506 } |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5507 |
1411 | 5508 check_marker(gb, "before time_increment_resolution"); |
2967 | 5509 |
2637 | 5510 s->avctx->time_base.den = get_bits(gb, 16); |
2812 | 5511 if(!s->avctx->time_base.den){ |
5512 av_log(s->avctx, AV_LOG_ERROR, "time_base.den==0\n"); | |
5513 return -1; | |
5514 } | |
2967 | 5515 |
2637 | 5516 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
|
5517 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
|
5518 s->time_increment_bits = 1; |
2967 | 5519 |
1411 | 5520 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
|
5521 |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5522 if (get_bits1(gb) != 0) { /* fixed_vop_rate */ |
2637 | 5523 s->avctx->time_base.num = get_bits(gb, s->time_increment_bits); |
5524 }else | |
5525 s->avctx->time_base.num = 1; | |
5526 | |
2034 | 5527 s->t_frame=0; |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5528 |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5529 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
|
5530 if (s->shape == RECT_SHAPE) { |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5531 skip_bits1(gb); /* marker */ |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5532 width = get_bits(gb, 13); |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5533 skip_bits1(gb); /* marker */ |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5534 height = get_bits(gb, 13); |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5535 skip_bits1(gb); /* marker */ |
8612 | 5536 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
|
5537 s->width = width; |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5538 s->height = height; |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5539 } |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5540 } |
2967 | 5541 |
5542 s->progressive_sequence= | |
1659 | 5543 s->progressive_frame= get_bits1(gb)^1; |
3192 | 5544 s->interlaced_dct=0; |
2967 | 5545 if(!get_bits1(gb) && (s->avctx->debug & FF_DEBUG_PICT_INFO)) |
1644 | 5546 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
|
5547 if (vo_ver_id == 1) { |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5548 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
|
5549 } else { |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5550 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
|
5551 } |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
5552 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
|
5553 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
|
5554 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
|
5555 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
|
5556 skip_bits1(gb); /* marker */ |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5557 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
|
5558 skip_bits1(gb); /* marker */ |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5559 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
|
5560 skip_bits1(gb); /* marker */ |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5561 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
|
5562 skip_bits1(gb); /* marker */ |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5563 } |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5564 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
|
5565 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
|
5566 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
|
5567 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
|
5568 return -1; |
655d25351bfc
fix possibly exploitable stack overflow with num_sprite_warping_points (found by reimar)
michael
parents:
4672
diff
changeset
|
5569 } |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5570 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
|
5571 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
|
5572 if(s->vol_sprite_usage==STATIC_SPRITE) |
2967 | 5573 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
|
5574 } |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5575 // FIXME sadct disable bit if verid!=1 && shape not rect |
2967 | 5576 |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5577 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
|
5578 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
|
5579 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
|
5580 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
|
5581 } else { |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5582 s->quant_precision = 5; |
0 | 5583 } |
2967 | 5584 |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5585 // 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
|
5586 |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5587 if((s->mpeg_quant=get_bits1(gb))){ /* vol_quant_type */ |
1057 | 5588 int i, v; |
2967 | 5589 |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5590 /* load default matrixes */ |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5591 for(i=0; i<64; i++){ |
1092 | 5592 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
|
5593 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
|
5594 s->intra_matrix[j]= v; |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5595 s->chroma_intra_matrix[j]= v; |
2967 | 5596 |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5597 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
|
5598 s->inter_matrix[j]= v; |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5599 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
|
5600 } |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5601 |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5602 /* load custom intra matrix */ |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5603 if(get_bits1(gb)){ |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5604 int last=0; |
2979 | 5605 for(i=0; i<64; i++){ |
1057 | 5606 int j; |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5607 v= get_bits(gb, 8); |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5608 if(v==0) break; |
2967 | 5609 |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5610 last= v; |
1092 | 5611 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
|
5612 s->intra_matrix[j]= v; |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5613 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
|
5614 } |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5615 |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5616 /* replicate last value */ |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5617 for(; i<64; i++){ |
2979 | 5618 int j= s->dsp.idct_permutation[ ff_zigzag_direct[i] ]; |
1411 | 5619 s->intra_matrix[j]= last; |
5620 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
|
5621 } |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5622 } |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5623 |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5624 /* load custom non intra matrix */ |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5625 if(get_bits1(gb)){ |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5626 int last=0; |
2979 | 5627 for(i=0; i<64; i++){ |
1057 | 5628 int j; |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5629 v= get_bits(gb, 8); |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5630 if(v==0) break; |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5631 |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5632 last= v; |
1092 | 5633 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
|
5634 s->inter_matrix[j]= v; |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5635 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
|
5636 } |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5637 |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5638 /* replicate last value */ |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5639 for(; i<64; i++){ |
2979 | 5640 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
|
5641 s->inter_matrix[j]= last; |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5642 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
|
5643 } |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5644 } |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5645 |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5646 // 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
|
5647 } |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5648 |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5649 if(vo_ver_id != 1) |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5650 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
|
5651 else s->quarter_sample=0; |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5652 |
8251
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5653 if(!get_bits1(gb)){ |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5654 int pos= get_bits_count(gb); |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5655 int estimation_method= get_bits(gb, 2); |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5656 if(estimation_method<2){ |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5657 if(!get_bits1(gb)){ |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5658 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
|
5659 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
|
5660 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
|
5661 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
|
5662 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
|
5663 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
|
5664 } |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5665 if(!get_bits1(gb)){ |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5666 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
|
5667 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
|
5668 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
|
5669 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
|
5670 } |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5671 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
|
5672 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
|
5673 goto no_cplx_est; |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5674 } |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5675 if(!get_bits1(gb)){ |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5676 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
|
5677 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
|
5678 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
|
5679 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
|
5680 } |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5681 if(!get_bits1(gb)){ |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5682 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
|
5683 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
|
5684 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
|
5685 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
|
5686 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
|
5687 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
|
5688 } |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5689 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
|
5690 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
|
5691 goto no_cplx_est; |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5692 } |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5693 if(estimation_method==1){ |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5694 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
|
5695 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
|
5696 } |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5697 }else |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5698 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
|
5699 }else{ |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5700 no_cplx_est: |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5701 s->cplx_estimation_trash_i= |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5702 s->cplx_estimation_trash_p= |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5703 s->cplx_estimation_trash_b= 0; |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5704 } |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5705 |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5706 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
|
5707 |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5708 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
|
5709 if(s->data_partitioning){ |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5710 s->rvlc= get_bits1(gb); |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5711 } |
2967 | 5712 |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5713 if(vo_ver_id != 1) { |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5714 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
|
5715 if(s->new_pred){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
5716 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
|
5717 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
|
5718 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
|
5719 } |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5720 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
|
5721 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
|
5722 } |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5723 else{ |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5724 s->new_pred=0; |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5725 s->reduced_res_vop= 0; |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5726 } |
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 s->scalability= get_bits1(gb); |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5729 |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5730 if (s->scalability) { |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5731 GetBitContext bak= *gb; |
751 | 5732 int ref_layer_id; |
5733 int ref_layer_sampling_dir; | |
5734 int h_sampling_factor_n; | |
5735 int h_sampling_factor_m; | |
5736 int v_sampling_factor_n; | |
5737 int v_sampling_factor_m; | |
2967 | 5738 |
751 | 5739 s->hierachy_type= get_bits1(gb); |
5740 ref_layer_id= get_bits(gb, 4); | |
5741 ref_layer_sampling_dir= get_bits1(gb); | |
5742 h_sampling_factor_n= get_bits(gb, 5); | |
5743 h_sampling_factor_m= get_bits(gb, 5); | |
5744 v_sampling_factor_n= get_bits(gb, 5); | |
5745 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
|
5746 s->enhancement_type= get_bits1(gb); |
2967 | 5747 |
5748 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
|
5749 || v_sampling_factor_n==0 || v_sampling_factor_m==0){ |
2967 | 5750 |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5751 s->scalability=0; |
2967 | 5752 |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5753 *gb= bak; |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5754 }else |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
5755 av_log(s->avctx, AV_LOG_ERROR, "scalability not supported\n"); |
2967 | 5756 |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5757 // bin shape stuff FIXME |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5758 } |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5759 } |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5760 return 0; |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5761 } |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5762 |
1034 | 5763 /** |
5764 * decodes the user data stuff in the header. | |
6918 | 5765 * Also initializes divx/xvid/lavc_version/build. |
1034 | 5766 */ |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5767 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
|
5768 char buf[256]; |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5769 int i; |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5770 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
|
5771 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
|
5772 char last; |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5773 |
3615 | 5774 for(i=0; i<255 && get_bits_count(gb) < gb->size_in_bits; i++){ |
2804 | 5775 if(show_bits(gb, 23) == 0) break; |
5776 buf[i]= get_bits(gb, 8); | |
5777 } | |
5778 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
|
5779 |
761 | 5780 /* 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
|
5781 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
|
5782 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
|
5783 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
|
5784 if(e>=2){ |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5785 s->divx_version= ver; |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5786 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
|
5787 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
|
5788 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
|
5789 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
|
5790 s->showed_packed_warning=1; |
2f5101a67500
Only warn about "Invalid and inefficient vfw-avi packed B frames" once.
andoma
parents:
8042
diff
changeset
|
5791 } |
0 | 5792 } |
2967 | 5793 |
761 | 5794 /* ffmpeg detection */ |
2805
55a6659fc2ee
fix user data parsing code so it suppors pre1 and cvs
michael
parents:
2804
diff
changeset
|
5795 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
|
5796 if(e!=4) |
2967 | 5797 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
|
5798 if(e!=4){ |
2814 | 5799 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
|
5800 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
|
5801 build= (ver<<16) + (ver2<<8) + ver3; |
2814 | 5802 } |
5803 if(e!=4){ | |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5804 if(strcmp(buf, "ffmpeg")==0){ |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5805 s->lavc_build= 4600; |
63 | 5806 } |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5807 } |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5808 if(e==4){ |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5809 s->lavc_build= build; |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5810 } |
2967 | 5811 |
6908 | 5812 /* Xvid detection */ |
761 | 5813 e=sscanf(buf, "XviD%d", &build); |
5814 if(e==1){ | |
5815 s->xvid_build= build; | |
5816 } | |
5817 | |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5818 return 0; |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5819 } |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5820 |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5821 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
|
5822 int time_incr, time_increment; |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5823 |
6481 | 5824 s->pict_type = get_bits(gb, 2) + FF_I_TYPE; /* pict type: I = 0 , P = 1 */ |
5825 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
|
5826 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
|
5827 s->low_delay=0; |
fdeec2834c79
there are divx5? encoded files without a userdata section but with b-frames :(
michaelni
parents:
364
diff
changeset
|
5828 } |
2967 | 5829 |
6481 | 5830 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
|
5831 if(s->partitioned_frame) |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
5832 s->decode_mb= mpeg4_decode_partitioned_mb; |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
718
diff
changeset
|
5833 else |
1649
e6a474a5b929
split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents:
1646
diff
changeset
|
5834 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
|
5835 |
262 | 5836 time_incr=0; |
2967 | 5837 while (get_bits1(gb) != 0) |
0 | 5838 time_incr++; |
5839 | |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5840 check_marker(gb, "before time_increment"); |
2666 | 5841 |
5842 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
|
5843 av_log(s->avctx, AV_LOG_ERROR, "hmm, seems the headers are not complete, trying to guess time_increment_bits\n"); |
1068 | 5844 |
5845 for(s->time_increment_bits=1 ;s->time_increment_bits<16; s->time_increment_bits++){ | |
10664 | 5846 if ( s->pict_type == FF_P_TYPE |
5847 || (s->pict_type == FF_S_TYPE && s->vol_sprite_usage==GMC_SPRITE)) { | |
5848 if((show_bits(gb, s->time_increment_bits+6)&0x37) == 0x30) break; | |
5849 }else | |
5850 if((show_bits(gb, s->time_increment_bits+5)&0x1F) == 0x18) break; | |
1068 | 5851 } |
1396 | 5852 |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
5853 av_log(s->avctx, AV_LOG_ERROR, "my guess is %d bits ;)\n",s->time_increment_bits); |
1068 | 5854 } |
2967 | 5855 |
1411 | 5856 if(IS_3IV1) time_increment= get_bits1(gb); //FIXME investigate further |
5857 else time_increment= get_bits(gb, s->time_increment_bits); | |
2967 | 5858 |
6481 | 5859 if(s->pict_type!=FF_B_TYPE){ |
324 | 5860 s->last_time_base= s->time_base; |
262 | 5861 s->time_base+= time_incr; |
2637 | 5862 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
|
5863 if(s->workaround_bugs&FF_BUG_UMP4){ |
700
0fb4c66527e1
autodetect UMP4 (by adding a fourcc field to AVCodecContext)
michaelni
parents:
699
diff
changeset
|
5864 if(s->time < s->last_non_b_time){ |
0fb4c66527e1
autodetect UMP4 (by adding a fourcc field to AVCodecContext)
michaelni
parents:
699
diff
changeset
|
5865 s->time_base++; |
2637 | 5866 s->time+= s->avctx->time_base.den; |
700
0fb4c66527e1
autodetect UMP4 (by adding a fourcc field to AVCodecContext)
michaelni
parents:
699
diff
changeset
|
5867 } |
664 | 5868 } |
324 | 5869 s->pp_time= s->time - s->last_non_b_time; |
5870 s->last_non_b_time= s->time; | |
262 | 5871 }else{ |
2637 | 5872 s->time= (s->last_time_base + time_incr)*s->avctx->time_base.den + time_increment; |
664 | 5873 s->pb_time= s->pp_time - (s->last_non_b_time - s->time); |
5874 if(s->pp_time <=s->pb_time || s->pp_time <= s->pp_time - s->pb_time || s->pp_time<=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
|
5875 return FRAME_SKIPPED; |
335 | 5876 } |
3247 | 5877 ff_mpeg4_init_direct_mv(s); |
2967 | 5878 |
2034 | 5879 if(s->t_frame==0) s->t_frame= s->pb_time; |
664 | 5880 if(s->t_frame==0) s->t_frame=1; // 1/0 protection |
2967 | 5881 s->pp_field_time= ( ROUNDED_DIV(s->last_non_b_time, s->t_frame) |
664 | 5882 - ROUNDED_DIV(s->last_non_b_time - s->pp_time, s->t_frame))*2; |
2967 | 5883 s->pb_field_time= ( ROUNDED_DIV(s->time, s->t_frame) |
664 | 5884 - ROUNDED_DIV(s->last_non_b_time - s->pp_time, s->t_frame))*2; |
4346 | 5885 if(!s->progressive_sequence){ |
5886 if(s->pp_field_time <= s->pb_field_time || s->pb_field_time <= 1) | |
5887 return FRAME_SKIPPED; | |
5888 } | |
262 | 5889 } |
2967 | 5890 |
2813
6fd9dbb8c385
try to check for nonsense time_base instead of setting fake one
michael
parents:
2812
diff
changeset
|
5891 if(s->avctx->time_base.num) |
6fd9dbb8c385
try to check for nonsense time_base instead of setting fake one
michael
parents:
2812
diff
changeset
|
5892 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
|
5893 else |
6fd9dbb8c385
try to check for nonsense time_base instead of setting fake one
michael
parents:
2812
diff
changeset
|
5894 s->current_picture_ptr->pts= AV_NOPTS_VALUE; |
942 | 5895 if(s->avctx->debug&FF_DEBUG_PTS) |
2962 | 5896 av_log(s->avctx, AV_LOG_DEBUG, "MPEG4 PTS: %"PRId64"\n", s->current_picture_ptr->pts); |
2034 | 5897 |
1068 | 5898 check_marker(gb, "before vop_coded"); |
2967 | 5899 |
0 | 5900 /* vop coded */ |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5901 if (get_bits1(gb) != 1){ |
2271 | 5902 if(s->avctx->debug&FF_DEBUG_PICT_INFO) |
5903 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
|
5904 return FRAME_SKIPPED; |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5905 } |
6481 | 5906 if (s->shape != BIN_ONLY_SHAPE && ( s->pict_type == FF_P_TYPE |
5907 || (s->pict_type == FF_S_TYPE && s->vol_sprite_usage==GMC_SPRITE))) { | |
0 | 5908 /* rounding type for motion estimation */ |
2979 | 5909 s->no_rounding = get_bits1(gb); |
63 | 5910 } else { |
2979 | 5911 s->no_rounding = 0; |
0 | 5912 } |
253
4448dd55d415
parsing more of the mpeg4 header & print some "not supported" stuff
michaelni
parents:
250
diff
changeset
|
5913 //FIXME reduced res stuff |
4448dd55d415
parsing more of the mpeg4 header & print some "not supported" stuff
michaelni
parents:
250
diff
changeset
|
5914 |
4448dd55d415
parsing more of the mpeg4 header & print some "not supported" stuff
michaelni
parents:
250
diff
changeset
|
5915 if (s->shape != RECT_SHAPE) { |
6481 | 5916 if (s->vol_sprite_usage != 1 || s->pict_type != FF_I_TYPE) { |
63 | 5917 int width, height, hor_spat_ref, ver_spat_ref; |
2967 | 5918 |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5919 width = get_bits(gb, 13); |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5920 skip_bits1(gb); /* marker */ |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5921 height = get_bits(gb, 13); |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5922 skip_bits1(gb); /* marker */ |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5923 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
|
5924 skip_bits1(gb); /* marker */ |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5925 ver_spat_ref = get_bits(gb, 13); /* ver_spat_ref */ |
63 | 5926 } |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5927 skip_bits1(gb); /* change_CR_disable */ |
2967 | 5928 |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5929 if (get_bits1(gb) != 0) { |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5930 skip_bits(gb, 8); /* constant_alpha_value */ |
63 | 5931 } |
5932 } | |
253
4448dd55d415
parsing more of the mpeg4 header & print some "not supported" stuff
michaelni
parents:
250
diff
changeset
|
5933 //FIXME complexity estimation stuff |
2967 | 5934 |
253
4448dd55d415
parsing more of the mpeg4 header & print some "not supported" stuff
michaelni
parents:
250
diff
changeset
|
5935 if (s->shape != BIN_ONLY_SHAPE) { |
8251
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5936 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
|
5937 if(s->pict_type != FF_I_TYPE) |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5938 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
|
5939 if(s->pict_type == FF_B_TYPE) |
d256dbf74ea6
Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents:
8106
diff
changeset
|
5940 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
|
5941 |
1520 | 5942 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
|
5943 if(!s->progressive_sequence){ |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
5944 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
|
5945 s->alternate_scan= get_bits1(gb); |
661 | 5946 }else |
5947 s->alternate_scan= 0; | |
253
4448dd55d415
parsing more of the mpeg4 header & print some "not supported" stuff
michaelni
parents:
250
diff
changeset
|
5948 } |
254
b4fed8b24e3a
gmc bitstream decoding support (the real motion compensation isnt implemnted yet)
michaelni
parents:
253
diff
changeset
|
5949 |
718 | 5950 if(s->alternate_scan){ |
1273 | 5951 ff_init_scantable(s->dsp.idct_permutation, &s->inter_scantable , ff_alternate_vertical_scan); |
5952 ff_init_scantable(s->dsp.idct_permutation, &s->intra_scantable , ff_alternate_vertical_scan); | |
5953 ff_init_scantable(s->dsp.idct_permutation, &s->intra_h_scantable, ff_alternate_vertical_scan); | |
5954 ff_init_scantable(s->dsp.idct_permutation, &s->intra_v_scantable, ff_alternate_vertical_scan); | |
718 | 5955 } else{ |
1273 | 5956 ff_init_scantable(s->dsp.idct_permutation, &s->inter_scantable , ff_zigzag_direct); |
5957 ff_init_scantable(s->dsp.idct_permutation, &s->intra_scantable , ff_zigzag_direct); | |
5958 ff_init_scantable(s->dsp.idct_permutation, &s->intra_h_scantable, ff_alternate_horizontal_scan); | |
5959 ff_init_scantable(s->dsp.idct_permutation, &s->intra_v_scantable, ff_alternate_vertical_scan); | |
718 | 5960 } |
2967 | 5961 |
6481 | 5962 if(s->pict_type == FF_S_TYPE && (s->vol_sprite_usage==STATIC_SPRITE || s->vol_sprite_usage==GMC_SPRITE)){ |
1914 | 5963 mpeg4_decode_sprite_trajectory(s, gb); |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
5964 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
|
5965 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
|
5966 } |
254
b4fed8b24e3a
gmc bitstream decoding support (the real motion compensation isnt implemnted yet)
michaelni
parents:
253
diff
changeset
|
5967 |
253
4448dd55d415
parsing more of the mpeg4 header & print some "not supported" stuff
michaelni
parents:
250
diff
changeset
|
5968 if (s->shape != BIN_ONLY_SHAPE) { |
1644 | 5969 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
|
5970 if(s->qscale==0){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
5971 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
|
5972 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
|
5973 } |
2967 | 5974 |
6481 | 5975 if (s->pict_type != FF_I_TYPE) { |
2979 | 5976 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
|
5977 if(s->f_code==0){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
5978 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
|
5979 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
|
5980 } |
582
5132a4ee50cd
different edge positions fixed with edge emu / dr1
michaelni
parents:
575
diff
changeset
|
5981 }else |
5132a4ee50cd
different edge positions fixed with edge emu / dr1
michaelni
parents:
575
diff
changeset
|
5982 s->f_code=1; |
2967 | 5983 |
6481 | 5984 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
|
5985 s->b_code = get_bits(gb, 3); |
582
5132a4ee50cd
different edge positions fixed with edge emu / dr1
michaelni
parents:
575
diff
changeset
|
5986 }else |
5132a4ee50cd
different edge positions fixed with edge emu / dr1
michaelni
parents:
575
diff
changeset
|
5987 s->b_code=1; |
906 | 5988 |
5989 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
|
5990 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 | 5991 s->qscale, s->f_code, s->b_code, |
6481 | 5992 s->pict_type == FF_I_TYPE ? "I" : (s->pict_type == FF_P_TYPE ? "P" : (s->pict_type == FF_B_TYPE ? "B" : "S")), |
2967 | 5993 gb->size_in_bits,s->progressive_sequence, s->alternate_scan, s->top_field_first, |
930 | 5994 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
|
5995 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 | 5996 } |
5997 | |
253
4448dd55d415
parsing more of the mpeg4 header & print some "not supported" stuff
michaelni
parents:
250
diff
changeset
|
5998 if(!s->scalability){ |
6481 | 5999 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
|
6000 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
|
6001 } |
575 | 6002 }else{ |
6003 if(s->enhancement_type){ | |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
6004 int load_backward_shape= get_bits1(gb); |
575 | 6005 if(load_backward_shape){ |
2646
c735e3e60ca7
Even More spelling errors. patch by (Kevin Baragona <kevinmb500 gawab com)
michael
parents:
2639
diff
changeset
|
6006 av_log(s->avctx, AV_LOG_ERROR, "load backward shape isn't supported\n"); |
575 | 6007 } |
6008 } | |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
6009 skip_bits(gb, 2); //ref_select_code |
63 | 6010 } |
6011 } | |
2646
c735e3e60ca7
Even More spelling errors. patch by (Kevin Baragona <kevinmb500 gawab com)
michael
parents:
2639
diff
changeset
|
6012 /* 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
|
6013 // 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
|
6014 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
|
6015 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
|
6016 s->low_delay=1; |
c2f789fe4945
detecting xvid/divx4/opendivx and set low_delay flag
michaelni
parents:
344
diff
changeset
|
6017 } |
c2f789fe4945
detecting xvid/divx4/opendivx and set low_delay flag
michaelni
parents:
344
diff
changeset
|
6018 |
2646
c735e3e60ca7
Even More spelling errors. patch by (Kevin Baragona <kevinmb500 gawab com)
michael
parents:
2639
diff
changeset
|
6019 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
|
6020 |
2967 | 6021 s->y_dc_scale_table= ff_mpeg4_y_dc_scale_table; //FIXME add short header support |
498 | 6022 s->c_dc_scale_table= ff_mpeg4_c_dc_scale_table; |
6023 | |
1366
80067f8d6770
fix edge repeating bug for %16!=0 files, this fixes Quicktime mpeg4 (they arent buggy)
michaelni
parents:
1364
diff
changeset
|
6024 if(s->workaround_bugs&FF_BUG_EDGE){ |
582
5132a4ee50cd
different edge positions fixed with edge emu / dr1
michaelni
parents:
575
diff
changeset
|
6025 s->h_edge_pos= s->width; |
5132a4ee50cd
different edge positions fixed with edge emu / dr1
michaelni
parents:
575
diff
changeset
|
6026 s->v_edge_pos= s->height; |
5132a4ee50cd
different edge positions fixed with edge emu / dr1
michaelni
parents:
575
diff
changeset
|
6027 } |
63 | 6028 return 0; |
0 | 6029 } |
6030 | |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
6031 /** |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
6032 * decode mpeg4 headers |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
6033 * @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
|
6034 * 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
|
6035 * 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
|
6036 */ |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
6037 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
|
6038 { |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
6039 int startcode, v; |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
6040 |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
6041 /* search next start code */ |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
6042 align_get_bits(gb); |
2406 | 6043 |
8612 | 6044 if(s->codec_tag == AV_RL32("WV1F") && show_bits(gb, 24) == 0x575630){ |
2406 | 6045 skip_bits(gb, 24); |
6046 if(get_bits(gb, 8) == 0xF0) | |
8417
ad4f10287633
Move CODEC_FLAG_LOW_DELAY into ff_mpeg4_decode_picture_header().
michael
parents:
8297
diff
changeset
|
6047 goto end; |
2406 | 6048 } |
6049 | |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
6050 startcode = 0xff; |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
6051 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
|
6052 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
|
6053 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
|
6054 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
|
6055 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
|
6056 }else |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
6057 return -1; //end of stream |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
6058 } |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
6059 |
2966
564788471dd4
bitstream related fixes from [PATCH] from DivX, Part 9: bitstream crashes by (Steve Lhomme | slhomme divxcorp com)
michael
parents:
2962
diff
changeset
|
6060 /* 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
|
6061 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
|
6062 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
|
6063 |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
6064 if((startcode&0xFFFFFF00) != 0x100) |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
6065 continue; //no startcode |
2967 | 6066 |
942 | 6067 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
|
6068 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
|
6069 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
|
6070 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
|
6071 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
|
6072 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
|
6073 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
|
6074 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
|
6075 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
|
6076 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
|
6077 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
|
6078 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
|
6079 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
|
6080 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
|
6081 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
|
6082 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
|
6083 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
|
6084 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
|
6085 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
|
6086 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
|
6087 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
|
6088 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
|
6089 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
|
6090 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
|
6091 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
|
6092 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
|
6093 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
|
6094 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
|
6095 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
|
6096 av_log(s->avctx, AV_LOG_DEBUG, " at %d\n", get_bits_count(gb)); |
942 | 6097 } |
6098 | |
1512 | 6099 if(startcode >= 0x120 && startcode <= 0x12F){ |
2967 | 6100 if(decode_vol_header(s, gb) < 0) |
1396 | 6101 return -1; |
1512 | 6102 } |
6103 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
|
6104 decode_user_data(s, gb); |
1512 | 6105 } |
6106 else if(startcode == GOP_STARTCODE){ | |
942 | 6107 mpeg4_decode_gop_header(s, gb); |
1512 | 6108 } |
6109 else if(startcode == VOP_STARTCODE){ | |
8417
ad4f10287633
Move CODEC_FLAG_LOW_DELAY into ff_mpeg4_decode_picture_header().
michael
parents:
8297
diff
changeset
|
6110 break; |
747
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
6111 } |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
6112 |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
6113 align_get_bits(gb); |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
6114 startcode = 0xff; |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
6115 } |
8417
ad4f10287633
Move CODEC_FLAG_LOW_DELAY into ff_mpeg4_decode_picture_header().
michael
parents:
8297
diff
changeset
|
6116 end: |
ad4f10287633
Move CODEC_FLAG_LOW_DELAY into ff_mpeg4_decode_picture_header().
michael
parents:
8297
diff
changeset
|
6117 if(s->flags& CODEC_FLAG_LOW_DELAY) |
ad4f10287633
Move CODEC_FLAG_LOW_DELAY into ff_mpeg4_decode_picture_header().
michael
parents:
8297
diff
changeset
|
6118 s->low_delay=1; |
8418
f75be04312dc
Fix PTS returned by the demuxers for mpeg4 without a decoder.
michael
parents:
8417
diff
changeset
|
6119 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
|
6120 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
|
6121 } |
3d4377531f6c
mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents:
745
diff
changeset
|
6122 |
0 | 6123 /* don't understand why they choose a different header ! */ |
6124 int intel_h263_decode_picture_header(MpegEncContext *s) | |
6125 { | |
6126 int format; | |
6127 | |
6128 /* picture header */ | |
1257 | 6129 if (get_bits_long(&s->gb, 22) != 0x20) { |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
6130 av_log(s->avctx, AV_LOG_ERROR, "Bad picture start code\n"); |
0 | 6131 return -1; |
355 | 6132 } |
6133 s->picture_number = get_bits(&s->gb, 8); /* picture timestamp */ | |
0 | 6134 |
355 | 6135 if (get_bits1(&s->gb) != 1) { |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
6136 av_log(s->avctx, AV_LOG_ERROR, "Bad marker\n"); |
2979 | 6137 return -1; /* marker */ |
355 | 6138 } |
6139 if (get_bits1(&s->gb) != 0) { | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
6140 av_log(s->avctx, AV_LOG_ERROR, "Bad H263 id\n"); |
2979 | 6141 return -1; /* h263 id */ |
6142 } | |
6143 skip_bits1(&s->gb); /* split screen off */ | |
6144 skip_bits1(&s->gb); /* camera off */ | |
6145 skip_bits1(&s->gb); /* freeze picture release off */ | |
0 | 6146 |
6147 format = get_bits(&s->gb, 3); | |
355 | 6148 if (format != 7) { |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
6149 av_log(s->avctx, AV_LOG_ERROR, "Intel H263 free format not supported\n"); |
0 | 6150 return -1; |
355 | 6151 } |
0 | 6152 s->h263_plus = 0; |
6153 | |
6481 | 6154 s->pict_type = FF_I_TYPE + get_bits1(&s->gb); |
2967 | 6155 |
6156 s->unrestricted_mv = get_bits1(&s->gb); | |
0 | 6157 s->h263_long_vectors = s->unrestricted_mv; |
6158 | |
355 | 6159 if (get_bits1(&s->gb) != 0) { |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
6160 av_log(s->avctx, AV_LOG_ERROR, "SAC not supported\n"); |
2979 | 6161 return -1; /* SAC: off */ |
355 | 6162 } |
5405
f15e5b4909e1
remove "Advanced Prediction Mode not supported" spam
michael
parents:
5404
diff
changeset
|
6163 s->obmc= get_bits1(&s->gb); |
9008 | 6164 s->pb_frame = get_bits1(&s->gb); |
6165 | |
6166 if(format == 7){ | |
6167 format = get_bits(&s->gb, 3); | |
6168 if(format == 0 || format == 7){ | |
6169 av_log(s->avctx, AV_LOG_ERROR, "Wrong Intel H263 format\n"); | |
6170 return -1; | |
6171 } | |
6172 if(get_bits(&s->gb, 2)) | |
6173 av_log(s->avctx, AV_LOG_ERROR, "Bad value for reserved field\n"); | |
6174 s->loop_filter = get_bits1(&s->gb); | |
6175 if(get_bits1(&s->gb)) | |
6176 av_log(s->avctx, AV_LOG_ERROR, "Bad value for reserved field\n"); | |
6177 if(get_bits1(&s->gb)) | |
6178 s->pb_frame = 2; | |
6179 if(get_bits(&s->gb, 5)) | |
6180 av_log(s->avctx, AV_LOG_ERROR, "Bad value for reserved field\n"); | |
6181 if(get_bits(&s->gb, 5) != 1) | |
6182 av_log(s->avctx, AV_LOG_ERROR, "Invalid marker\n"); | |
6183 } | |
6184 if(format == 6){ | |
6185 int ar = get_bits(&s->gb, 4); | |
6186 skip_bits(&s->gb, 9); // display width | |
6187 skip_bits1(&s->gb); | |
6188 skip_bits(&s->gb, 9); // display height | |
6189 if(ar == 15){ | |
6190 skip_bits(&s->gb, 8); // aspect ratio - width | |
6191 skip_bits(&s->gb, 8); // aspect ratio - height | |
6192 } | |
6193 } | |
0 | 6194 |
1644 | 6195 s->chroma_qscale= s->qscale = get_bits(&s->gb, 5); |
2979 | 6196 skip_bits1(&s->gb); /* Continuous Presence Multipoint mode: off */ |
0 | 6197 |
9008 | 6198 if(s->pb_frame){ |
6199 skip_bits(&s->gb, 3); //temporal reference for B-frame | |
6200 skip_bits(&s->gb, 2); //dbquant | |
6201 } | |
6202 | |
0 | 6203 /* PEI */ |
21 | 6204 while (get_bits1(&s->gb) != 0) { |
6205 skip_bits(&s->gb, 8); | |
0 | 6206 } |
6207 s->f_code = 1; | |
770
d1770a34e4f6
segfault fix patch by (Juergen Keil <jk at tools dot de>)
michaelni
parents:
766
diff
changeset
|
6208 |
d1770a34e4f6
segfault fix patch by (Juergen Keil <jk at tools dot de>)
michaelni
parents:
766
diff
changeset
|
6209 s->y_dc_scale_table= |
d1770a34e4f6
segfault fix patch by (Juergen Keil <jk at tools dot de>)
michaelni
parents:
766
diff
changeset
|
6210 s->c_dc_scale_table= ff_mpeg1_dc_scale_table; |
d1770a34e4f6
segfault fix patch by (Juergen Keil <jk at tools dot de>)
michaelni
parents:
766
diff
changeset
|
6211 |
5404 | 6212 if(s->avctx->debug&FF_DEBUG_PICT_INFO) |
6213 show_pict_info(s); | |
6214 | |
0 | 6215 return 0; |
6216 } | |
144 | 6217 |
1353
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
6218 int flv_h263_decode_picture_header(MpegEncContext *s) |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
6219 { |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
6220 int format, width, height; |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
6221 |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
6222 /* picture header */ |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
6223 if (get_bits_long(&s->gb, 17) != 1) { |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
6224 av_log(s->avctx, AV_LOG_ERROR, "Bad picture start code\n"); |
1353
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
6225 return -1; |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
6226 } |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
6227 format = get_bits(&s->gb, 5); |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
6228 if (format != 0 && format != 1) { |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
6229 av_log(s->avctx, AV_LOG_ERROR, "Bad picture format\n"); |
1353
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
6230 return -1; |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
6231 } |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
6232 s->h263_flv = format+1; |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
6233 s->picture_number = get_bits(&s->gb, 8); /* picture timestamp */ |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
6234 format = get_bits(&s->gb, 3); |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
6235 switch (format) { |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
6236 case 0: |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
6237 width = get_bits(&s->gb, 8); |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
6238 height = get_bits(&s->gb, 8); |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
6239 break; |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
6240 case 1: |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
6241 width = get_bits(&s->gb, 16); |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
6242 height = get_bits(&s->gb, 16); |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
6243 break; |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
6244 case 2: |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
6245 width = 352; |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
6246 height = 288; |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
6247 break; |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
6248 case 3: |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
6249 width = 176; |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
6250 height = 144; |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
6251 break; |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
6252 case 4: |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
6253 width = 128; |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
6254 height = 96; |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
6255 break; |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
6256 case 5: |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
6257 width = 320; |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
6258 height = 240; |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
6259 break; |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
6260 case 6: |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
6261 width = 160; |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
6262 height = 120; |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
6263 break; |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
6264 default: |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
6265 width = height = 0; |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
6266 break; |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
6267 } |
2422 | 6268 if(avcodec_check_dimensions(s->avctx, width, height)) |
1353
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
6269 return -1; |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
6270 s->width = width; |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
6271 s->height = height; |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
6272 |
6481 | 6273 s->pict_type = FF_I_TYPE + get_bits(&s->gb, 2); |
6274 s->dropable= s->pict_type > FF_P_TYPE; | |
1944 | 6275 if (s->dropable) |
6481 | 6276 s->pict_type = FF_P_TYPE; |
2967 | 6277 |
2979 | 6278 skip_bits1(&s->gb); /* deblocking flag */ |
1644 | 6279 s->chroma_qscale= s->qscale = get_bits(&s->gb, 5); |
1353
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
6280 |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
6281 s->h263_plus = 0; |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
6282 |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
6283 s->unrestricted_mv = 1; |
1364 | 6284 s->h263_long_vectors = 0; |
1353
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
6285 |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
6286 /* PEI */ |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
6287 while (get_bits1(&s->gb) != 0) { |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
6288 skip_bits(&s->gb, 8); |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
6289 } |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
6290 s->f_code = 1; |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
6291 |
1364 | 6292 if(s->avctx->debug & FF_DEBUG_PICT_INFO){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1586
diff
changeset
|
6293 av_log(s->avctx, AV_LOG_DEBUG, "%c esc_type:%d, qp:%d num:%d\n", |
2414
18d77621fbc7
print "D" instead of "P" for dropable frames in flv with -debug 1
michael
parents:
2406
diff
changeset
|
6294 s->dropable ? 'D' : av_get_pict_type_char(s->pict_type), s->h263_flv-1, s->qscale, s->picture_number); |
1364 | 6295 } |
2967 | 6296 |
1353
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
6297 s->y_dc_scale_table= |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
6298 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
|
6299 |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
6300 return 0; |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1350
diff
changeset
|
6301 } |