annotate h263.c @ 10796:3cebe9b3562d libavcodec

Move restore_ac_coeffs() up so its declared before its use.
author michael
date Thu, 07 Jan 2010 15:24:50 +0000
parents 342c2dbe0f94
children ab1844655871
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1 /*
986e461dc072 Initial revision
glantau
parents:
diff changeset
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
92ed1c4f94fa Added support to Unrestricted Motion Vectors (UMV)
pulento
parents: 70
diff changeset
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
986e461dc072 Initial revision
glantau
parents:
diff changeset
7 *
5214
470601203f44 Group all copyright and author notices together.
diego
parents: 5129
diff changeset
8 * ac prediction encoding, B-frame support, error resilience, optimizations,
470601203f44 Group all copyright and author notices together.
diego
parents: 5129
diff changeset
9 * qpel decoding, gmc decoding, interlaced decoding
470601203f44 Group all copyright and author notices together.
diego
parents: 5129
diff changeset
10 * by Michael Niedermayer <michaelni@gmx.at>
470601203f44 Group all copyright and author notices together.
diego
parents: 5129
diff changeset
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
718a22dc121f license/copyright change
glantau
parents: 396
diff changeset
15 * modify it under the terms of the GNU Lesser General Public
718a22dc121f license/copyright change
glantau
parents: 396
diff changeset
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
986e461dc072 Initial revision
glantau
parents:
diff changeset
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
986e461dc072 Initial revision
glantau
parents:
diff changeset
20 * but WITHOUT ANY WARRANTY; without even the implied warranty of
429
718a22dc121f license/copyright change
glantau
parents: 396
diff changeset
21 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
718a22dc121f license/copyright change
glantau
parents: 396
diff changeset
22 * Lesser General Public License for more details.
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
23 *
429
718a22dc121f license/copyright change
glantau
parents: 396
diff changeset
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
986e461dc072 Initial revision
glantau
parents:
diff changeset
27 */
1034
af7ba8d8b43a feeding doxygen
michaelni
parents: 1025
diff changeset
28
af7ba8d8b43a feeding doxygen
michaelni
parents: 1025
diff changeset
29 /**
8718
e9d9d946f213 Use full internal pathname in doxygen @file directives.
diego
parents: 8691
diff changeset
30 * @file libavcodec/h263.c
1106
1e39f273ecd6 per file doxy
michaelni
parents: 1092
diff changeset
31 * h263/mpeg4 codec.
1034
af7ba8d8b43a feeding doxygen
michaelni
parents: 1025
diff changeset
32 */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
33
355
ac6fc4c7aecb - H263 PAR support by Alex Beregszaszi.
pulento
parents: 350
diff changeset
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
986e461dc072 Initial revision
glantau
parents:
diff changeset
37 #include "dsputil.h"
986e461dc072 Initial revision
glantau
parents:
diff changeset
38 #include "avcodec.h"
986e461dc072 Initial revision
glantau
parents:
diff changeset
39 #include "mpegvideo.h"
986e461dc072 Initial revision
glantau
parents:
diff changeset
40 #include "h263data.h"
986e461dc072 Initial revision
glantau
parents:
diff changeset
41 #include "mpeg4data.h"
8627
d6bab465b82c moves mid_pred() into mathops.h (with arch specific code split by directory)
aurel
parents: 8612
diff changeset
42 #include "mathops.h"
9103
b626fed816d7 Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents: 9093
diff changeset
43 #include "unary.h"
10787
3f8e40fe25c2 Split out flv encoding.
michael
parents: 10786
diff changeset
44 #include "flv.h"
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
45
690
a1c69cb685b3 adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents: 676
diff changeset
46 //#undef NDEBUG
a1c69cb685b3 adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents: 676
diff changeset
47 //#include <assert.h>
a1c69cb685b3 adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents: 676
diff changeset
48
10783
610b00f28aef Document *VLC_BITS.
michael
parents: 10782
diff changeset
49 // The defines below define the number of bits that are read at once for
610b00f28aef Document *VLC_BITS.
michael
parents: 10782
diff changeset
50 // reading vlc values. Changing these may improve speed and data cache needs
610b00f28aef Document *VLC_BITS.
michael
parents: 10782
diff changeset
51 // be aware though that decreasing them may need the number of stages that is
610b00f28aef Document *VLC_BITS.
michael
parents: 10782
diff changeset
52 // passed to get_vlc* to be increased.
544
5264fb104700 optimization (get_vlc -> get_vlc2)
michaelni
parents: 542
diff changeset
53 #define INTRA_MCBPC_VLC_BITS 6
1482
b372ecde32a8 h263 stuffing decode fix
michaelni
parents: 1457
diff changeset
54 #define INTER_MCBPC_VLC_BITS 7
544
5264fb104700 optimization (get_vlc -> get_vlc2)
michaelni
parents: 542
diff changeset
55 #define CBPY_VLC_BITS 6
5264fb104700 optimization (get_vlc -> get_vlc2)
michaelni
parents: 542
diff changeset
56 #define MV_VLC_BITS 9
5264fb104700 optimization (get_vlc -> get_vlc2)
michaelni
parents: 542
diff changeset
57 #define DC_VLC_BITS 9
5264fb104700 optimization (get_vlc -> get_vlc2)
michaelni
parents: 542
diff changeset
58 #define SPRITE_TRAJ_VLC_BITS 6
5264fb104700 optimization (get_vlc -> get_vlc2)
michaelni
parents: 542
diff changeset
59 #define MB_TYPE_B_VLC_BITS 4
5264fb104700 optimization (get_vlc -> get_vlc2)
michaelni
parents: 542
diff changeset
60 #define TEX_VLC_BITS 9
1655
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
61 #define H263_MBTYPE_B_VLC_BITS 6
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
62 #define CBPC_B_VLC_BITS 3
544
5264fb104700 optimization (get_vlc -> get_vlc2)
michaelni
parents: 542
diff changeset
63
8590
7a463923ecd1 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 8418
diff changeset
64 #if CONFIG_ENCODERS
10784
da685f64e8e6 Document several more things.
michael
parents: 10783
diff changeset
65 //The uni_DCtab_* tables below contain unified bits+length tables to encode DC
da685f64e8e6 Document several more things.
michael
parents: 10783
diff changeset
66 //differences in mpeg4. Unified in the sense that the specification specifies
da685f64e8e6 Document several more things.
michael
parents: 10783
diff changeset
67 //this encoding in several steps.
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
68 static uint8_t uni_DCtab_lum_len[512];
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
69 static uint8_t uni_DCtab_chrom_len[512];
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
70 static uint16_t uni_DCtab_lum_bits[512];
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
71 static uint16_t uni_DCtab_chrom_bits[512];
815
78accc54493b put a few large tables under #ifdef CONFIG_ENCODERS or dynamically allocate them
michaelni
parents: 770
diff changeset
72
10784
da685f64e8e6 Document several more things.
michael
parents: 10783
diff changeset
73 /**
da685f64e8e6 Document several more things.
michael
parents: 10783
diff changeset
74 * Table of number of bits a motion vector component needs.
da685f64e8e6 Document several more things.
michael
parents: 10783
diff changeset
75 */
4655
f0ce30e115ac dont malloc() static mv_penalty arrays
michael
parents: 4652
diff changeset
76 static uint8_t mv_penalty[MAX_FCODE+1][MAX_MV*2+1];
10784
da685f64e8e6 Document several more things.
michael
parents: 10783
diff changeset
77
da685f64e8e6 Document several more things.
michael
parents: 10783
diff changeset
78 /**
da685f64e8e6 Document several more things.
michael
parents: 10783
diff changeset
79 * Minimal fcode that a motion vector component would need.
da685f64e8e6 Document several more things.
michael
parents: 10783
diff changeset
80 */
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
81 static uint8_t fcode_tab[MAX_MV*2+1];
10784
da685f64e8e6 Document several more things.
michael
parents: 10783
diff changeset
82
da685f64e8e6 Document several more things.
michael
parents: 10783
diff changeset
83 /**
da685f64e8e6 Document several more things.
michael
parents: 10783
diff changeset
84 * Minimal fcode that a motion vector component would need in umv.
da685f64e8e6 Document several more things.
michael
parents: 10783
diff changeset
85 * All entries in this table are 1.
da685f64e8e6 Document several more things.
michael
parents: 10783
diff changeset
86 */
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
87 static uint8_t umv_fcode_tab[MAX_MV*2+1];
815
78accc54493b put a few large tables under #ifdef CONFIG_ENCODERS or dynamically allocate them
michaelni
parents: 770
diff changeset
88
10784
da685f64e8e6 Document several more things.
michael
parents: 10783
diff changeset
89 //unified encoding tables for run length encoding of coefficients
da685f64e8e6 Document several more things.
michael
parents: 10783
diff changeset
90 //unified in the sense that the specification specifies the encoding in several steps.
945
463f7260b155 trellis quantization
michaelni
parents: 942
diff changeset
91 static uint32_t uni_mpeg4_intra_rl_bits[64*64*2*2];
463f7260b155 trellis quantization
michaelni
parents: 942
diff changeset
92 static uint8_t uni_mpeg4_intra_rl_len [64*64*2*2];
463f7260b155 trellis quantization
michaelni
parents: 942
diff changeset
93 static uint32_t uni_mpeg4_inter_rl_bits[64*64*2*2];
463f7260b155 trellis quantization
michaelni
parents: 942
diff changeset
94 static uint8_t uni_mpeg4_inter_rl_len [64*64*2*2];
2253
1085c5284bf1 trellis quantization for h263(p)
michael
parents: 2243
diff changeset
95 static uint8_t uni_h263_intra_aic_rl_len [64*64*2*2];
1085c5284bf1 trellis quantization for h263(p)
michael
parents: 2243
diff changeset
96 static uint8_t uni_h263_inter_rl_len [64*64*2*2];
945
463f7260b155 trellis quantization
michaelni
parents: 942
diff changeset
97 //#define UNI_MPEG4_ENC_INDEX(last,run,level) ((last)*128 + (run)*256 + (level))
648
dddcff6841f2 optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents: 619
diff changeset
98 //#define UNI_MPEG4_ENC_INDEX(last,run,level) ((last)*128*64 + (run) + (level)*64)
945
463f7260b155 trellis quantization
michaelni
parents: 942
diff changeset
99 #define UNI_MPEG4_ENC_INDEX(last,run,level) ((last)*128*64 + (run)*128 + (level))
648
dddcff6841f2 optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents: 619
diff changeset
100
dddcff6841f2 optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents: 619
diff changeset
101 /* mpeg4
dddcff6841f2 optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents: 619
diff changeset
102 inter
dddcff6841f2 optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents: 619
diff changeset
103 max level: 24/6
dddcff6841f2 optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents: 619
diff changeset
104 max run: 53/63
dddcff6841f2 optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents: 619
diff changeset
105
dddcff6841f2 optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents: 619
diff changeset
106 intra
dddcff6841f2 optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents: 619
diff changeset
107 max level: 53/16
dddcff6841f2 optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents: 619
diff changeset
108 max run: 29/41
dddcff6841f2 optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents: 619
diff changeset
109 */
815
78accc54493b put a few large tables under #ifdef CONFIG_ENCODERS or dynamically allocate them
michaelni
parents: 770
diff changeset
110 #endif
78accc54493b put a few large tables under #ifdef CONFIG_ENCODERS or dynamically allocate them
michaelni
parents: 770
diff changeset
111
4672
41fdd1901c18 10l for myself, fixing --disable-encoders
michael
parents: 4668
diff changeset
112 static uint8_t static_rl_table_store[5][2][2*MAX_RUN + MAX_LEVEL + 3];
41fdd1901c18 10l for myself, fixing --disable-encoders
michael
parents: 4668
diff changeset
113
2646
c735e3e60ca7 Even More spelling errors. patch by (Kevin Baragona <kevinmb500 gawab com)
michael
parents: 2639
diff changeset
114 #if 0 //3IV1 is quite rare and it slows things down a tiny bit
8612
b20c590170cc remove ff_get_fourcc() and use AV_RL32() instead
aurel
parents: 8611
diff changeset
115 #define IS_3IV1 s->codec_tag == AV_RL32("3IV1")
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
116 #else
1271
42ea05e4a391 improving 3IV1 support (still far from perfect) note, disabled as it requires some checks in the inner loops which would slow things down a tiny bit
michaelni
parents: 1261
diff changeset
117 #define IS_3IV1 0
42ea05e4a391 improving 3IV1 support (still far from perfect) note, disabled as it requires some checks in the inner loops which would slow things down a tiny bit
michaelni
parents: 1261
diff changeset
118 #endif
293
6eaf5da091fa optimizing mpeg4_encode_dc
michaelni
parents: 292
diff changeset
119
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
120 int h263_get_picture_format(int width, int height)
986e461dc072 Initial revision
glantau
parents:
diff changeset
121 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
122 if (width == 128 && height == 96)
10782
7061be6d8e96 Simplify h263_get_picture_format().
michael
parents: 10775
diff changeset
123 return 1;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
124 else if (width == 176 && height == 144)
10782
7061be6d8e96 Simplify h263_get_picture_format().
michael
parents: 10775
diff changeset
125 return 2;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
126 else if (width == 352 && height == 288)
10782
7061be6d8e96 Simplify h263_get_picture_format().
michael
parents: 10775
diff changeset
127 return 3;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
128 else if (width == 704 && height == 576)
10782
7061be6d8e96 Simplify h263_get_picture_format().
michael
parents: 10775
diff changeset
129 return 4;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
130 else if (width == 1408 && height == 1152)
10782
7061be6d8e96 Simplify h263_get_picture_format().
michael
parents: 10775
diff changeset
131 return 5;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
132 else
10782
7061be6d8e96 Simplify h263_get_picture_format().
michael
parents: 10775
diff changeset
133 return 7;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
134 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
135
10791
48adb5a1b47b Split out intel H263 decoder.
michael
parents: 10788
diff changeset
136 void ff_h263_show_pict_info(MpegEncContext *s){
10793
9b3ec3d1bdae Factorize if() surrounding every ff_h263_show_pict_info() call.
michael
parents: 10791
diff changeset
137 if(s->avctx->debug&FF_DEBUG_PICT_INFO){
5403
54800e80235a move show_pict_info() to its own function
michael
parents: 5275
diff changeset
138 av_log(s->avctx, AV_LOG_DEBUG, "qp:%d %c size:%d rnd:%d%s%s%s%s%s%s%s%s%s %d/%d\n",
54800e80235a move show_pict_info() to its own function
michael
parents: 5275
diff changeset
139 s->qscale, av_get_pict_type_char(s->pict_type),
54800e80235a move show_pict_info() to its own function
michael
parents: 5275
diff changeset
140 s->gb.size_in_bits, 1-s->no_rounding,
54800e80235a move show_pict_info() to its own function
michael
parents: 5275
diff changeset
141 s->obmc ? " AP" : "",
54800e80235a move show_pict_info() to its own function
michael
parents: 5275
diff changeset
142 s->umvplus ? " UMV" : "",
54800e80235a move show_pict_info() to its own function
michael
parents: 5275
diff changeset
143 s->h263_long_vectors ? " LONG" : "",
54800e80235a move show_pict_info() to its own function
michael
parents: 5275
diff changeset
144 s->h263_plus ? " +" : "",
54800e80235a move show_pict_info() to its own function
michael
parents: 5275
diff changeset
145 s->h263_aic ? " AIC" : "",
54800e80235a move show_pict_info() to its own function
michael
parents: 5275
diff changeset
146 s->alt_inter_vlc ? " AIV" : "",
54800e80235a move show_pict_info() to its own function
michael
parents: 5275
diff changeset
147 s->modified_quant ? " MQ" : "",
54800e80235a move show_pict_info() to its own function
michael
parents: 5275
diff changeset
148 s->loop_filter ? " LOOP" : "",
54800e80235a move show_pict_info() to its own function
michael
parents: 5275
diff changeset
149 s->h263_slice_structured ? " SS" : "",
54800e80235a move show_pict_info() to its own function
michael
parents: 5275
diff changeset
150 s->avctx->time_base.den, s->avctx->time_base.num
54800e80235a move show_pict_info() to its own function
michael
parents: 5275
diff changeset
151 );
10793
9b3ec3d1bdae Factorize if() surrounding every ff_h263_show_pict_info() call.
michael
parents: 10791
diff changeset
152 }
5403
54800e80235a move show_pict_info() to its own function
michael
parents: 5275
diff changeset
153 }
54800e80235a move show_pict_info() to its own function
michael
parents: 5275
diff changeset
154
8590
7a463923ecd1 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 8418
diff changeset
155 #if CONFIG_ENCODERS
1070
6da5ae9ee199 more #ifdef CONFIG_ENCODERS patch by (Wolfgang Hesseler <qv at multimediaware dot com>) with modifications by me (s/WOLFGANG/CONFIG_ENCODERS/ and some other fixes)
michaelni
parents: 1068
diff changeset
156
10786
db269539f68f Document aspect_to_info().
michael
parents: 10785
diff changeset
157 /**
db269539f68f Document aspect_to_info().
michael
parents: 10785
diff changeset
158 * Returns the 4 bit value that specifies the given aspect ratio.
db269539f68f Document aspect_to_info().
michael
parents: 10785
diff changeset
159 * This may be one of the standard aspect ratios or it specifies
db269539f68f Document aspect_to_info().
michael
parents: 10785
diff changeset
160 * that the aspect will be stored explicitly later.
db269539f68f Document aspect_to_info().
michael
parents: 10785
diff changeset
161 */
10785
bb3abb64e395 Cleanup aspect_to_info().
michael
parents: 10784
diff changeset
162 static av_const int aspect_to_info(AVRational aspect){
887
19f5b8b7c6d5 fixing aspect
michaelni
parents: 880
diff changeset
163 int i;
19f5b8b7c6d5 fixing aspect
michaelni
parents: 880
diff changeset
164
1548
dd544554ed42 AVRational
michael
parents: 1542
diff changeset
165 if(aspect.num==0) aspect= (AVRational){1,1};
dd544554ed42 AVRational
michael
parents: 1542
diff changeset
166
887
19f5b8b7c6d5 fixing aspect
michaelni
parents: 880
diff changeset
167 for(i=1; i<6; i++){
1548
dd544554ed42 AVRational
michael
parents: 1542
diff changeset
168 if(av_cmp_q(pixel_aspect[i], aspect) == 0){
10785
bb3abb64e395 Cleanup aspect_to_info().
michael
parents: 10784
diff changeset
169 return i;
887
19f5b8b7c6d5 fixing aspect
michaelni
parents: 880
diff changeset
170 }
19f5b8b7c6d5 fixing aspect
michaelni
parents: 880
diff changeset
171 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
172
10785
bb3abb64e395 Cleanup aspect_to_info().
michael
parents: 10784
diff changeset
173 return FF_ASPECT_EXTENDED;
880
1c32039e7215 aspect ratio cleanup
michaelni
parents: 853
diff changeset
174 }
1c32039e7215 aspect ratio cleanup
michaelni
parents: 853
diff changeset
175
1354
1f89adb69349 flv cleanup / simplify
michaelni
parents: 1353
diff changeset
176 void h263_encode_picture_header(MpegEncContext * s, int picture_number)
1f89adb69349 flv cleanup / simplify
michaelni
parents: 1353
diff changeset
177 {
1872
c13d3543c73a h263+ custom pcf support
michael
parents: 1865
diff changeset
178 int format, coded_frame_rate, coded_frame_rate_base, i, temp_ref;
c13d3543c73a h263+ custom pcf support
michael
parents: 1865
diff changeset
179 int best_clock_code=1;
c13d3543c73a h263+ custom pcf support
michael
parents: 1865
diff changeset
180 int best_divisor=60;
c13d3543c73a h263+ custom pcf support
michael
parents: 1865
diff changeset
181 int best_error= INT_MAX;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
182
1872
c13d3543c73a h263+ custom pcf support
michael
parents: 1865
diff changeset
183 if(s->h263_plus){
c13d3543c73a h263+ custom pcf support
michael
parents: 1865
diff changeset
184 for(i=0; i<2; i++){
c13d3543c73a h263+ custom pcf support
michael
parents: 1865
diff changeset
185 int div, error;
2637
ef44d24680d1 switch to native time bases
michael
parents: 2632
diff changeset
186 div= (s->avctx->time_base.num*1800000LL + 500LL*s->avctx->time_base.den) / ((1000LL+i)*s->avctx->time_base.den);
5075
33d50e0e1823 Correct the parameter order for the call to "av_clip".
takis
parents: 4984
diff changeset
187 div= av_clip(div, 1, 127);
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
188 error= FFABS(s->avctx->time_base.num*1800000LL - (1000LL+i)*s->avctx->time_base.den*div);
1872
c13d3543c73a h263+ custom pcf support
michael
parents: 1865
diff changeset
189 if(error < best_error){
c13d3543c73a h263+ custom pcf support
michael
parents: 1865
diff changeset
190 best_error= error;
c13d3543c73a h263+ custom pcf support
michael
parents: 1865
diff changeset
191 best_divisor= div;
c13d3543c73a h263+ custom pcf support
michael
parents: 1865
diff changeset
192 best_clock_code= i;
c13d3543c73a h263+ custom pcf support
michael
parents: 1865
diff changeset
193 }
c13d3543c73a h263+ custom pcf support
michael
parents: 1865
diff changeset
194 }
c13d3543c73a h263+ custom pcf support
michael
parents: 1865
diff changeset
195 }
c13d3543c73a h263+ custom pcf support
michael
parents: 1865
diff changeset
196 s->custom_pcf= best_clock_code!=1 || best_divisor!=60;
c13d3543c73a h263+ custom pcf support
michael
parents: 1865
diff changeset
197 coded_frame_rate= 1800000;
c13d3543c73a h263+ custom pcf support
michael
parents: 1865
diff changeset
198 coded_frame_rate_base= (1000+best_clock_code)*best_divisor;
1354
1f89adb69349 flv cleanup / simplify
michaelni
parents: 1353
diff changeset
199
1f89adb69349 flv cleanup / simplify
michaelni
parents: 1353
diff changeset
200 align_put_bits(&s->pb);
1353
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1350
diff changeset
201
231
840cd25bf259 - Fixes on RTP and GOB headers for H.263.
pulento
parents: 174
diff changeset
202 /* Update the pointer to last GOB */
9431
932543edc1d2 Rename pbBufPtr() to put_bits_ptr().
stefano
parents: 9290
diff changeset
203 s->ptr_lastgob = put_bits_ptr(&s->pb);
231
840cd25bf259 - Fixes on RTP and GOB headers for H.263.
pulento
parents: 174
diff changeset
204 put_bits(&s->pb, 22, 0x20); /* PSC */
2637
ef44d24680d1 switch to native time bases
michael
parents: 2632
diff changeset
205 temp_ref= s->picture_number * (int64_t)coded_frame_rate * s->avctx->time_base.num / //FIXME use timestamp
ef44d24680d1 switch to native time bases
michael
parents: 2632
diff changeset
206 (coded_frame_rate_base * (int64_t)s->avctx->time_base.den);
7260
3ec34b551aae bitstream: move put_sbits() from flacenc.c to bitstream.h and use it
ramiro
parents: 7098
diff changeset
207 put_sbits(&s->pb, 8, temp_ref); /* TemporalReference */
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
208
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
209 put_bits(&s->pb, 1, 1); /* marker */
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
210 put_bits(&s->pb, 1, 0); /* h263 id */
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
211 put_bits(&s->pb, 1, 0); /* split screen off */
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
212 put_bits(&s->pb, 1, 0); /* camera off */
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
213 put_bits(&s->pb, 1, 0); /* freeze picture release off */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
214
78
92ed1c4f94fa Added support to Unrestricted Motion Vectors (UMV)
pulento
parents: 70
diff changeset
215 format = h263_get_picture_format(s->width, s->height);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
216 if (!s->h263_plus) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
217 /* H.263v1 */
986e461dc072 Initial revision
glantau
parents:
diff changeset
218 put_bits(&s->pb, 3, format);
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6211
diff changeset
219 put_bits(&s->pb, 1, (s->pict_type == FF_P_TYPE));
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
220 /* By now UMV IS DISABLED ON H.263v1, since the restrictions
986e461dc072 Initial revision
glantau
parents:
diff changeset
221 of H.263v1 UMV implies to check the predicted MV after
986e461dc072 Initial revision
glantau
parents:
diff changeset
222 calculation of the current MB to see if we're on the limits */
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
223 put_bits(&s->pb, 1, 0); /* Unrestricted Motion Vector: off */
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
224 put_bits(&s->pb, 1, 0); /* SAC: off */
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
225 put_bits(&s->pb, 1, s->obmc); /* Advanced Prediction */
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
226 put_bits(&s->pb, 1, 0); /* only I/P frames, no PB frame */
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
227 put_bits(&s->pb, 5, s->qscale);
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
228 put_bits(&s->pb, 1, 0); /* Continuous Presence Multipoint mode: off */
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
229 } else {
1872
c13d3543c73a h263+ custom pcf support
michael
parents: 1865
diff changeset
230 int ufep=1;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
231 /* H.263v2 */
986e461dc072 Initial revision
glantau
parents:
diff changeset
232 /* H.263 Plus PTYPE */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
233
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
234 put_bits(&s->pb, 3, 7);
1872
c13d3543c73a h263+ custom pcf support
michael
parents: 1865
diff changeset
235 put_bits(&s->pb,3,ufep); /* Update Full Extended PTYPE */
78
92ed1c4f94fa Added support to Unrestricted Motion Vectors (UMV)
pulento
parents: 70
diff changeset
236 if (format == 7)
92ed1c4f94fa Added support to Unrestricted Motion Vectors (UMV)
pulento
parents: 70
diff changeset
237 put_bits(&s->pb,3,6); /* Custom Source Format */
92ed1c4f94fa Added support to Unrestricted Motion Vectors (UMV)
pulento
parents: 70
diff changeset
238 else
92ed1c4f94fa Added support to Unrestricted Motion Vectors (UMV)
pulento
parents: 70
diff changeset
239 put_bits(&s->pb, 3, format);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
240
1872
c13d3543c73a h263+ custom pcf support
michael
parents: 1865
diff changeset
241 put_bits(&s->pb,1, s->custom_pcf);
1661
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
242 put_bits(&s->pb,1, s->umvplus); /* Unrestricted Motion Vector */
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
243 put_bits(&s->pb,1,0); /* SAC: off */
1633
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
244 put_bits(&s->pb,1,s->obmc); /* Advanced Prediction Mode */
350
6ebbecc10063 - Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents: 346
diff changeset
245 put_bits(&s->pb,1,s->h263_aic); /* Advanced Intra Coding */
1644
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
246 put_bits(&s->pb,1,s->loop_filter); /* Deblocking Filter */
1661
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
247 put_bits(&s->pb,1,s->h263_slice_structured); /* Slice Structured */
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
248 put_bits(&s->pb,1,0); /* Reference Picture Selection: off */
986e461dc072 Initial revision
glantau
parents:
diff changeset
249 put_bits(&s->pb,1,0); /* Independent Segment Decoding: off */
1637
7799582dc9b8 h263 alternative inter vlc support
michael
parents: 1633
diff changeset
250 put_bits(&s->pb,1,s->alt_inter_vlc); /* Alternative Inter VLC */
1644
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
251 put_bits(&s->pb,1,s->modified_quant); /* Modified Quantization: */
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
252 put_bits(&s->pb,1,1); /* "1" to prevent start code emulation */
986e461dc072 Initial revision
glantau
parents:
diff changeset
253 put_bits(&s->pb,3,0); /* Reserved */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
254
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6211
diff changeset
255 put_bits(&s->pb, 3, s->pict_type == FF_P_TYPE);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
256
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
257 put_bits(&s->pb,1,0); /* Reference Picture Resampling: off */
986e461dc072 Initial revision
glantau
parents:
diff changeset
258 put_bits(&s->pb,1,0); /* Reduced-Resolution Update: off */
350
6ebbecc10063 - Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents: 346
diff changeset
259 put_bits(&s->pb,1,s->no_rounding); /* Rounding Type */
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
260 put_bits(&s->pb,2,0); /* Reserved */
986e461dc072 Initial revision
glantau
parents:
diff changeset
261 put_bits(&s->pb,1,1); /* "1" to prevent start code emulation */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
262
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
263 /* This should be here if PLUSPTYPE */
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
264 put_bits(&s->pb, 1, 0); /* Continuous Presence Multipoint mode: off */
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
265
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
266 if (format == 7) {
78
92ed1c4f94fa Added support to Unrestricted Motion Vectors (UMV)
pulento
parents: 70
diff changeset
267 /* Custom Picture Format (CPFMT) */
10785
bb3abb64e395 Cleanup aspect_to_info().
michael
parents: 10784
diff changeset
268 s->aspect_ratio_info= aspect_to_info(s->avctx->sample_aspect_ratio);
880
1c32039e7215 aspect ratio cleanup
michaelni
parents: 853
diff changeset
269
1c32039e7215 aspect ratio cleanup
michaelni
parents: 853
diff changeset
270 put_bits(&s->pb,4,s->aspect_ratio_info);
78
92ed1c4f94fa Added support to Unrestricted Motion Vectors (UMV)
pulento
parents: 70
diff changeset
271 put_bits(&s->pb,9,(s->width >> 2) - 1);
92ed1c4f94fa Added support to Unrestricted Motion Vectors (UMV)
pulento
parents: 70
diff changeset
272 put_bits(&s->pb,1,1); /* "1" to prevent start code emulation */
92ed1c4f94fa Added support to Unrestricted Motion Vectors (UMV)
pulento
parents: 70
diff changeset
273 put_bits(&s->pb,9,(s->height >> 2));
1548
dd544554ed42 AVRational
michael
parents: 1542
diff changeset
274 if (s->aspect_ratio_info == FF_ASPECT_EXTENDED){
dd544554ed42 AVRational
michael
parents: 1542
diff changeset
275 put_bits(&s->pb, 8, s->avctx->sample_aspect_ratio.num);
dd544554ed42 AVRational
michael
parents: 1542
diff changeset
276 put_bits(&s->pb, 8, s->avctx->sample_aspect_ratio.den);
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
277 }
78
92ed1c4f94fa Added support to Unrestricted Motion Vectors (UMV)
pulento
parents: 70
diff changeset
278 }
1872
c13d3543c73a h263+ custom pcf support
michael
parents: 1865
diff changeset
279 if(s->custom_pcf){
c13d3543c73a h263+ custom pcf support
michael
parents: 1865
diff changeset
280 if(ufep){
c13d3543c73a h263+ custom pcf support
michael
parents: 1865
diff changeset
281 put_bits(&s->pb, 1, best_clock_code);
c13d3543c73a h263+ custom pcf support
michael
parents: 1865
diff changeset
282 put_bits(&s->pb, 7, best_divisor);
c13d3543c73a h263+ custom pcf support
michael
parents: 1865
diff changeset
283 }
7260
3ec34b551aae bitstream: move put_sbits() from flacenc.c to bitstream.h and use it
ramiro
parents: 7098
diff changeset
284 put_sbits(&s->pb, 2, temp_ref>>8);
1872
c13d3543c73a h263+ custom pcf support
michael
parents: 1865
diff changeset
285 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
286
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
287 /* Unlimited Unrestricted Motion Vectors Indicator (UUI) */
79
82e579c37bc3 Moved some H.263+ variables to MpegEncContext to be thread-safe.
pulento
parents: 78
diff changeset
288 if (s->umvplus)
1089
7e79a58954b1 h263(+) clenaup & bugfixes
michaelni
parents: 1070
diff changeset
289 // put_bits(&s->pb,1,1); /* Limited according tables of Annex D */
1644
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
290 //FIXME check actual requested range
1089
7e79a58954b1 h263(+) clenaup & bugfixes
michaelni
parents: 1070
diff changeset
291 put_bits(&s->pb,2,1); /* unlimited */
1661
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
292 if(s->h263_slice_structured)
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
293 put_bits(&s->pb,2,0); /* no weird submodes */
1089
7e79a58954b1 h263(+) clenaup & bugfixes
michaelni
parents: 1070
diff changeset
294
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
295 put_bits(&s->pb, 5, s->qscale);
986e461dc072 Initial revision
glantau
parents:
diff changeset
296 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
297
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
298 put_bits(&s->pb, 1, 0); /* no PEI */
498
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 482
diff changeset
299
1670
d6f2520c0c43 slice structured fixes
michael
parents: 1668
diff changeset
300 if(s->h263_slice_structured){
d6f2520c0c43 slice structured fixes
michael
parents: 1668
diff changeset
301 put_bits(&s->pb, 1, 1);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
302
1670
d6f2520c0c43 slice structured fixes
michael
parents: 1668
diff changeset
303 assert(s->mb_x == 0 && s->mb_y == 0);
d6f2520c0c43 slice structured fixes
michael
parents: 1668
diff changeset
304 ff_h263_encode_mba(s);
d6f2520c0c43 slice structured fixes
michael
parents: 1668
diff changeset
305
d6f2520c0c43 slice structured fixes
michael
parents: 1668
diff changeset
306 put_bits(&s->pb, 1, 1);
d6f2520c0c43 slice structured fixes
michael
parents: 1668
diff changeset
307 }
d6f2520c0c43 slice structured fixes
michael
parents: 1668
diff changeset
308
498
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 482
diff changeset
309 if(s->h263_aic){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
310 s->y_dc_scale_table=
1639
3e2b774edce4 rv20 decoder
michael
parents: 1637
diff changeset
311 s->c_dc_scale_table= ff_aic_dc_scale_table;
498
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 482
diff changeset
312 }else{
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 482
diff changeset
313 s->y_dc_scale_table=
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 482
diff changeset
314 s->c_dc_scale_table= ff_mpeg1_dc_scale_table;
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 482
diff changeset
315 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
316 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
317
766
8d36b35a7e6e slice encoding cleanup
michaelni
parents: 761
diff changeset
318 /**
8d36b35a7e6e slice encoding cleanup
michaelni
parents: 761
diff changeset
319 * Encodes a group of blocks header.
8d36b35a7e6e slice encoding cleanup
michaelni
parents: 761
diff changeset
320 */
1661
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
321 void h263_encode_gob_header(MpegEncContext * s, int mb_line)
162
de80712db90b - Preliminary RTP friendly mode for H.263.
pulento
parents: 161
diff changeset
322 {
1661
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
323 put_bits(&s->pb, 17, 1); /* GBSC */
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
324
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
325 if(s->h263_slice_structured){
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
326 put_bits(&s->pb, 1, 1);
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
327
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
328 ff_h263_encode_mba(s);
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
329
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
330 if(s->mb_num > 1583)
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
331 put_bits(&s->pb, 1, 1);
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
332 put_bits(&s->pb, 5, s->qscale); /* GQUANT */
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
333 put_bits(&s->pb, 1, 1);
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6211
diff changeset
334 put_bits(&s->pb, 2, s->pict_type == FF_I_TYPE); /* GFID */
1661
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
335 }else{
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
336 int gob_number= mb_line / s->gob_index;
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
337
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
338 put_bits(&s->pb, 5, gob_number); /* GN */
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6211
diff changeset
339 put_bits(&s->pb, 2, s->pict_type == FF_I_TYPE); /* GFID */
1661
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
340 put_bits(&s->pb, 5, s->qscale); /* GQUANT */
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
341 }
162
de80712db90b - Preliminary RTP friendly mode for H.263.
pulento
parents: 161
diff changeset
342 }
265
4e9e728021d8 use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents: 264
diff changeset
343
10795
342c2dbe0f94 More doxy
michael
parents: 10793
diff changeset
344 /**
342c2dbe0f94 More doxy
michael
parents: 10793
diff changeset
345 * Returns the number of bits that encoding the 8x8 block in block would need.
342c2dbe0f94 More doxy
michael
parents: 10793
diff changeset
346 * @param[in] block_last_index last index in scantable order that refers to a non zero element in block.
342c2dbe0f94 More doxy
michael
parents: 10793
diff changeset
347 */
1492
3518325146fc ac prediction cleanup
michaelni
parents: 1490
diff changeset
348 static inline int get_block_rate(MpegEncContext * s, DCTELEM block[64], int block_last_index, uint8_t scantable[64]){
3518325146fc ac prediction cleanup
michaelni
parents: 1490
diff changeset
349 int last=0;
3518325146fc ac prediction cleanup
michaelni
parents: 1490
diff changeset
350 int j;
3518325146fc ac prediction cleanup
michaelni
parents: 1490
diff changeset
351 int rate=0;
3518325146fc ac prediction cleanup
michaelni
parents: 1490
diff changeset
352
3518325146fc ac prediction cleanup
michaelni
parents: 1490
diff changeset
353 for(j=1; j<=block_last_index; j++){
3518325146fc ac prediction cleanup
michaelni
parents: 1490
diff changeset
354 const int index= scantable[j];
3518325146fc ac prediction cleanup
michaelni
parents: 1490
diff changeset
355 int level= block[index];
3518325146fc ac prediction cleanup
michaelni
parents: 1490
diff changeset
356 if(level){
3518325146fc ac prediction cleanup
michaelni
parents: 1490
diff changeset
357 level+= 64;
3518325146fc ac prediction cleanup
michaelni
parents: 1490
diff changeset
358 if((level&(~127)) == 0){
3518325146fc ac prediction cleanup
michaelni
parents: 1490
diff changeset
359 if(j<block_last_index) rate+= s->intra_ac_vlc_length [UNI_AC_ENC_INDEX(j-last-1, level)];
3518325146fc ac prediction cleanup
michaelni
parents: 1490
diff changeset
360 else rate+= s->intra_ac_vlc_last_length[UNI_AC_ENC_INDEX(j-last-1, level)];
3518325146fc ac prediction cleanup
michaelni
parents: 1490
diff changeset
361 }else
3518325146fc ac prediction cleanup
michaelni
parents: 1490
diff changeset
362 rate += s->ac_esc_length;
3518325146fc ac prediction cleanup
michaelni
parents: 1490
diff changeset
363
3518325146fc ac prediction cleanup
michaelni
parents: 1490
diff changeset
364 last= j;
3518325146fc ac prediction cleanup
michaelni
parents: 1490
diff changeset
365 }
3518325146fc ac prediction cleanup
michaelni
parents: 1490
diff changeset
366 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
367
1492
3518325146fc ac prediction cleanup
michaelni
parents: 1490
diff changeset
368 return rate;
3518325146fc ac prediction cleanup
michaelni
parents: 1490
diff changeset
369 }
3518325146fc ac prediction cleanup
michaelni
parents: 1490
diff changeset
370
10796
3cebe9b3562d Move restore_ac_coeffs() up so its declared before its use.
michael
parents: 10795
diff changeset
371 static inline void restore_ac_coeffs(MpegEncContext * s, DCTELEM block[6][64], int dir[6], uint8_t *st[6], int zigzag_last_index[6])
3cebe9b3562d Move restore_ac_coeffs() up so its declared before its use.
michael
parents: 10795
diff changeset
372 {
3cebe9b3562d Move restore_ac_coeffs() up so its declared before its use.
michael
parents: 10795
diff changeset
373 int i, n;
3cebe9b3562d Move restore_ac_coeffs() up so its declared before its use.
michael
parents: 10795
diff changeset
374 memcpy(s->block_last_index, zigzag_last_index, sizeof(int)*6);
3cebe9b3562d Move restore_ac_coeffs() up so its declared before its use.
michael
parents: 10795
diff changeset
375
3cebe9b3562d Move restore_ac_coeffs() up so its declared before its use.
michael
parents: 10795
diff changeset
376 for(n=0; n<6; n++){
3cebe9b3562d Move restore_ac_coeffs() up so its declared before its use.
michael
parents: 10795
diff changeset
377 int16_t *ac_val = s->ac_val[0][0] + s->block_index[n] * 16;
3cebe9b3562d Move restore_ac_coeffs() up so its declared before its use.
michael
parents: 10795
diff changeset
378
3cebe9b3562d Move restore_ac_coeffs() up so its declared before its use.
michael
parents: 10795
diff changeset
379 st[n]= s->intra_scantable.permutated;
3cebe9b3562d Move restore_ac_coeffs() up so its declared before its use.
michael
parents: 10795
diff changeset
380 if(dir[n]){
3cebe9b3562d Move restore_ac_coeffs() up so its declared before its use.
michael
parents: 10795
diff changeset
381 /* top prediction */
3cebe9b3562d Move restore_ac_coeffs() up so its declared before its use.
michael
parents: 10795
diff changeset
382 for(i=1; i<8; i++){
3cebe9b3562d Move restore_ac_coeffs() up so its declared before its use.
michael
parents: 10795
diff changeset
383 block[n][s->dsp.idct_permutation[i ]] = ac_val[i+8];
3cebe9b3562d Move restore_ac_coeffs() up so its declared before its use.
michael
parents: 10795
diff changeset
384 }
3cebe9b3562d Move restore_ac_coeffs() up so its declared before its use.
michael
parents: 10795
diff changeset
385 }else{
3cebe9b3562d Move restore_ac_coeffs() up so its declared before its use.
michael
parents: 10795
diff changeset
386 /* left prediction */
3cebe9b3562d Move restore_ac_coeffs() up so its declared before its use.
michael
parents: 10795
diff changeset
387 for(i=1; i<8; i++){
3cebe9b3562d Move restore_ac_coeffs() up so its declared before its use.
michael
parents: 10795
diff changeset
388 block[n][s->dsp.idct_permutation[i<<3]]= ac_val[i ];
3cebe9b3562d Move restore_ac_coeffs() up so its declared before its use.
michael
parents: 10795
diff changeset
389 }
3cebe9b3562d Move restore_ac_coeffs() up so its declared before its use.
michael
parents: 10795
diff changeset
390 }
3cebe9b3562d Move restore_ac_coeffs() up so its declared before its use.
michael
parents: 10795
diff changeset
391 }
3cebe9b3562d Move restore_ac_coeffs() up so its declared before its use.
michael
parents: 10795
diff changeset
392 }
3cebe9b3562d Move restore_ac_coeffs() up so its declared before its use.
michael
parents: 10795
diff changeset
393
10795
342c2dbe0f94 More doxy
michael
parents: 10793
diff changeset
394 /**
342c2dbe0f94 More doxy
michael
parents: 10793
diff changeset
395 * Returns the optimal value (0 or 1) for the ac_pred element for the given MB in mpeg4.
342c2dbe0f94 More doxy
michael
parents: 10793
diff changeset
396 */
1492
3518325146fc ac prediction cleanup
michaelni
parents: 1490
diff changeset
397 static inline int decide_ac_pred(MpegEncContext * s, DCTELEM block[6][64], int dir[6], uint8_t *st[6], int zigzag_last_index[6])
265
4e9e728021d8 use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents: 264
diff changeset
398 {
1492
3518325146fc ac prediction cleanup
michaelni
parents: 1490
diff changeset
399 int score= 0;
265
4e9e728021d8 use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents: 264
diff changeset
400 int i, n;
903
22ee74da2cd3 cleanup
michaelni
parents: 892
diff changeset
401 int8_t * const qscale_table= s->current_picture.qscale_table;
265
4e9e728021d8 use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents: 264
diff changeset
402
1492
3518325146fc ac prediction cleanup
michaelni
parents: 1490
diff changeset
403 memcpy(zigzag_last_index, s->block_last_index, sizeof(int)*6);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
404
265
4e9e728021d8 use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents: 264
diff changeset
405 for(n=0; n<6; n++){
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
406 int16_t *ac_val, *ac_val1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
407
1492
3518325146fc ac prediction cleanup
michaelni
parents: 1490
diff changeset
408 score -= get_block_rate(s, block[n], s->block_last_index[n], s->intra_scantable.permutated);
265
4e9e728021d8 use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents: 264
diff changeset
409
266
252444e5259b optimization
michaelni
parents: 265
diff changeset
410 ac_val = s->ac_val[0][0] + s->block_index[n] * 16;
265
4e9e728021d8 use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents: 264
diff changeset
411 ac_val1= ac_val;
4e9e728021d8 use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents: 264
diff changeset
412 if(dir[n]){
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1176
diff changeset
413 const int xy= s->mb_x + s->mb_y*s->mb_stride - s->mb_stride;
692
852b5a416161 fixing ac prediction encoding with adaptive quantization
michaelni
parents: 690
diff changeset
414 /* top prediction */
266
252444e5259b optimization
michaelni
parents: 265
diff changeset
415 ac_val-= s->block_wrap[n]*16;
903
22ee74da2cd3 cleanup
michaelni
parents: 892
diff changeset
416 if(s->mb_y==0 || s->qscale == qscale_table[xy] || n==2 || n==3){
692
852b5a416161 fixing ac prediction encoding with adaptive quantization
michaelni
parents: 690
diff changeset
417 /* same qscale */
852b5a416161 fixing ac prediction encoding with adaptive quantization
michaelni
parents: 690
diff changeset
418 for(i=1; i<8; i++){
1092
f59c3f66363b MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
michaelni
parents: 1090
diff changeset
419 const int level= block[n][s->dsp.idct_permutation[i ]];
1492
3518325146fc ac prediction cleanup
michaelni
parents: 1490
diff changeset
420 block[n][s->dsp.idct_permutation[i ]] = level - ac_val[i+8];
1092
f59c3f66363b MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
michaelni
parents: 1090
diff changeset
421 ac_val1[i ]= block[n][s->dsp.idct_permutation[i<<3]];
692
852b5a416161 fixing ac prediction encoding with adaptive quantization
michaelni
parents: 690
diff changeset
422 ac_val1[i+8]= level;
852b5a416161 fixing ac prediction encoding with adaptive quantization
michaelni
parents: 690
diff changeset
423 }
852b5a416161 fixing ac prediction encoding with adaptive quantization
michaelni
parents: 690
diff changeset
424 }else{
852b5a416161 fixing ac prediction encoding with adaptive quantization
michaelni
parents: 690
diff changeset
425 /* different qscale, we must rescale */
852b5a416161 fixing ac prediction encoding with adaptive quantization
michaelni
parents: 690
diff changeset
426 for(i=1; i<8; i++){
1092
f59c3f66363b MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
michaelni
parents: 1090
diff changeset
427 const int level= block[n][s->dsp.idct_permutation[i ]];
1492
3518325146fc ac prediction cleanup
michaelni
parents: 1490
diff changeset
428 block[n][s->dsp.idct_permutation[i ]] = level - ROUNDED_DIV(ac_val[i + 8]*qscale_table[xy], s->qscale);
1092
f59c3f66363b MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
michaelni
parents: 1090
diff changeset
429 ac_val1[i ]= block[n][s->dsp.idct_permutation[i<<3]];
692
852b5a416161 fixing ac prediction encoding with adaptive quantization
michaelni
parents: 690
diff changeset
430 ac_val1[i+8]= level;
852b5a416161 fixing ac prediction encoding with adaptive quantization
michaelni
parents: 690
diff changeset
431 }
265
4e9e728021d8 use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents: 264
diff changeset
432 }
1492
3518325146fc ac prediction cleanup
michaelni
parents: 1490
diff changeset
433 st[n]= s->intra_h_scantable.permutated;
265
4e9e728021d8 use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents: 264
diff changeset
434 }else{
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1176
diff changeset
435 const int xy= s->mb_x-1 + s->mb_y*s->mb_stride;
692
852b5a416161 fixing ac prediction encoding with adaptive quantization
michaelni
parents: 690
diff changeset
436 /* left prediction */
265
4e9e728021d8 use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents: 264
diff changeset
437 ac_val-= 16;
903
22ee74da2cd3 cleanup
michaelni
parents: 892
diff changeset
438 if(s->mb_x==0 || s->qscale == qscale_table[xy] || n==1 || n==3){
692
852b5a416161 fixing ac prediction encoding with adaptive quantization
michaelni
parents: 690
diff changeset
439 /* same qscale */
852b5a416161 fixing ac prediction encoding with adaptive quantization
michaelni
parents: 690
diff changeset
440 for(i=1; i<8; i++){
1092
f59c3f66363b MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
michaelni
parents: 1090
diff changeset
441 const int level= block[n][s->dsp.idct_permutation[i<<3]];
1492
3518325146fc ac prediction cleanup
michaelni
parents: 1490
diff changeset
442 block[n][s->dsp.idct_permutation[i<<3]]= level - ac_val[i];
692
852b5a416161 fixing ac prediction encoding with adaptive quantization
michaelni
parents: 690
diff changeset
443 ac_val1[i ]= level;
1092
f59c3f66363b MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
michaelni
parents: 1090
diff changeset
444 ac_val1[i+8]= block[n][s->dsp.idct_permutation[i ]];
692
852b5a416161 fixing ac prediction encoding with adaptive quantization
michaelni
parents: 690
diff changeset
445 }
852b5a416161 fixing ac prediction encoding with adaptive quantization
michaelni
parents: 690
diff changeset
446 }else{
852b5a416161 fixing ac prediction encoding with adaptive quantization
michaelni
parents: 690
diff changeset
447 /* different qscale, we must rescale */
852b5a416161 fixing ac prediction encoding with adaptive quantization
michaelni
parents: 690
diff changeset
448 for(i=1; i<8; i++){
1092
f59c3f66363b MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
michaelni
parents: 1090
diff changeset
449 const int level= block[n][s->dsp.idct_permutation[i<<3]];
1492
3518325146fc ac prediction cleanup
michaelni
parents: 1490
diff changeset
450 block[n][s->dsp.idct_permutation[i<<3]]= level - ROUNDED_DIV(ac_val[i]*qscale_table[xy], s->qscale);
692
852b5a416161 fixing ac prediction encoding with adaptive quantization
michaelni
parents: 690
diff changeset
451 ac_val1[i ]= level;
1092
f59c3f66363b MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
michaelni
parents: 1090
diff changeset
452 ac_val1[i+8]= block[n][s->dsp.idct_permutation[i ]];
692
852b5a416161 fixing ac prediction encoding with adaptive quantization
michaelni
parents: 690
diff changeset
453 }
265
4e9e728021d8 use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents: 264
diff changeset
454 }
1492
3518325146fc ac prediction cleanup
michaelni
parents: 1490
diff changeset
455 st[n]= s->intra_v_scantable.permutated;
3518325146fc ac prediction cleanup
michaelni
parents: 1490
diff changeset
456 }
3518325146fc ac prediction cleanup
michaelni
parents: 1490
diff changeset
457
3518325146fc ac prediction cleanup
michaelni
parents: 1490
diff changeset
458 for(i=63; i>0; i--) //FIXME optimize
3518325146fc ac prediction cleanup
michaelni
parents: 1490
diff changeset
459 if(block[n][ st[n][i] ]) break;
3518325146fc ac prediction cleanup
michaelni
parents: 1490
diff changeset
460 s->block_last_index[n]= i;
3518325146fc ac prediction cleanup
michaelni
parents: 1490
diff changeset
461
3518325146fc ac prediction cleanup
michaelni
parents: 1490
diff changeset
462 score += get_block_rate(s, block[n], s->block_last_index[n], st[n]);
3518325146fc ac prediction cleanup
michaelni
parents: 1490
diff changeset
463 }
3518325146fc ac prediction cleanup
michaelni
parents: 1490
diff changeset
464
3518325146fc ac prediction cleanup
michaelni
parents: 1490
diff changeset
465 return score < 0;
3518325146fc ac prediction cleanup
michaelni
parents: 1490
diff changeset
466 }
3518325146fc ac prediction cleanup
michaelni
parents: 1490
diff changeset
467
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
468 /**
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
469 * 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
470 */
695
3525da287ee2 adaptive quantization for h263
michaelni
parents: 692
diff changeset
471 void ff_clean_h263_qscales(MpegEncContext *s){
690
a1c69cb685b3 adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents: 676
diff changeset
472 int i;
903
22ee74da2cd3 cleanup
michaelni
parents: 892
diff changeset
473 int8_t * const qscale_table= s->current_picture.qscale_table;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
474
4316
fabb67829f3f dont randomly disallow intr4v in adaptive quant
michael
parents: 4315
diff changeset
475 ff_init_qscale_tab(s);
fabb67829f3f dont randomly disallow intr4v in adaptive quant
michael
parents: 4315
diff changeset
476
690
a1c69cb685b3 adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents: 676
diff changeset
477 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
478 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
479 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
480 }
a1c69cb685b3 adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents: 676
diff changeset
481 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
482 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
483 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
484 }
1983
1205bf58c420 H.263 MCBPC fix
michael
parents: 1976
diff changeset
485
1205bf58c420 H.263 MCBPC fix
michael
parents: 1976
diff changeset
486 if(s->codec_id != CODEC_ID_H263P){
1205bf58c420 H.263 MCBPC fix
michael
parents: 1976
diff changeset
487 for(i=1; i<s->mb_num; i++){
1205bf58c420 H.263 MCBPC fix
michael
parents: 1976
diff changeset
488 int mb_xy= s->mb_index2xy[i];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
489
1983
1205bf58c420 H.263 MCBPC fix
michael
parents: 1976
diff changeset
490 if(qscale_table[mb_xy] != qscale_table[s->mb_index2xy[i-1]] && (s->mb_type[mb_xy]&CANDIDATE_MB_TYPE_INTER4V)){
1205bf58c420 H.263 MCBPC fix
michael
parents: 1976
diff changeset
491 s->mb_type[mb_xy]|= CANDIDATE_MB_TYPE_INTER;
1205bf58c420 H.263 MCBPC fix
michael
parents: 1976
diff changeset
492 }
1205bf58c420 H.263 MCBPC fix
michael
parents: 1976
diff changeset
493 }
1205bf58c420 H.263 MCBPC fix
michael
parents: 1976
diff changeset
494 }
695
3525da287ee2 adaptive quantization for h263
michaelni
parents: 692
diff changeset
495 }
3525da287ee2 adaptive quantization for h263
michaelni
parents: 692
diff changeset
496
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
497 /**
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
498 * 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
499 */
695
3525da287ee2 adaptive quantization for h263
michaelni
parents: 692
diff changeset
500 void ff_clean_mpeg4_qscales(MpegEncContext *s){
3525da287ee2 adaptive quantization for h263
michaelni
parents: 692
diff changeset
501 int i;
903
22ee74da2cd3 cleanup
michaelni
parents: 892
diff changeset
502 int8_t * const qscale_table= s->current_picture.qscale_table;
22ee74da2cd3 cleanup
michaelni
parents: 892
diff changeset
503
695
3525da287ee2 adaptive quantization for h263
michaelni
parents: 692
diff changeset
504 ff_clean_h263_qscales(s);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
505
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6211
diff changeset
506 if(s->pict_type== FF_B_TYPE){
690
a1c69cb685b3 adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents: 676
diff changeset
507 int odd=0;
2646
c735e3e60ca7 Even More spelling errors. patch by (Kevin Baragona <kevinmb500 gawab com)
michael
parents: 2639
diff changeset
508 /* ok, come on, this isn't funny anymore, there's more code for handling this mpeg4 mess than for the actual adaptive quantization */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
509
690
a1c69cb685b3 adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents: 676
diff changeset
510 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
511 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
512 odd += qscale_table[mb_xy]&1;
690
a1c69cb685b3 adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents: 676
diff changeset
513 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
514
690
a1c69cb685b3 adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents: 676
diff changeset
515 if(2*odd > s->mb_num) odd=1;
a1c69cb685b3 adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents: 676
diff changeset
516 else odd=0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
517
690
a1c69cb685b3 adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents: 676
diff changeset
518 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
519 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
520 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
521 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
522 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
523 qscale_table[mb_xy]= 31;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
524 }
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
525
690
a1c69cb685b3 adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents: 676
diff changeset
526 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
527 int mb_xy= s->mb_index2xy[i];
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1701
diff changeset
528 if(qscale_table[mb_xy] != qscale_table[s->mb_index2xy[i-1]] && (s->mb_type[mb_xy]&CANDIDATE_MB_TYPE_DIRECT)){
dea5b2946999 interlaced motion estimation
michael
parents: 1701
diff changeset
529 s->mb_type[mb_xy]|= CANDIDATE_MB_TYPE_BIDIR;
690
a1c69cb685b3 adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents: 676
diff changeset
530 }
a1c69cb685b3 adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents: 676
diff changeset
531 }
a1c69cb685b3 adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents: 676
diff changeset
532 }
a1c69cb685b3 adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents: 676
diff changeset
533 }
a1c69cb685b3 adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents: 676
diff changeset
534
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
535 #endif //CONFIG_ENCODERS
3247
ac7bfc9bf1a4 2x faster ff_mpeg4_set_direct_mv
lorenm
parents: 3205
diff changeset
536
8042
e70975d5ff80 uses FF_ARRAY_ELEMS() where appropriate
aurel
parents: 7831
diff changeset
537 #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
538 #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
539
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
540 void ff_mpeg4_init_direct_mv(MpegEncContext *s){
3247
ac7bfc9bf1a4 2x faster ff_mpeg4_set_direct_mv
lorenm
parents: 3205
diff changeset
541 int i;
ac7bfc9bf1a4 2x faster ff_mpeg4_set_direct_mv
lorenm
parents: 3205
diff changeset
542 for(i=0; i<tab_size; i++){
ac7bfc9bf1a4 2x faster ff_mpeg4_set_direct_mv
lorenm
parents: 3205
diff changeset
543 s->direct_scale_mv[0][i] = (i-tab_bias)*s->pb_time/s->pp_time;
ac7bfc9bf1a4 2x faster ff_mpeg4_set_direct_mv
lorenm
parents: 3205
diff changeset
544 s->direct_scale_mv[1][i] = (i-tab_bias)*(s->pb_time-s->pp_time)/s->pp_time;
ac7bfc9bf1a4 2x faster ff_mpeg4_set_direct_mv
lorenm
parents: 3205
diff changeset
545 }
ac7bfc9bf1a4 2x faster ff_mpeg4_set_direct_mv
lorenm
parents: 3205
diff changeset
546 }
ac7bfc9bf1a4 2x faster ff_mpeg4_set_direct_mv
lorenm
parents: 3205
diff changeset
547
ac7bfc9bf1a4 2x faster ff_mpeg4_set_direct_mv
lorenm
parents: 3205
diff changeset
548 static inline void ff_mpeg4_set_one_direct_mv(MpegEncContext *s, int mx, int my, int i){
ac7bfc9bf1a4 2x faster ff_mpeg4_set_direct_mv
lorenm
parents: 3205
diff changeset
549 int xy= s->block_index[i];
ac7bfc9bf1a4 2x faster ff_mpeg4_set_direct_mv
lorenm
parents: 3205
diff changeset
550 uint16_t time_pp= s->pp_time;
ac7bfc9bf1a4 2x faster ff_mpeg4_set_direct_mv
lorenm
parents: 3205
diff changeset
551 uint16_t time_pb= s->pb_time;
ac7bfc9bf1a4 2x faster ff_mpeg4_set_direct_mv
lorenm
parents: 3205
diff changeset
552 int p_mx, p_my;
ac7bfc9bf1a4 2x faster ff_mpeg4_set_direct_mv
lorenm
parents: 3205
diff changeset
553
ac7bfc9bf1a4 2x faster ff_mpeg4_set_direct_mv
lorenm
parents: 3205
diff changeset
554 p_mx= s->next_picture.motion_val[0][xy][0];
ac7bfc9bf1a4 2x faster ff_mpeg4_set_direct_mv
lorenm
parents: 3205
diff changeset
555 if((unsigned)(p_mx + tab_bias) < tab_size){
ac7bfc9bf1a4 2x faster ff_mpeg4_set_direct_mv
lorenm
parents: 3205
diff changeset
556 s->mv[0][i][0] = s->direct_scale_mv[0][p_mx + tab_bias] + mx;
ac7bfc9bf1a4 2x faster ff_mpeg4_set_direct_mv
lorenm
parents: 3205
diff changeset
557 s->mv[1][i][0] = mx ? s->mv[0][i][0] - p_mx
ac7bfc9bf1a4 2x faster ff_mpeg4_set_direct_mv
lorenm
parents: 3205
diff changeset
558 : s->direct_scale_mv[1][p_mx + tab_bias];
ac7bfc9bf1a4 2x faster ff_mpeg4_set_direct_mv
lorenm
parents: 3205
diff changeset
559 }else{
ac7bfc9bf1a4 2x faster ff_mpeg4_set_direct_mv
lorenm
parents: 3205
diff changeset
560 s->mv[0][i][0] = p_mx*time_pb/time_pp + mx;
ac7bfc9bf1a4 2x faster ff_mpeg4_set_direct_mv
lorenm
parents: 3205
diff changeset
561 s->mv[1][i][0] = mx ? s->mv[0][i][0] - p_mx
ac7bfc9bf1a4 2x faster ff_mpeg4_set_direct_mv
lorenm
parents: 3205
diff changeset
562 : p_mx*(time_pb - time_pp)/time_pp;
ac7bfc9bf1a4 2x faster ff_mpeg4_set_direct_mv
lorenm
parents: 3205
diff changeset
563 }
ac7bfc9bf1a4 2x faster ff_mpeg4_set_direct_mv
lorenm
parents: 3205
diff changeset
564 p_my= s->next_picture.motion_val[0][xy][1];
ac7bfc9bf1a4 2x faster ff_mpeg4_set_direct_mv
lorenm
parents: 3205
diff changeset
565 if((unsigned)(p_my + tab_bias) < tab_size){
ac7bfc9bf1a4 2x faster ff_mpeg4_set_direct_mv
lorenm
parents: 3205
diff changeset
566 s->mv[0][i][1] = s->direct_scale_mv[0][p_my + tab_bias] + my;
ac7bfc9bf1a4 2x faster ff_mpeg4_set_direct_mv
lorenm
parents: 3205
diff changeset
567 s->mv[1][i][1] = my ? s->mv[0][i][1] - p_my
ac7bfc9bf1a4 2x faster ff_mpeg4_set_direct_mv
lorenm
parents: 3205
diff changeset
568 : s->direct_scale_mv[1][p_my + tab_bias];
ac7bfc9bf1a4 2x faster ff_mpeg4_set_direct_mv
lorenm
parents: 3205
diff changeset
569 }else{
ac7bfc9bf1a4 2x faster ff_mpeg4_set_direct_mv
lorenm
parents: 3205
diff changeset
570 s->mv[0][i][1] = p_my*time_pb/time_pp + my;
ac7bfc9bf1a4 2x faster ff_mpeg4_set_direct_mv
lorenm
parents: 3205
diff changeset
571 s->mv[1][i][1] = my ? s->mv[0][i][1] - p_my
ac7bfc9bf1a4 2x faster ff_mpeg4_set_direct_mv
lorenm
parents: 3205
diff changeset
572 : p_my*(time_pb - time_pp)/time_pp;
ac7bfc9bf1a4 2x faster ff_mpeg4_set_direct_mv
lorenm
parents: 3205
diff changeset
573 }
ac7bfc9bf1a4 2x faster ff_mpeg4_set_direct_mv
lorenm
parents: 3205
diff changeset
574 }
ac7bfc9bf1a4 2x faster ff_mpeg4_set_direct_mv
lorenm
parents: 3205
diff changeset
575
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
576 #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
577 #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
578
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
579 /**
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1176
diff changeset
580 *
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1176
diff changeset
581 * @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
582 */
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1176
diff changeset
583 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
584 const int mb_index= s->mb_x + s->mb_y*s->mb_stride;
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1701
diff changeset
585 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
586 uint16_t time_pp;
fb240cb99bcf Remove useless init from ff_mpeg4_set_direct_mv() found by CSA.
michael
parents: 9481
diff changeset
587 uint16_t time_pb;
936
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
588 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
589
936
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
590 //FIXME avoid divides
3247
ac7bfc9bf1a4 2x faster ff_mpeg4_set_direct_mv
lorenm
parents: 3205
diff changeset
591 // try special case with shifts for 1 and 3 B-frames?
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
592
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
593 if(IS_8X8(colocated_mb_type)){
936
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
594 s->mv_type = MV_TYPE_8X8;
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
595 for(i=0; i<4; i++){
3247
ac7bfc9bf1a4 2x faster ff_mpeg4_set_direct_mv
lorenm
parents: 3205
diff changeset
596 ff_mpeg4_set_one_direct_mv(s, mx, my, i);
936
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
597 }
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1176
diff changeset
598 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
599 } else if(IS_INTERLACED(colocated_mb_type)){
936
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
600 s->mv_type = MV_TYPE_FIELD;
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
601 for(i=0; i<2; i++){
1948
d10578f7fd40 exporting field_select/ref_index values
michael
parents: 1944
diff changeset
602 int field_select= s->next_picture.ref_index[0][s->block_index[2*i]];
3205
198f8b01424d fixing interlaced direct mode field select values
michael
parents: 3192
diff changeset
603 s->field_select[0][i]= field_select;
198f8b01424d fixing interlaced direct mode field select values
michael
parents: 3192
diff changeset
604 s->field_select[1][i]= i;
936
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
605 if(s->top_field_first){
1948
d10578f7fd40 exporting field_select/ref_index values
michael
parents: 1944
diff changeset
606 time_pp= s->pp_field_time - field_select + i;
d10578f7fd40 exporting field_select/ref_index values
michael
parents: 1944
diff changeset
607 time_pb= s->pb_field_time - field_select + i;
936
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
608 }else{
1948
d10578f7fd40 exporting field_select/ref_index values
michael
parents: 1944
diff changeset
609 time_pp= s->pp_field_time + field_select - i;
d10578f7fd40 exporting field_select/ref_index values
michael
parents: 1944
diff changeset
610 time_pb= s->pb_field_time + field_select - i;
936
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
611 }
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1701
diff changeset
612 s->mv[0][i][0] = s->p_field_mv_table[i][0][mb_index][0]*time_pb/time_pp + mx;
dea5b2946999 interlaced motion estimation
michael
parents: 1701
diff changeset
613 s->mv[0][i][1] = s->p_field_mv_table[i][0][mb_index][1]*time_pb/time_pp + my;
dea5b2946999 interlaced motion estimation
michael
parents: 1701
diff changeset
614 s->mv[1][i][0] = mx ? s->mv[0][i][0] - s->p_field_mv_table[i][0][mb_index][0]
dea5b2946999 interlaced motion estimation
michael
parents: 1701
diff changeset
615 : s->p_field_mv_table[i][0][mb_index][0]*(time_pb - time_pp)/time_pp;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
616 s->mv[1][i][1] = my ? s->mv[0][i][1] - s->p_field_mv_table[i][0][mb_index][1]
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1701
diff changeset
617 : s->p_field_mv_table[i][0][mb_index][1]*(time_pb - time_pp)/time_pp;
936
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
618 }
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
619 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
620 }else{
3247
ac7bfc9bf1a4 2x faster ff_mpeg4_set_direct_mv
lorenm
parents: 3205
diff changeset
621 ff_mpeg4_set_one_direct_mv(s, mx, my, 0);
ac7bfc9bf1a4 2x faster ff_mpeg4_set_direct_mv
lorenm
parents: 3205
diff changeset
622 s->mv[0][1][0] = s->mv[0][2][0] = s->mv[0][3][0] = s->mv[0][0][0];
ac7bfc9bf1a4 2x faster ff_mpeg4_set_direct_mv
lorenm
parents: 3205
diff changeset
623 s->mv[0][1][1] = s->mv[0][2][1] = s->mv[0][3][1] = s->mv[0][0][1];
ac7bfc9bf1a4 2x faster ff_mpeg4_set_direct_mv
lorenm
parents: 3205
diff changeset
624 s->mv[1][1][0] = s->mv[1][2][0] = s->mv[1][3][0] = s->mv[1][0][0];
ac7bfc9bf1a4 2x faster ff_mpeg4_set_direct_mv
lorenm
parents: 3205
diff changeset
625 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
626 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
627 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
628 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
629 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
630 return MB_TYPE_DIRECT2 | MB_TYPE_16x16 | MB_TYPE_L0L1; //Note see prev line
936
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
631 }
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
632 }
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
633
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1366
diff changeset
634 void ff_h263_update_motion_val(MpegEncContext * s){
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1366
diff changeset
635 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
636 //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
637 const int wrap = s->b8_stride;
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1366
diff changeset
638 const int xy = s->block_index[0];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
639
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
640 s->current_picture.mbskip_table[mb_xy]= s->mb_skipped;
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1366
diff changeset
641
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1366
diff changeset
642 if(s->mv_type != MV_TYPE_8X8){
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1366
diff changeset
643 int motion_x, motion_y;
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1366
diff changeset
644 if (s->mb_intra) {
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1366
diff changeset
645 motion_x = 0;
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1366
diff changeset
646 motion_y = 0;
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1366
diff changeset
647 } else if (s->mv_type == MV_TYPE_16X16) {
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1366
diff changeset
648 motion_x = s->mv[0][0][0];
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1366
diff changeset
649 motion_y = s->mv[0][0][1];
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1366
diff changeset
650 } else /*if (s->mv_type == MV_TYPE_FIELD)*/ {
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1366
diff changeset
651 int i;
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1366
diff changeset
652 motion_x = s->mv[0][0][0] + s->mv[0][1][0];
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1366
diff changeset
653 motion_y = s->mv[0][0][1] + s->mv[0][1][1];
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1366
diff changeset
654 motion_x = (motion_x>>1) | (motion_x&1);
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1366
diff changeset
655 for(i=0; i<2; i++){
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1701
diff changeset
656 s->p_field_mv_table[i][0][mb_xy][0]= s->mv[0][i][0];
dea5b2946999 interlaced motion estimation
michael
parents: 1701
diff changeset
657 s->p_field_mv_table[i][0][mb_xy][1]= s->mv[0][i][1];
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1366
diff changeset
658 }
1948
d10578f7fd40 exporting field_select/ref_index values
michael
parents: 1944
diff changeset
659 s->current_picture.ref_index[0][xy ]=
d10578f7fd40 exporting field_select/ref_index values
michael
parents: 1944
diff changeset
660 s->current_picture.ref_index[0][xy + 1]= s->field_select[0][0];
d10578f7fd40 exporting field_select/ref_index values
michael
parents: 1944
diff changeset
661 s->current_picture.ref_index[0][xy + wrap ]=
d10578f7fd40 exporting field_select/ref_index values
michael
parents: 1944
diff changeset
662 s->current_picture.ref_index[0][xy + wrap + 1]= s->field_select[0][1];
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1366
diff changeset
663 }
1948
d10578f7fd40 exporting field_select/ref_index values
michael
parents: 1944
diff changeset
664
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1366
diff changeset
665 /* 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
666 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
667 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
668 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
669 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
670 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
671 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
672 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
673 s->current_picture.motion_val[0][xy + 1 + wrap][1] = motion_y;
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1366
diff changeset
674 }
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1366
diff changeset
675
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1366
diff changeset
676 if(s->encoding){ //FIXME encoding MUST be cleaned up
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
677 if (s->mv_type == MV_TYPE_8X8)
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1366
diff changeset
678 s->current_picture.mb_type[mb_xy]= MB_TYPE_L0 | MB_TYPE_8x8;
1633
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
679 else if(s->mb_intra)
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
680 s->current_picture.mb_type[mb_xy]= MB_TYPE_INTRA;
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1366
diff changeset
681 else
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1366
diff changeset
682 s->current_picture.mb_type[mb_xy]= MB_TYPE_L0 | MB_TYPE_16x16;
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1366
diff changeset
683 }
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1366
diff changeset
684 }
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1366
diff changeset
685
10754
15144b93a64f 10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents: 10753
diff changeset
686 /**
15144b93a64f 10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents: 10753
diff changeset
687 * predicts the dc.
15144b93a64f 10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents: 10753
diff changeset
688 * encoding quantized level -> quantized diff
15144b93a64f 10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents: 10753
diff changeset
689 * decoding quantized diff -> quantized level
15144b93a64f 10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents: 10753
diff changeset
690 * @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
691 * @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
692 */
15144b93a64f 10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents: 10753
diff changeset
693 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
694 {
15144b93a64f 10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents: 10753
diff changeset
695 int a, b, c, wrap, pred, scale, ret;
15144b93a64f 10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents: 10753
diff changeset
696 int16_t *dc_val;
15144b93a64f 10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents: 10753
diff changeset
697
15144b93a64f 10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents: 10753
diff changeset
698 /* find prediction */
15144b93a64f 10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents: 10753
diff changeset
699 if (n < 4) {
15144b93a64f 10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents: 10753
diff changeset
700 scale = s->y_dc_scale;
15144b93a64f 10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents: 10753
diff changeset
701 } else {
15144b93a64f 10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents: 10753
diff changeset
702 scale = s->c_dc_scale;
15144b93a64f 10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents: 10753
diff changeset
703 }
15144b93a64f 10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents: 10753
diff changeset
704 if(IS_3IV1)
15144b93a64f 10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents: 10753
diff changeset
705 scale= 8;
15144b93a64f 10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents: 10753
diff changeset
706
15144b93a64f 10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents: 10753
diff changeset
707 wrap= s->block_wrap[n];
15144b93a64f 10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents: 10753
diff changeset
708 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
709
15144b93a64f 10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents: 10753
diff changeset
710 /* B C
15144b93a64f 10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents: 10753
diff changeset
711 * A X
15144b93a64f 10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents: 10753
diff changeset
712 */
15144b93a64f 10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents: 10753
diff changeset
713 a = dc_val[ - 1];
15144b93a64f 10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents: 10753
diff changeset
714 b = dc_val[ - 1 - wrap];
15144b93a64f 10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents: 10753
diff changeset
715 c = dc_val[ - wrap];
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 /* 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
718 if(s->first_slice_line && n!=3){
15144b93a64f 10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents: 10753
diff changeset
719 if(n!=2) b=c= 1024;
15144b93a64f 10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents: 10753
diff changeset
720 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
721 }
15144b93a64f 10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents: 10753
diff changeset
722 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
723 if(n==0 || n==4 || n==5)
15144b93a64f 10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents: 10753
diff changeset
724 b=1024;
15144b93a64f 10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents: 10753
diff changeset
725 }
15144b93a64f 10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents: 10753
diff changeset
726
15144b93a64f 10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents: 10753
diff changeset
727 if (abs(a - b) < abs(b - c)) {
15144b93a64f 10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents: 10753
diff changeset
728 pred = c;
15144b93a64f 10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents: 10753
diff changeset
729 *dir_ptr = 1; /* top */
15144b93a64f 10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents: 10753
diff changeset
730 } else {
15144b93a64f 10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents: 10753
diff changeset
731 pred = a;
15144b93a64f 10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents: 10753
diff changeset
732 *dir_ptr = 0; /* left */
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 /* we assume pred is positive */
15144b93a64f 10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents: 10753
diff changeset
735 pred = FASTDIV((pred + (scale >> 1)), scale);
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 if(encoding){
15144b93a64f 10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents: 10753
diff changeset
738 ret = level - pred;
15144b93a64f 10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents: 10753
diff changeset
739 }else{
15144b93a64f 10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents: 10753
diff changeset
740 level += pred;
15144b93a64f 10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents: 10753
diff changeset
741 ret= level;
15144b93a64f 10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents: 10753
diff changeset
742 if(s->error_recognition>=3){
15144b93a64f 10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents: 10753
diff changeset
743 if(level<0){
15144b93a64f 10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents: 10753
diff changeset
744 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
745 return -1;
15144b93a64f 10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents: 10753
diff changeset
746 }
15144b93a64f 10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents: 10753
diff changeset
747 if(level*scale > 2048 + scale){
15144b93a64f 10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents: 10753
diff changeset
748 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
749 return -1;
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 }
15144b93a64f 10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents: 10753
diff changeset
752 }
15144b93a64f 10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents: 10753
diff changeset
753 level *=scale;
15144b93a64f 10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents: 10753
diff changeset
754 if(level&(~2047)){
15144b93a64f 10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents: 10753
diff changeset
755 if(level<0)
15144b93a64f 10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents: 10753
diff changeset
756 level=0;
15144b93a64f 10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents: 10753
diff changeset
757 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
758 level=2047;
15144b93a64f 10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents: 10753
diff changeset
759 }
15144b93a64f 10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents: 10753
diff changeset
760 dc_val[0]= level;
15144b93a64f 10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents: 10753
diff changeset
761
15144b93a64f 10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents: 10753
diff changeset
762 return ret;
15144b93a64f 10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents: 10753
diff changeset
763 }
15144b93a64f 10l: Move ff_mpeg4_pred_dc() to an appropriate place.
diego
parents: 10753
diff changeset
764
8590
7a463923ecd1 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 8418
diff changeset
765 #if CONFIG_ENCODERS
1490
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1483
diff changeset
766
10755
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
767 /**
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
768 * encodes the dc value.
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
769 * @param n block index (0-3 are luma, 4-5 are chroma)
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
770 */
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
771 static inline void mpeg4_encode_dc(PutBitContext * s, int level, int n)
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
772 {
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
773 #if 1
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
774 level+=256;
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
775 if (n < 4) {
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
776 /* luminance */
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
777 put_bits(s, uni_DCtab_lum_len[level], uni_DCtab_lum_bits[level]);
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
778 } else {
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
779 /* chrominance */
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
780 put_bits(s, uni_DCtab_chrom_len[level], uni_DCtab_chrom_bits[level]);
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
781 }
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
782 #else
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
783 int size, v;
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
784 /* find number of bits */
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
785 size = 0;
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
786 v = abs(level);
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
787 while (v) {
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
788 v >>= 1;
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
789 size++;
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
790 }
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
791
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
792 if (n < 4) {
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
793 /* luminance */
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
794 put_bits(&s->pb, DCtab_lum[size][1], DCtab_lum[size][0]);
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
795 } else {
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
796 /* chrominance */
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
797 put_bits(&s->pb, DCtab_chrom[size][1], DCtab_chrom[size][0]);
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
798 }
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
799
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
800 /* encode remaining bits */
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
801 if (size > 0) {
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
802 if (level < 0)
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
803 level = (-level) ^ ((1 << size) - 1);
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
804 put_bits(&s->pb, size, level);
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
805 if (size > 8)
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
806 put_bits(&s->pb, 1, 1);
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
807 }
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
808 #endif
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
809 }
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
810
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
811 static inline int mpeg4_get_dc_length(int level, int n){
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
812 if (n < 4) {
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
813 return uni_DCtab_lum_len[level + 256];
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
814 } else {
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
815 return uni_DCtab_chrom_len[level + 256];
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
816 }
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
817 }
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
818
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
819 /**
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
820 * encodes a 8x8 block
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
821 * @param n block index (0-3 are luma, 4-5 are chroma)
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
822 */
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
823 static inline void mpeg4_encode_block(MpegEncContext * s, DCTELEM * block, int n, int intra_dc,
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
824 uint8_t *scan_table, PutBitContext *dc_pb, PutBitContext *ac_pb)
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
825 {
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
826 int i, last_non_zero;
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
827 #if 0 //variables for the outcommented version
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
828 int code, sign, last;
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
829 #endif
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
830 const RLTable *rl;
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
831 uint32_t *bits_tab;
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
832 uint8_t *len_tab;
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
833 const int last_index = s->block_last_index[n];
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
834
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
835 if (s->mb_intra) { //Note gcc (3.2.1 at least) will optimize this away
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
836 /* mpeg4 based DC predictor */
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
837 mpeg4_encode_dc(dc_pb, intra_dc, n);
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
838 if(last_index<1) return;
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
839 i = 1;
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
840 rl = &rl_intra;
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
841 bits_tab= uni_mpeg4_intra_rl_bits;
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
842 len_tab = uni_mpeg4_intra_rl_len;
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
843 } else {
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
844 if(last_index<0) return;
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
845 i = 0;
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
846 rl = &rl_inter;
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
847 bits_tab= uni_mpeg4_inter_rl_bits;
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
848 len_tab = uni_mpeg4_inter_rl_len;
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
849 }
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
850
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
851 /* AC coefs */
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
852 last_non_zero = i - 1;
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
853 #if 1
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
854 for (; i < last_index; i++) {
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
855 int level = block[ scan_table[i] ];
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
856 if (level) {
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
857 int run = i - last_non_zero - 1;
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
858 level+=64;
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
859 if((level&(~127)) == 0){
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
860 const int index= UNI_MPEG4_ENC_INDEX(0, run, level);
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
861 put_bits(ac_pb, len_tab[index], bits_tab[index]);
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
862 }else{ //ESC3
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
863 put_bits(ac_pb, 7+2+1+6+1+12+1, (3<<23)+(3<<21)+(0<<20)+(run<<14)+(1<<13)+(((level-64)&0xfff)<<1)+1);
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
864 }
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
865 last_non_zero = i;
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
866 }
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
867 }
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
868 /*if(i<=last_index)*/{
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
869 int level = block[ scan_table[i] ];
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
870 int run = i - last_non_zero - 1;
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
871 level+=64;
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
872 if((level&(~127)) == 0){
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
873 const int index= UNI_MPEG4_ENC_INDEX(1, run, level);
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
874 put_bits(ac_pb, len_tab[index], bits_tab[index]);
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
875 }else{ //ESC3
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
876 put_bits(ac_pb, 7+2+1+6+1+12+1, (3<<23)+(3<<21)+(1<<20)+(run<<14)+(1<<13)+(((level-64)&0xfff)<<1)+1);
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
877 }
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
878 }
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
879 #else
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
880 for (; i <= last_index; i++) {
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
881 const int slevel = block[ scan_table[i] ];
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
882 if (slevel) {
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
883 int level;
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
884 int run = i - last_non_zero - 1;
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
885 last = (i == last_index);
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
886 sign = 0;
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
887 level = slevel;
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
888 if (level < 0) {
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
889 sign = 1;
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
890 level = -level;
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
891 }
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
892 code = get_rl_index(rl, last, run, level);
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
893 put_bits(ac_pb, rl->table_vlc[code][1], rl->table_vlc[code][0]);
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
894 if (code == rl->n) {
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
895 int level1, run1;
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
896 level1 = level - rl->max_level[last][run];
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
897 if (level1 < 1)
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
898 goto esc2;
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
899 code = get_rl_index(rl, last, run, level1);
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
900 if (code == rl->n) {
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
901 esc2:
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
902 put_bits(ac_pb, 1, 1);
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
903 if (level > MAX_LEVEL)
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
904 goto esc3;
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
905 run1 = run - rl->max_run[last][level] - 1;
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
906 if (run1 < 0)
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
907 goto esc3;
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
908 code = get_rl_index(rl, last, run1, level);
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
909 if (code == rl->n) {
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
910 esc3:
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
911 /* third escape */
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
912 put_bits(ac_pb, 1, 1);
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
913 put_bits(ac_pb, 1, last);
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
914 put_bits(ac_pb, 6, run);
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
915 put_bits(ac_pb, 1, 1);
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
916 put_sbits(ac_pb, 12, slevel);
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
917 put_bits(ac_pb, 1, 1);
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
918 } else {
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
919 /* second escape */
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
920 put_bits(ac_pb, 1, 0);
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
921 put_bits(ac_pb, rl->table_vlc[code][1], rl->table_vlc[code][0]);
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
922 put_bits(ac_pb, 1, sign);
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
923 }
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
924 } else {
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
925 /* first escape */
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
926 put_bits(ac_pb, 1, 0);
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
927 put_bits(ac_pb, rl->table_vlc[code][1], rl->table_vlc[code][0]);
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
928 put_bits(ac_pb, 1, sign);
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
929 }
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
930 } else {
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
931 put_bits(ac_pb, 1, sign);
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
932 }
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
933 last_non_zero = i;
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
934 }
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
935 }
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
936 #endif
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
937 }
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
938
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
939 static int mpeg4_get_block_length(MpegEncContext * s, DCTELEM * block, int n, int intra_dc,
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
940 uint8_t *scan_table)
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
941 {
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
942 int i, last_non_zero;
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
943 uint8_t *len_tab;
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
944 const int last_index = s->block_last_index[n];
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
945 int len=0;
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
946
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
947 if (s->mb_intra) { //Note gcc (3.2.1 at least) will optimize this away
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
948 /* mpeg4 based DC predictor */
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
949 len += mpeg4_get_dc_length(intra_dc, n);
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
950 if(last_index<1) return len;
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
951 i = 1;
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
952 len_tab = uni_mpeg4_intra_rl_len;
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
953 } else {
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
954 if(last_index<0) return 0;
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
955 i = 0;
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
956 len_tab = uni_mpeg4_inter_rl_len;
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
957 }
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
958
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
959 /* AC coefs */
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
960 last_non_zero = i - 1;
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
961 for (; i < last_index; i++) {
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
962 int level = block[ scan_table[i] ];
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
963 if (level) {
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
964 int run = i - last_non_zero - 1;
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
965 level+=64;
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
966 if((level&(~127)) == 0){
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
967 const int index= UNI_MPEG4_ENC_INDEX(0, run, level);
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
968 len += len_tab[index];
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
969 }else{ //ESC3
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
970 len += 7+2+1+6+1+12+1;
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
971 }
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
972 last_non_zero = i;
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
973 }
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
974 }
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
975 /*if(i<=last_index)*/{
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
976 int level = block[ scan_table[i] ];
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
977 int run = i - last_non_zero - 1;
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
978 level+=64;
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
979 if((level&(~127)) == 0){
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
980 const int index= UNI_MPEG4_ENC_INDEX(1, run, level);
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
981 len += len_tab[index];
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
982 }else{ //ESC3
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
983 len += 7+2+1+6+1+12+1;
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
984 }
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
985 }
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
986
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
987 return len;
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
988 }
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
989
2502
f5fe61bd08ac support skiping some bitstream encoding
michael
parents: 2437
diff changeset
990 static inline int h263_get_motion_length(MpegEncContext * s, int val, int f_code){
f5fe61bd08ac support skiping some bitstream encoding
michael
parents: 2437
diff changeset
991 int l, bit_size, code;
f5fe61bd08ac support skiping some bitstream encoding
michael
parents: 2437
diff changeset
992
f5fe61bd08ac support skiping some bitstream encoding
michael
parents: 2437
diff changeset
993 if (val == 0) {
f5fe61bd08ac support skiping some bitstream encoding
michael
parents: 2437
diff changeset
994 return mvtab[0][1];
f5fe61bd08ac support skiping some bitstream encoding
michael
parents: 2437
diff changeset
995 } else {
f5fe61bd08ac support skiping some bitstream encoding
michael
parents: 2437
diff changeset
996 bit_size = f_code - 1;
f5fe61bd08ac support skiping some bitstream encoding
michael
parents: 2437
diff changeset
997 /* modulo encoding */
f5fe61bd08ac support skiping some bitstream encoding
michael
parents: 2437
diff changeset
998 l= INT_BIT - 6 - bit_size;
f5fe61bd08ac support skiping some bitstream encoding
michael
parents: 2437
diff changeset
999 val = (val<<l)>>l;
f5fe61bd08ac support skiping some bitstream encoding
michael
parents: 2437
diff changeset
1000 val--;
f5fe61bd08ac support skiping some bitstream encoding
michael
parents: 2437
diff changeset
1001 code = (val >> bit_size) + 1;
f5fe61bd08ac support skiping some bitstream encoding
michael
parents: 2437
diff changeset
1002
f5fe61bd08ac support skiping some bitstream encoding
michael
parents: 2437
diff changeset
1003 return mvtab[code][1] + 1 + bit_size;
f5fe61bd08ac support skiping some bitstream encoding
michael
parents: 2437
diff changeset
1004 }
f5fe61bd08ac support skiping some bitstream encoding
michael
parents: 2437
diff changeset
1005 }
f5fe61bd08ac support skiping some bitstream encoding
michael
parents: 2437
diff changeset
1006
f5fe61bd08ac support skiping some bitstream encoding
michael
parents: 2437
diff changeset
1007 static inline void ff_h263_encode_motion_vector(MpegEncContext * s, int x, int y, int f_code){
f5fe61bd08ac support skiping some bitstream encoding
michael
parents: 2437
diff changeset
1008 if(s->flags2 & CODEC_FLAG2_NO_OUTPUT){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
1009 skip_put_bits(&s->pb,
2502
f5fe61bd08ac support skiping some bitstream encoding
michael
parents: 2437
diff changeset
1010 h263_get_motion_length(s, x, f_code)
f5fe61bd08ac support skiping some bitstream encoding
michael
parents: 2437
diff changeset
1011 +h263_get_motion_length(s, y, f_code));
f5fe61bd08ac support skiping some bitstream encoding
michael
parents: 2437
diff changeset
1012 }else{
f5fe61bd08ac support skiping some bitstream encoding
michael
parents: 2437
diff changeset
1013 ff_h263_encode_motion(s, x, f_code);
f5fe61bd08ac support skiping some bitstream encoding
michael
parents: 2437
diff changeset
1014 ff_h263_encode_motion(s, y, f_code);
f5fe61bd08ac support skiping some bitstream encoding
michael
parents: 2437
diff changeset
1015 }
f5fe61bd08ac support skiping some bitstream encoding
michael
parents: 2437
diff changeset
1016 }
f5fe61bd08ac support skiping some bitstream encoding
michael
parents: 2437
diff changeset
1017
1490
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1483
diff changeset
1018 static inline int get_p_cbp(MpegEncContext * s,
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1483
diff changeset
1019 DCTELEM block[6][64],
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1483
diff changeset
1020 int motion_x, int motion_y){
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1483
diff changeset
1021 int cbp, i;
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1483
diff changeset
1022
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1483
diff changeset
1023 if(s->flags & CODEC_FLAG_CBP_RD){
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1483
diff changeset
1024 int best_cbpy_score= INT_MAX;
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1483
diff changeset
1025 int best_cbpc_score= INT_MAX;
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1586
diff changeset
1026 int cbpc = (-1), cbpy= (-1);
1490
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1483
diff changeset
1027 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
1028 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
1029
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1483
diff changeset
1030 for(i=0; i<4; i++){
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1483
diff changeset
1031 int score= inter_MCBPC_bits[i + offset] * lambda;
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1483
diff changeset
1032 if(i&1) score += s->coded_score[5];
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1483
diff changeset
1033 if(i&2) score += s->coded_score[4];
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1483
diff changeset
1034
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1483
diff changeset
1035 if(score < best_cbpc_score){
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1483
diff changeset
1036 best_cbpc_score= score;
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1483
diff changeset
1037 cbpc= i;
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1483
diff changeset
1038 }
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1483
diff changeset
1039 }
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1483
diff changeset
1040
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1483
diff changeset
1041 for(i=0; i<16; i++){
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1483
diff changeset
1042 int score= cbpy_tab[i ^ 0xF][1] * lambda;
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1483
diff changeset
1043 if(i&1) score += s->coded_score[3];
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1483
diff changeset
1044 if(i&2) score += s->coded_score[2];
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1483
diff changeset
1045 if(i&4) score += s->coded_score[1];
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1483
diff changeset
1046 if(i&8) score += s->coded_score[0];
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1483
diff changeset
1047
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1483
diff changeset
1048 if(score < best_cbpy_score){
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1483
diff changeset
1049 best_cbpy_score= score;
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1483
diff changeset
1050 cbpy= i;
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1483
diff changeset
1051 }
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1483
diff changeset
1052 }
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1483
diff changeset
1053 cbp= cbpc + 4*cbpy;
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1483
diff changeset
1054 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
1055 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
1056 cbp= 0;
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1483
diff changeset
1057 }
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1483
diff changeset
1058
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1483
diff changeset
1059 for (i = 0; i < 6; i++) {
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1483
diff changeset
1060 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
1061 s->block_last_index[i]= -1;
8288
800444234375 clear_block mmx
lorenm
parents: 8251
diff changeset
1062 s->dsp.clear_block(s->block[i]);
1490
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1483
diff changeset
1063 }
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1483
diff changeset
1064 }
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1483
diff changeset
1065 }else{
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1483
diff changeset
1066 cbp= 0;
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1483
diff changeset
1067 for (i = 0; i < 6; i++) {
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1483
diff changeset
1068 if (s->block_last_index[i] >= 0)
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1483
diff changeset
1069 cbp |= 1 << (5 - i);
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1483
diff changeset
1070 }
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1483
diff changeset
1071 }
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1483
diff changeset
1072 return cbp;
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1483
diff changeset
1073 }
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1483
diff changeset
1074
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1483
diff changeset
1075 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
1076 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
1077 int cbp=0, i;
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1483
diff changeset
1078
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1483
diff changeset
1079 if(s->flags & CODEC_FLAG_CBP_RD){
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1483
diff changeset
1080 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
1081 const int lambda= s->lambda2 >> (FF_LAMBDA_SHIFT - 6);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
1082
1490
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1483
diff changeset
1083 for(i=0; i<6; i++){
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1483
diff changeset
1084 if(s->coded_score[i] < 0){
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1483
diff changeset
1085 score += s->coded_score[i];
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1483
diff changeset
1086 cbp |= 1 << (5 - i);
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1483
diff changeset
1087 }
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1483
diff changeset
1088 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
1089
1490
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1483
diff changeset
1090 if(cbp){
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1483
diff changeset
1091 int zero_score= -6;
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1483
diff changeset
1092 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
1093 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
1094 }
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1483
diff changeset
1095
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1483
diff changeset
1096 zero_score*= lambda;
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1483
diff changeset
1097 if(zero_score <= score){
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1483
diff changeset
1098 cbp=0;
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1483
diff changeset
1099 }
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1483
diff changeset
1100 }
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1483
diff changeset
1101
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1483
diff changeset
1102 for (i = 0; i < 6; i++) {
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1483
diff changeset
1103 if (s->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
1104 s->block_last_index[i]= -1;
8288
800444234375 clear_block mmx
lorenm
parents: 8251
diff changeset
1105 s->dsp.clear_block(s->block[i]);
1490
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1483
diff changeset
1106 }
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1483
diff changeset
1107 }
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1483
diff changeset
1108 }else{
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1483
diff changeset
1109 for (i = 0; i < 6; i++) {
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1483
diff changeset
1110 if (s->block_last_index[i] >= 0)
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1483
diff changeset
1111 cbp |= 1 << (5 - i);
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1483
diff changeset
1112 }
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1483
diff changeset
1113 }
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1483
diff changeset
1114 return cbp;
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1483
diff changeset
1115 }
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1483
diff changeset
1116
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
1117 static inline void mpeg4_encode_blocks(MpegEncContext * s, DCTELEM block[6][64], int intra_dc[6],
2502
f5fe61bd08ac support skiping some bitstream encoding
michael
parents: 2437
diff changeset
1118 uint8_t **scan_table, PutBitContext *dc_pb, PutBitContext *ac_pb){
f5fe61bd08ac support skiping some bitstream encoding
michael
parents: 2437
diff changeset
1119 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
1120
2502
f5fe61bd08ac support skiping some bitstream encoding
michael
parents: 2437
diff changeset
1121 if(scan_table){
f5fe61bd08ac support skiping some bitstream encoding
michael
parents: 2437
diff changeset
1122 if(s->flags2 & CODEC_FLAG2_NO_OUTPUT){
f5fe61bd08ac support skiping some bitstream encoding
michael
parents: 2437
diff changeset
1123 for (i = 0; i < 6; i++) {
f5fe61bd08ac support skiping some bitstream encoding
michael
parents: 2437
diff changeset
1124 skip_put_bits(&s->pb, mpeg4_get_block_length(s, block[i], i, intra_dc[i], scan_table[i]));
f5fe61bd08ac support skiping some bitstream encoding
michael
parents: 2437
diff changeset
1125 }
f5fe61bd08ac support skiping some bitstream encoding
michael
parents: 2437
diff changeset
1126 }else{
f5fe61bd08ac support skiping some bitstream encoding
michael
parents: 2437
diff changeset
1127 /* encode each block */
f5fe61bd08ac support skiping some bitstream encoding
michael
parents: 2437
diff changeset
1128 for (i = 0; i < 6; i++) {
f5fe61bd08ac support skiping some bitstream encoding
michael
parents: 2437
diff changeset
1129 mpeg4_encode_block(s, block[i], i, intra_dc[i], scan_table[i], dc_pb, ac_pb);
f5fe61bd08ac support skiping some bitstream encoding
michael
parents: 2437
diff changeset
1130 }
f5fe61bd08ac support skiping some bitstream encoding
michael
parents: 2437
diff changeset
1131 }
f5fe61bd08ac support skiping some bitstream encoding
michael
parents: 2437
diff changeset
1132 }else{
f5fe61bd08ac support skiping some bitstream encoding
michael
parents: 2437
diff changeset
1133 if(s->flags2 & CODEC_FLAG2_NO_OUTPUT){
f5fe61bd08ac support skiping some bitstream encoding
michael
parents: 2437
diff changeset
1134 for (i = 0; i < 6; i++) {
f5fe61bd08ac support skiping some bitstream encoding
michael
parents: 2437
diff changeset
1135 skip_put_bits(&s->pb, mpeg4_get_block_length(s, block[i], i, 0, s->intra_scantable.permutated));
f5fe61bd08ac support skiping some bitstream encoding
michael
parents: 2437
diff changeset
1136 }
f5fe61bd08ac support skiping some bitstream encoding
michael
parents: 2437
diff changeset
1137 }else{
f5fe61bd08ac support skiping some bitstream encoding
michael
parents: 2437
diff changeset
1138 /* encode each block */
f5fe61bd08ac support skiping some bitstream encoding
michael
parents: 2437
diff changeset
1139 for (i = 0; i < 6; i++) {
f5fe61bd08ac support skiping some bitstream encoding
michael
parents: 2437
diff changeset
1140 mpeg4_encode_block(s, block[i], i, 0, s->intra_scantable.permutated, dc_pb, ac_pb);
f5fe61bd08ac support skiping some bitstream encoding
michael
parents: 2437
diff changeset
1141 }
f5fe61bd08ac support skiping some bitstream encoding
michael
parents: 2437
diff changeset
1142 }
f5fe61bd08ac support skiping some bitstream encoding
michael
parents: 2437
diff changeset
1143 }
f5fe61bd08ac support skiping some bitstream encoding
michael
parents: 2437
diff changeset
1144 }
f5fe61bd08ac support skiping some bitstream encoding
michael
parents: 2437
diff changeset
1145
8644
0b13b33e175e avoid duplication of dquant_code
stefang
parents: 8629
diff changeset
1146 static const int dquant_code[5]= {1,0,9,2,3};
0b13b33e175e avoid duplication of dquant_code
stefang
parents: 8629
diff changeset
1147
265
4e9e728021d8 use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents: 264
diff changeset
1148 void mpeg4_encode_mb(MpegEncContext * s,
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
1149 DCTELEM block[6][64],
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
1150 int motion_x, int motion_y)
265
4e9e728021d8 use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents: 264
diff changeset
1151 {
1057
bb5de8a59da8 * static,const,compiler warning cleanup
kabi
parents: 1053
diff changeset
1152 int cbpc, cbpy, pred_x, pred_y;
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
1153 PutBitContext * const pb2 = s->data_partitioning ? &s->pb2 : &s->pb;
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6211
diff changeset
1154 PutBitContext * const tex_pb = s->data_partitioning && s->pict_type!=FF_B_TYPE ? &s->tex_pb : &s->pb;
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6211
diff changeset
1155 PutBitContext * const dc_pb = s->data_partitioning && s->pict_type!=FF_I_TYPE ? &s->pb2 : &s->pb;
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
1156 const int interleaved_stats= (s->flags&CODEC_FLAG_PASS1) && !s->data_partitioning ? 1 : 0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
1157
265
4e9e728021d8 use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents: 264
diff changeset
1158 if (!s->mb_intra) {
1490
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1483
diff changeset
1159 int i, cbp;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
1160
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6211
diff changeset
1161 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
1162 static const int mb_type_table[8]= {-1, 3, 2, 1,-1,-1,-1, 0}; /* convert from mv_dir to type */
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 322
diff changeset
1163 int mb_type= mb_type_table[s->mv_dir];
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1701
diff changeset
1164
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 322
diff changeset
1165 if(s->mb_x==0){
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1701
diff changeset
1166 for(i=0; i<2; i++){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
1167 s->last_mv[i][0][0]=
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
1168 s->last_mv[i][0][1]=
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
1169 s->last_mv[i][1][0]=
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1701
diff changeset
1170 s->last_mv[i][1][1]= 0;
dea5b2946999 interlaced motion estimation
michael
parents: 1701
diff changeset
1171 }
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 322
diff changeset
1172 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
1173
690
a1c69cb685b3 adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents: 676
diff changeset
1174 assert(s->dquant>=-2 && s->dquant<=2);
a1c69cb685b3 adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents: 676
diff changeset
1175 assert((s->dquant&1)==0);
a1c69cb685b3 adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents: 676
diff changeset
1176 assert(mb_type>=0);
265
4e9e728021d8 use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents: 264
diff changeset
1177
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
1178 /* 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
1179 if(s->next_picture.mbskip_table[s->mb_y * s->mb_stride + s->mb_x]){ //FIXME avoid DCT & ...
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 322
diff changeset
1180 s->skip_count++;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
1181 s->mv[0][0][0]=
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
1182 s->mv[0][0][1]=
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
1183 s->mv[1][0][0]=
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 322
diff changeset
1184 s->mv[1][0][1]= 0;
2646
c735e3e60ca7 Even More spelling errors. patch by (Kevin Baragona <kevinmb500 gawab com)
michael
parents: 2639
diff changeset
1185 s->mv_dir= MV_DIR_FORWARD; //doesn't matter
690
a1c69cb685b3 adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents: 676
diff changeset
1186 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
1187 // s->mb_skipped=1;
903
22ee74da2cd3 cleanup
michaelni
parents: 892
diff changeset
1188
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 322
diff changeset
1189 return;
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 322
diff changeset
1190 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
1191
1490
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1483
diff changeset
1192 cbp= get_b_cbp(s, block, motion_x, motion_y, mb_type);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
1193
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 322
diff changeset
1194 if ((cbp | motion_x | motion_y | mb_type) ==0) {
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 322
diff changeset
1195 /* direct MB with MV={0,0} */
690
a1c69cb685b3 adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents: 676
diff changeset
1196 assert(s->dquant==0);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
1197
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 322
diff changeset
1198 put_bits(&s->pb, 1, 1); /* mb not coded modb1=1 */
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
1199
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
1200 if(interleaved_stats){
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
1201 s->misc_bits++;
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
1202 s->last_bits++;
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
1203 }
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 322
diff changeset
1204 s->skip_count++;
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 322
diff changeset
1205 return;
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 322
diff changeset
1206 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
1207
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
1208 put_bits(&s->pb, 1, 0); /* mb coded modb1=0 */
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 322
diff changeset
1209 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
1210 put_bits(&s->pb, mb_type+1, 1); // this table is so simple that we don't need it :)
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 322
diff changeset
1211 if(cbp) put_bits(&s->pb, 6, cbp);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
1212
690
a1c69cb685b3 adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents: 676
diff changeset
1213 if(cbp && mb_type){
a1c69cb685b3 adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents: 676
diff changeset
1214 if(s->dquant)
a1c69cb685b3 adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents: 676
diff changeset
1215 put_bits(&s->pb, 2, (s->dquant>>2)+3);
a1c69cb685b3 adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents: 676
diff changeset
1216 else
a1c69cb685b3 adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents: 676
diff changeset
1217 put_bits(&s->pb, 1, 0);
a1c69cb685b3 adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents: 676
diff changeset
1218 }else
a1c69cb685b3 adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents: 676
diff changeset
1219 s->qscale -= s->dquant;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
1220
697
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
1221 if(!s->progressive_sequence){
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
1222 if(cbp)
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
1223 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
1224 if(mb_type) // not direct mode
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1701
diff changeset
1225 put_bits(&s->pb, 1, s->mv_type == MV_TYPE_FIELD);
697
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
1226 }
265
4e9e728021d8 use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents: 264
diff changeset
1227
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
1228 if(interleaved_stats){
1164
0e3c0c4a7b3d msmpeg4 2pass support & some related cleanup
michaelni
parents: 1162
diff changeset
1229 s->misc_bits+= get_bits_diff(s);
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
1230 }
295
6622b0fd036c mpeg4 4MV encoding
michaelni
parents: 294
diff changeset
1231
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1701
diff changeset
1232 if(mb_type == 0){
dea5b2946999 interlaced motion estimation
michael
parents: 1701
diff changeset
1233 assert(s->mv_dir & MV_DIRECT);
2502
f5fe61bd08ac support skiping some bitstream encoding
michael
parents: 2437
diff changeset
1234 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
1235 s->b_count++;
e47fa3e3f2d5 statistics for forw & back p-MBs instead of just one counter for both
michaelni
parents: 654
diff changeset
1236 s->f_count++;
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1701
diff changeset
1237 }else{
dea5b2946999 interlaced motion estimation
michael
parents: 1701
diff changeset
1238 assert(mb_type > 0 && mb_type < 4);
dea5b2946999 interlaced motion estimation
michael
parents: 1701
diff changeset
1239 if(s->mv_type != MV_TYPE_FIELD){
dea5b2946999 interlaced motion estimation
michael
parents: 1701
diff changeset
1240 if(s->mv_dir & MV_DIR_FORWARD){
2502
f5fe61bd08ac support skiping some bitstream encoding
michael
parents: 2437
diff changeset
1241 ff_h263_encode_motion_vector(s, s->mv[0][0][0] - s->last_mv[0][0][0],
f5fe61bd08ac support skiping some bitstream encoding
michael
parents: 2437
diff changeset
1242 s->mv[0][0][1] - s->last_mv[0][0][1], s->f_code);
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1701
diff changeset
1243 s->last_mv[0][0][0]= s->last_mv[0][1][0]= s->mv[0][0][0];
dea5b2946999 interlaced motion estimation
michael
parents: 1701
diff changeset
1244 s->last_mv[0][0][1]= s->last_mv[0][1][1]= s->mv[0][0][1];
dea5b2946999 interlaced motion estimation
michael
parents: 1701
diff changeset
1245 s->f_count++;
dea5b2946999 interlaced motion estimation
michael
parents: 1701
diff changeset
1246 }
dea5b2946999 interlaced motion estimation
michael
parents: 1701
diff changeset
1247 if(s->mv_dir & MV_DIR_BACKWARD){
2502
f5fe61bd08ac support skiping some bitstream encoding
michael
parents: 2437
diff changeset
1248 ff_h263_encode_motion_vector(s, s->mv[1][0][0] - s->last_mv[1][0][0],
f5fe61bd08ac support skiping some bitstream encoding
michael
parents: 2437
diff changeset
1249 s->mv[1][0][1] - s->last_mv[1][0][1], s->b_code);
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1701
diff changeset
1250 s->last_mv[1][0][0]= s->last_mv[1][1][0]= s->mv[1][0][0];
dea5b2946999 interlaced motion estimation
michael
parents: 1701
diff changeset
1251 s->last_mv[1][0][1]= s->last_mv[1][1][1]= s->mv[1][0][1];
dea5b2946999 interlaced motion estimation
michael
parents: 1701
diff changeset
1252 s->b_count++;
dea5b2946999 interlaced motion estimation
michael
parents: 1701
diff changeset
1253 }
dea5b2946999 interlaced motion estimation
michael
parents: 1701
diff changeset
1254 }else{
dea5b2946999 interlaced motion estimation
michael
parents: 1701
diff changeset
1255 if(s->mv_dir & MV_DIR_FORWARD){
dea5b2946999 interlaced motion estimation
michael
parents: 1701
diff changeset
1256 put_bits(&s->pb, 1, s->field_select[0][0]);
dea5b2946999 interlaced motion estimation
michael
parents: 1701
diff changeset
1257 put_bits(&s->pb, 1, s->field_select[0][1]);
dea5b2946999 interlaced motion estimation
michael
parents: 1701
diff changeset
1258 }
dea5b2946999 interlaced motion estimation
michael
parents: 1701
diff changeset
1259 if(s->mv_dir & MV_DIR_BACKWARD){
dea5b2946999 interlaced motion estimation
michael
parents: 1701
diff changeset
1260 put_bits(&s->pb, 1, s->field_select[1][0]);
dea5b2946999 interlaced motion estimation
michael
parents: 1701
diff changeset
1261 put_bits(&s->pb, 1, s->field_select[1][1]);
dea5b2946999 interlaced motion estimation
michael
parents: 1701
diff changeset
1262 }
dea5b2946999 interlaced motion estimation
michael
parents: 1701
diff changeset
1263 if(s->mv_dir & MV_DIR_FORWARD){
dea5b2946999 interlaced motion estimation
michael
parents: 1701
diff changeset
1264 for(i=0; i<2; i++){
2502
f5fe61bd08ac support skiping some bitstream encoding
michael
parents: 2437
diff changeset
1265 ff_h263_encode_motion_vector(s, s->mv[0][i][0] - s->last_mv[0][i][0] ,
f5fe61bd08ac support skiping some bitstream encoding
michael
parents: 2437
diff changeset
1266 s->mv[0][i][1] - s->last_mv[0][i][1]/2, s->f_code);
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1701
diff changeset
1267 s->last_mv[0][i][0]= s->mv[0][i][0];
dea5b2946999 interlaced motion estimation
michael
parents: 1701
diff changeset
1268 s->last_mv[0][i][1]= s->mv[0][i][1]*2;
dea5b2946999 interlaced motion estimation
michael
parents: 1701
diff changeset
1269 }
dea5b2946999 interlaced motion estimation
michael
parents: 1701
diff changeset
1270 s->f_count++;
dea5b2946999 interlaced motion estimation
michael
parents: 1701
diff changeset
1271 }
dea5b2946999 interlaced motion estimation
michael
parents: 1701
diff changeset
1272 if(s->mv_dir & MV_DIR_BACKWARD){
dea5b2946999 interlaced motion estimation
michael
parents: 1701
diff changeset
1273 for(i=0; i<2; i++){
2502
f5fe61bd08ac support skiping some bitstream encoding
michael
parents: 2437
diff changeset
1274 ff_h263_encode_motion_vector(s, s->mv[1][i][0] - s->last_mv[1][i][0] ,
f5fe61bd08ac support skiping some bitstream encoding
michael
parents: 2437
diff changeset
1275 s->mv[1][i][1] - s->last_mv[1][i][1]/2, s->b_code);
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1701
diff changeset
1276 s->last_mv[1][i][0]= s->mv[1][i][0];
dea5b2946999 interlaced motion estimation
michael
parents: 1701
diff changeset
1277 s->last_mv[1][i][1]= s->mv[1][i][1]*2;
dea5b2946999 interlaced motion estimation
michael
parents: 1701
diff changeset
1278 }
dea5b2946999 interlaced motion estimation
michael
parents: 1701
diff changeset
1279 s->b_count++;
dea5b2946999 interlaced motion estimation
michael
parents: 1701
diff changeset
1280 }
dea5b2946999 interlaced motion estimation
michael
parents: 1701
diff changeset
1281 }
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 322
diff changeset
1282 }
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
1283
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
1284 if(interleaved_stats){
1164
0e3c0c4a7b3d msmpeg4 2pass support & some related cleanup
michaelni
parents: 1162
diff changeset
1285 s->mv_bits+= get_bits_diff(s);
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
1286 }
295
6622b0fd036c mpeg4 4MV encoding
michaelni
parents: 294
diff changeset
1287
2502
f5fe61bd08ac support skiping some bitstream encoding
michael
parents: 2437
diff changeset
1288 mpeg4_encode_blocks(s, block, NULL, NULL, NULL, &s->pb);
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
1289
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
1290 if(interleaved_stats){
1164
0e3c0c4a7b3d msmpeg4 2pass support & some related cleanup
michaelni
parents: 1162
diff changeset
1291 s->p_tex_bits+= get_bits_diff(s);
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
1292 }
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1701
diff changeset
1293
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6211
diff changeset
1294 }else{ /* s->pict_type==FF_B_TYPE */
1490
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1483
diff changeset
1295 cbp= get_p_cbp(s, block, motion_x, motion_y);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
1296
690
a1c69cb685b3 adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents: 676
diff changeset
1297 if ((cbp | motion_x | motion_y | s->dquant) == 0 && s->mv_type==MV_TYPE_16X16) {
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
1298 /* 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
1299 why didn't they just compress the skip-mb bits instead of reusing them ?! */
331
853e1eb30468 fix b-frame MB skip
michaelni
parents: 327
diff changeset
1300 if(s->max_b_frames>0){
853e1eb30468 fix b-frame MB skip
michaelni
parents: 327
diff changeset
1301 int i;
364
6b6332e7008a segfault fix for b-frame encoding with height%16!=0
michaelni
parents: 360
diff changeset
1302 int x,y, offset;
6b6332e7008a segfault fix for b-frame encoding with height%16!=0
michaelni
parents: 360
diff changeset
1303 uint8_t *p_pic;
6b6332e7008a segfault fix for b-frame encoding with height%16!=0
michaelni
parents: 360
diff changeset
1304
6b6332e7008a segfault fix for b-frame encoding with height%16!=0
michaelni
parents: 360
diff changeset
1305 x= s->mb_x*16;
6b6332e7008a segfault fix for b-frame encoding with height%16!=0
michaelni
parents: 360
diff changeset
1306 y= s->mb_y*16;
6b6332e7008a segfault fix for b-frame encoding with height%16!=0
michaelni
parents: 360
diff changeset
1307 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
1308 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
1309
6b6332e7008a segfault fix for b-frame encoding with height%16!=0
michaelni
parents: 360
diff changeset
1310 offset= x + y*s->linesize;
903
22ee74da2cd3 cleanup
michaelni
parents: 892
diff changeset
1311 p_pic= s->new_picture.data[0] + offset;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
1312
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
1313 s->mb_skipped=1;
331
853e1eb30468 fix b-frame MB skip
michaelni
parents: 327
diff changeset
1314 for(i=0; i<s->max_b_frames; i++){
339
b743a6bbab25 segfault fix
michaelni
parents: 336
diff changeset
1315 uint8_t *b_pic;
b743a6bbab25 segfault fix
michaelni
parents: 336
diff changeset
1316 int diff;
903
22ee74da2cd3 cleanup
michaelni
parents: 892
diff changeset
1317 Picture *pic= s->reordered_input_picture[i+1];
22ee74da2cd3 cleanup
michaelni
parents: 892
diff changeset
1318
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6211
diff changeset
1319 if(pic==NULL || pic->pict_type!=FF_B_TYPE) break;
903
22ee74da2cd3 cleanup
michaelni
parents: 892
diff changeset
1320
3068
9aa8d8587bea fixing bframe strategy 2
michael
parents: 3036
diff changeset
1321 b_pic= pic->data[0] + offset;
9aa8d8587bea fixing bframe strategy 2
michael
parents: 3036
diff changeset
1322 if(pic->type != FF_BUFFER_TYPE_SHARED)
9aa8d8587bea fixing bframe strategy 2
michael
parents: 3036
diff changeset
1323 b_pic+= INPLACE_OFFSET;
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
1324 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
1325 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
1326 s->mb_skipped=0;
331
853e1eb30468 fix b-frame MB skip
michaelni
parents: 327
diff changeset
1327 break;
853e1eb30468 fix b-frame MB skip
michaelni
parents: 327
diff changeset
1328 }
853e1eb30468 fix b-frame MB skip
michaelni
parents: 327
diff changeset
1329 }
853e1eb30468 fix b-frame MB skip
michaelni
parents: 327
diff changeset
1330 }else
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
1331 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
1332
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
1333 if(s->mb_skipped==1){
331
853e1eb30468 fix b-frame MB skip
michaelni
parents: 327
diff changeset
1334 /* skip macroblock */
853e1eb30468 fix b-frame MB skip
michaelni
parents: 327
diff changeset
1335 put_bits(&s->pb, 1, 1);
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
1336
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
1337 if(interleaved_stats){
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
1338 s->misc_bits++;
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
1339 s->last_bits++;
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
1340 }
331
853e1eb30468 fix b-frame MB skip
michaelni
parents: 327
diff changeset
1341 s->skip_count++;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
1342
331
853e1eb30468 fix b-frame MB skip
michaelni
parents: 327
diff changeset
1343 return;
853e1eb30468 fix b-frame MB skip
michaelni
parents: 327
diff changeset
1344 }
295
6622b0fd036c mpeg4 4MV encoding
michaelni
parents: 294
diff changeset
1345 }
364
6b6332e7008a segfault fix for b-frame encoding with height%16!=0
michaelni
parents: 360
diff changeset
1346
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
1347 put_bits(&s->pb, 1, 0); /* mb coded */
1633
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1348 cbpc = cbp & 3;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1349 cbpy = cbp >> 2;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1350 cbpy ^= 0xf;
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 322
diff changeset
1351 if(s->mv_type==MV_TYPE_16X16){
690
a1c69cb685b3 adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents: 676
diff changeset
1352 if(s->dquant) cbpc+= 8;
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 322
diff changeset
1353 put_bits(&s->pb,
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 322
diff changeset
1354 inter_MCBPC_bits[cbpc],
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 322
diff changeset
1355 inter_MCBPC_code[cbpc]);
690
a1c69cb685b3 adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents: 676
diff changeset
1356
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
1357 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
1358 if(s->dquant)
a1c69cb685b3 adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents: 676
diff changeset
1359 put_bits(pb2, 2, dquant_code[s->dquant+2]);
697
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
1360
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
1361 if(!s->progressive_sequence){
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
1362 if(cbp)
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
1363 put_bits(pb2, 1, s->interlaced_dct);
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1701
diff changeset
1364 put_bits(pb2, 1, 0);
697
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
1365 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
1366
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
1367 if(interleaved_stats){
1164
0e3c0c4a7b3d msmpeg4 2pass support & some related cleanup
michaelni
parents: 1162
diff changeset
1368 s->misc_bits+= get_bits_diff(s);
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
1369 }
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 322
diff changeset
1370
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 322
diff changeset
1371 /* motion vectors: 16x16 mode */
1938
e2501e6e7ff7 unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents: 1936
diff changeset
1372 h263_pred_motion(s, 0, 0, &pred_x, &pred_y);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
1373
2502
f5fe61bd08ac support skiping some bitstream encoding
michael
parents: 2437
diff changeset
1374 ff_h263_encode_motion_vector(s, motion_x - pred_x,
f5fe61bd08ac support skiping some bitstream encoding
michael
parents: 2437
diff changeset
1375 motion_y - pred_y, s->f_code);
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1701
diff changeset
1376 }else if(s->mv_type==MV_TYPE_FIELD){
dea5b2946999 interlaced motion estimation
michael
parents: 1701
diff changeset
1377 if(s->dquant) cbpc+= 8;
dea5b2946999 interlaced motion estimation
michael
parents: 1701
diff changeset
1378 put_bits(&s->pb,
dea5b2946999 interlaced motion estimation
michael
parents: 1701
diff changeset
1379 inter_MCBPC_bits[cbpc],
dea5b2946999 interlaced motion estimation
michael
parents: 1701
diff changeset
1380 inter_MCBPC_code[cbpc]);
dea5b2946999 interlaced motion estimation
michael
parents: 1701
diff changeset
1381
dea5b2946999 interlaced motion estimation
michael
parents: 1701
diff changeset
1382 put_bits(pb2, cbpy_tab[cbpy][1], cbpy_tab[cbpy][0]);
dea5b2946999 interlaced motion estimation
michael
parents: 1701
diff changeset
1383 if(s->dquant)
dea5b2946999 interlaced motion estimation
michael
parents: 1701
diff changeset
1384 put_bits(pb2, 2, dquant_code[s->dquant+2]);
dea5b2946999 interlaced motion estimation
michael
parents: 1701
diff changeset
1385
dea5b2946999 interlaced motion estimation
michael
parents: 1701
diff changeset
1386 assert(!s->progressive_sequence);
dea5b2946999 interlaced motion estimation
michael
parents: 1701
diff changeset
1387 if(cbp)
dea5b2946999 interlaced motion estimation
michael
parents: 1701
diff changeset
1388 put_bits(pb2, 1, s->interlaced_dct);
dea5b2946999 interlaced motion estimation
michael
parents: 1701
diff changeset
1389 put_bits(pb2, 1, 1);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
1390
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1701
diff changeset
1391 if(interleaved_stats){
dea5b2946999 interlaced motion estimation
michael
parents: 1701
diff changeset
1392 s->misc_bits+= get_bits_diff(s);
dea5b2946999 interlaced motion estimation
michael
parents: 1701
diff changeset
1393 }
dea5b2946999 interlaced motion estimation
michael
parents: 1701
diff changeset
1394
dea5b2946999 interlaced motion estimation
michael
parents: 1701
diff changeset
1395 /* motion vectors: 16x8 interlaced mode */
1938
e2501e6e7ff7 unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents: 1936
diff changeset
1396 h263_pred_motion(s, 0, 0, &pred_x, &pred_y);
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1701
diff changeset
1397 pred_y /=2;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
1398
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1701
diff changeset
1399 put_bits(&s->pb, 1, s->field_select[0][0]);
dea5b2946999 interlaced motion estimation
michael
parents: 1701
diff changeset
1400 put_bits(&s->pb, 1, s->field_select[0][1]);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
1401
2502
f5fe61bd08ac support skiping some bitstream encoding
michael
parents: 2437
diff changeset
1402 ff_h263_encode_motion_vector(s, s->mv[0][0][0] - pred_x,
f5fe61bd08ac support skiping some bitstream encoding
michael
parents: 2437
diff changeset
1403 s->mv[0][0][1] - pred_y, s->f_code);
f5fe61bd08ac support skiping some bitstream encoding
michael
parents: 2437
diff changeset
1404 ff_h263_encode_motion_vector(s, s->mv[0][1][0] - pred_x,
f5fe61bd08ac support skiping some bitstream encoding
michael
parents: 2437
diff changeset
1405 s->mv[0][1][1] - pred_y, s->f_code);
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 322
diff changeset
1406 }else{
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1701
diff changeset
1407 assert(s->mv_type==MV_TYPE_8X8);
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 322
diff changeset
1408 put_bits(&s->pb,
1633
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1409 inter_MCBPC_bits[cbpc+16],
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1410 inter_MCBPC_code[cbpc+16]);
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
1411 put_bits(pb2, cbpy_tab[cbpy][1], cbpy_tab[cbpy][0]);
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
1412
757
d031d1575ceb fixing interlaced dct with 4mv
michaelni
parents: 753
diff changeset
1413 if(!s->progressive_sequence){
d031d1575ceb fixing interlaced dct with 4mv
michaelni
parents: 753
diff changeset
1414 if(cbp)
d031d1575ceb fixing interlaced dct with 4mv
michaelni
parents: 753
diff changeset
1415 put_bits(pb2, 1, s->interlaced_dct);
d031d1575ceb fixing interlaced dct with 4mv
michaelni
parents: 753
diff changeset
1416 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
1417
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
1418 if(interleaved_stats){
1164
0e3c0c4a7b3d msmpeg4 2pass support & some related cleanup
michaelni
parents: 1162
diff changeset
1419 s->misc_bits+= get_bits_diff(s);
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
1420 }
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 322
diff changeset
1421
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 322
diff changeset
1422 for(i=0; i<4; i++){
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 322
diff changeset
1423 /* motion vectors: 8x8 mode*/
1938
e2501e6e7ff7 unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents: 1936
diff changeset
1424 h263_pred_motion(s, i, 0, &pred_x, &pred_y);
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 322
diff changeset
1425
2502
f5fe61bd08ac support skiping some bitstream encoding
michael
parents: 2437
diff changeset
1426 ff_h263_encode_motion_vector(s, s->current_picture.motion_val[0][ s->block_index[i] ][0] - pred_x,
f5fe61bd08ac support skiping some bitstream encoding
michael
parents: 2437
diff changeset
1427 s->current_picture.motion_val[0][ s->block_index[i] ][1] - pred_y, s->f_code);
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 322
diff changeset
1428 }
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 322
diff changeset
1429 }
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
1430
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
1431 if(interleaved_stats){
1164
0e3c0c4a7b3d msmpeg4 2pass support & some related cleanup
michaelni
parents: 1162
diff changeset
1432 s->mv_bits+= get_bits_diff(s);
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
1433 }
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 322
diff changeset
1434
2502
f5fe61bd08ac support skiping some bitstream encoding
michael
parents: 2437
diff changeset
1435 mpeg4_encode_blocks(s, block, NULL, NULL, NULL, tex_pb);
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
1436
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
1437 if(interleaved_stats){
1164
0e3c0c4a7b3d msmpeg4 2pass support & some related cleanup
michaelni
parents: 1162
diff changeset
1438 s->p_tex_bits+= get_bits_diff(s);
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
1439 }
656
e47fa3e3f2d5 statistics for forw & back p-MBs instead of just one counter for both
michaelni
parents: 654
diff changeset
1440 s->f_count++;
295
6622b0fd036c mpeg4 4MV encoding
michaelni
parents: 294
diff changeset
1441 }
265
4e9e728021d8 use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents: 264
diff changeset
1442 } else {
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 322
diff changeset
1443 int cbp;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
1444 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
1445 int dir[6]; //prediction direction
4e9e728021d8 use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents: 264
diff changeset
1446 int zigzag_last_index[6];
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
1447 uint8_t *scan_table[6];
1057
bb5de8a59da8 * static,const,compiler warning cleanup
kabi
parents: 1053
diff changeset
1448 int i;
265
4e9e728021d8 use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents: 264
diff changeset
1449
4e9e728021d8 use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents: 264
diff changeset
1450 for(i=0; i<6; i++){
2003
16ac9630317d mpeg4 dc prediction simplification
michael
parents: 1997
diff changeset
1451 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
1452 }
4e9e728021d8 use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents: 264
diff changeset
1453
1492
3518325146fc ac prediction cleanup
michaelni
parents: 1490
diff changeset
1454 if(s->flags & CODEC_FLAG_AC_PRED){
3518325146fc ac prediction cleanup
michaelni
parents: 1490
diff changeset
1455 s->ac_pred= decide_ac_pred(s, block, dir, scan_table, zigzag_last_index);
3518325146fc ac prediction cleanup
michaelni
parents: 1490
diff changeset
1456 if(!s->ac_pred)
3518325146fc ac prediction cleanup
michaelni
parents: 1490
diff changeset
1457 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
1458 }else{
4e9e728021d8 use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents: 264
diff changeset
1459 for(i=0; i<6; i++)
706
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 702
diff changeset
1460 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
1461 }
4e9e728021d8 use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents: 264
diff changeset
1462
4e9e728021d8 use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents: 264
diff changeset
1463 /* compute cbp */
4e9e728021d8 use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents: 264
diff changeset
1464 cbp = 0;
4e9e728021d8 use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents: 264
diff changeset
1465 for (i = 0; i < 6; i++) {
4e9e728021d8 use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents: 264
diff changeset
1466 if (s->block_last_index[i] >= 1)
4e9e728021d8 use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents: 264
diff changeset
1467 cbp |= 1 << (5 - i);
4e9e728021d8 use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents: 264
diff changeset
1468 }
4e9e728021d8 use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents: 264
diff changeset
1469
4e9e728021d8 use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents: 264
diff changeset
1470 cbpc = cbp & 3;
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6211
diff changeset
1471 if (s->pict_type == FF_I_TYPE) {
690
a1c69cb685b3 adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents: 676
diff changeset
1472 if(s->dquant) cbpc+=4;
265
4e9e728021d8 use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents: 264
diff changeset
1473 put_bits(&s->pb,
4e9e728021d8 use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents: 264
diff changeset
1474 intra_MCBPC_bits[cbpc],
4e9e728021d8 use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents: 264
diff changeset
1475 intra_MCBPC_code[cbpc]);
4e9e728021d8 use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents: 264
diff changeset
1476 } else {
690
a1c69cb685b3 adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents: 676
diff changeset
1477 if(s->dquant) cbpc+=8;
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
1478 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
1479 put_bits(&s->pb,
4e9e728021d8 use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents: 264
diff changeset
1480 inter_MCBPC_bits[cbpc + 4],
4e9e728021d8 use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents: 264
diff changeset
1481 inter_MCBPC_code[cbpc + 4]);
4e9e728021d8 use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents: 264
diff changeset
1482 }
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
1483 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
1484 cbpy = cbp >> 2;
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
1485 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
1486 if(s->dquant)
a1c69cb685b3 adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents: 676
diff changeset
1487 put_bits(dc_pb, 2, dquant_code[s->dquant+2]);
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
1488
697
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
1489 if(!s->progressive_sequence){
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
1490 put_bits(dc_pb, 1, s->interlaced_dct);
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
1491 }
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
1492
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
1493 if(interleaved_stats){
1164
0e3c0c4a7b3d msmpeg4 2pass support & some related cleanup
michaelni
parents: 1162
diff changeset
1494 s->misc_bits+= get_bits_diff(s);
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
1495 }
286
91f7c38f5f37 statistics for 2-pass encoding
michaelni
parents: 285
diff changeset
1496
2502
f5fe61bd08ac support skiping some bitstream encoding
michael
parents: 2437
diff changeset
1497 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
1498
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
1499 if(interleaved_stats){
1164
0e3c0c4a7b3d msmpeg4 2pass support & some related cleanup
michaelni
parents: 1162
diff changeset
1500 s->i_tex_bits+= get_bits_diff(s);
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
1501 }
286
91f7c38f5f37 statistics for 2-pass encoding
michaelni
parents: 285
diff changeset
1502 s->i_count++;
91f7c38f5f37 statistics for 2-pass encoding
michaelni
parents: 285
diff changeset
1503
265
4e9e728021d8 use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents: 264
diff changeset
1504 /* restore ac coeffs & last_index stuff if we messed them up with the prediction */
1492
3518325146fc ac prediction cleanup
michaelni
parents: 1490
diff changeset
1505 if(s->ac_pred)
3518325146fc ac prediction cleanup
michaelni
parents: 1490
diff changeset
1506 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
1507 }
4e9e728021d8 use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents: 264
diff changeset
1508 }
4e9e728021d8 use ac prediction in mpeg4 encoding (5% smaller intra-blocks/keyframes)
michaelni
parents: 264
diff changeset
1509
10752
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1510 /**
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1511 * encodes a 8x8 block.
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1512 * @param block the 8x8 block
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1513 * @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
1514 */
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1515 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
1516 {
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1517 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
1518 RLTable *rl;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1519
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1520 rl = &rl_inter;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1521 if (s->mb_intra && !s->h263_aic) {
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1522 /* DC coef */
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1523 level = block[0];
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1524 /* 255 cannot be represented, so we clamp */
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1525 if (level > 254) {
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1526 level = 254;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1527 block[0] = 254;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1528 }
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1529 /* 0 cannot be represented also */
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1530 else if (level < 1) {
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1531 level = 1;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1532 block[0] = 1;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1533 }
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1534 if (level == 128) //FIXME check rv10
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1535 put_bits(&s->pb, 8, 0xff);
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1536 else
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1537 put_bits(&s->pb, 8, level);
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1538 i = 1;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1539 } else {
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1540 i = 0;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1541 if (s->h263_aic && s->mb_intra)
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1542 rl = &rl_intra_aic;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1543
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1544 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
1545 int aic_vlc_bits=0;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1546 int inter_vlc_bits=0;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1547 int wrong_pos=-1;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1548 int aic_code;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1549
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1550 last_index = s->block_last_index[n];
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1551 last_non_zero = i - 1;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1552 for (; i <= last_index; i++) {
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1553 j = s->intra_scantable.permutated[i];
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1554 level = block[j];
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1555 if (level) {
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1556 run = i - last_non_zero - 1;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1557 last = (i == last_index);
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1558
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1559 if(level<0) level= -level;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1560
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1561 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
1562 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
1563 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
1564 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
1565
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1566 if (code == rl->n) {
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1567 inter_vlc_bits += 1+6+8-1;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1568 }
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1569 if (aic_code == rl_intra_aic.n) {
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1570 aic_vlc_bits += 1+6+8-1;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1571 wrong_pos += run + 1;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1572 }else
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1573 wrong_pos += wrong_run[aic_code];
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1574 last_non_zero = i;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1575 }
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1576 }
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1577 i = 0;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1578 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
1579 rl = &rl_intra_aic;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1580 }
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1581 }
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1582
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1583 /* AC coefs */
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1584 last_index = s->block_last_index[n];
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1585 last_non_zero = i - 1;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1586 for (; i <= last_index; i++) {
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1587 j = s->intra_scantable.permutated[i];
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1588 level = block[j];
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1589 if (level) {
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1590 run = i - last_non_zero - 1;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1591 last = (i == last_index);
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1592 sign = 0;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1593 slevel = level;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1594 if (level < 0) {
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1595 sign = 1;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1596 level = -level;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1597 }
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1598 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
1599 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
1600 if (code == rl->n) {
10787
3f8e40fe25c2 Split out flv encoding.
michael
parents: 10786
diff changeset
1601 if(!CONFIG_FLV_ENCODER || s->h263_flv <= 1){
10752
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1602 put_bits(&s->pb, 1, last);
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1603 put_bits(&s->pb, 6, run);
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1604
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1605 assert(slevel != 0);
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1606
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1607 if(level < 128)
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1608 put_sbits(&s->pb, 8, slevel);
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1609 else{
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1610 put_bits(&s->pb, 8, 128);
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1611 put_sbits(&s->pb, 5, slevel);
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1612 put_sbits(&s->pb, 6, slevel>>5);
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1613 }
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1614 }else{
10787
3f8e40fe25c2 Split out flv encoding.
michael
parents: 10786
diff changeset
1615 ff_flv2_encode_ac_esc(&s->pb, slevel, level, run, last);
10752
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1616 }
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1617 } else {
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1618 put_bits(&s->pb, 1, sign);
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1619 }
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1620 last_non_zero = i;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1621 }
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1622 }
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1623 }
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1624
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1625 /* 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
1626 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
1627 {
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1628 short sval = 0;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1629 short i = 0;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1630 short n_bits = 0;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1631 short temp_val;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1632 int code = 0;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1633 int tcode;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1634
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1635 if ( val == 0)
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1636 put_bits(&s->pb, 1, 1);
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1637 else if (val == 1)
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1638 put_bits(&s->pb, 3, 0);
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1639 else if (val == -1)
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1640 put_bits(&s->pb, 3, 2);
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1641 else {
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1642
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1643 sval = ((val < 0) ? (short)(-val):(short)val);
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1644 temp_val = sval;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1645
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1646 while (temp_val != 0) {
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1647 temp_val = temp_val >> 1;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1648 n_bits++;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1649 }
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1650
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1651 i = n_bits - 1;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1652 while (i > 0) {
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1653 tcode = (sval & (1 << (i-1))) >> (i-1);
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1654 tcode = (tcode << 1) | 1;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1655 code = (code << 2) | tcode;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1656 i--;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1657 }
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1658 code = ((code << 1) | (val < 0)) << 1;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1659 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
1660 }
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1661 }
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1662
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1663 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
1664 {
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1665 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
1666 int16_t *dc_val;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1667
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1668 /* find prediction */
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1669 if (n < 4) {
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1670 x = 2 * s->mb_x + (n & 1);
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1671 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
1672 wrap = s->b8_stride;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1673 dc_val = s->dc_val[0];
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1674 } else {
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1675 x = s->mb_x;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1676 y = s->mb_y;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1677 wrap = s->mb_stride;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1678 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
1679 }
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1680 /* B C
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1681 * A X
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1682 */
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1683 a = dc_val[(x - 1) + (y) * wrap];
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1684 c = dc_val[(x) + (y - 1) * wrap];
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1685
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1686 /* No prediction outside GOB boundary */
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1687 if(s->first_slice_line && n!=3){
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1688 if(n!=2) c= 1024;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1689 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
1690 }
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1691 /* just DC prediction */
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1692 if (a != 1024 && c != 1024)
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1693 pred_dc = (a + c) >> 1;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1694 else if (a != 1024)
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1695 pred_dc = a;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1696 else
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1697 pred_dc = c;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1698
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1699 /* we assume pred is positive */
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1700 *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
1701 return pred_dc;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1702 }
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
1703
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1704 void h263_encode_mb(MpegEncContext * s,
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
1705 DCTELEM block[6][64],
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
1706 int motion_x, int motion_y)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1707 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
1708 int cbpc, cbpy, i, cbp, pred_x, pred_y;
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
1709 int16_t pred_dc;
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
1710 int16_t rec_intradc[6];
3781
8e79b099d354 dc_val should be signed
mru
parents: 3777
diff changeset
1711 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
1712 const int interleaved_stats= (s->flags&CODEC_FLAG_PASS1);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
1713
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 322
diff changeset
1714 if (!s->mb_intra) {
350
6ebbecc10063 - Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents: 346
diff changeset
1715 /* compute cbp */
1490
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1483
diff changeset
1716 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
1717
1789
acda5fdfd6e7 h263 4mv encoding fix
michael
parents: 1786
diff changeset
1718 if ((cbp | motion_x | motion_y | s->dquant | (s->mv_type - MV_TYPE_16X16)) == 0) {
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 322
diff changeset
1719 /* skip macroblock */
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 322
diff changeset
1720 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
1721 if(interleaved_stats){
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1350
diff changeset
1722 s->misc_bits++;
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1350
diff changeset
1723 s->last_bits++;
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1350
diff changeset
1724 }
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
1725 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
1726
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 322
diff changeset
1727 return;
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 322
diff changeset
1728 }
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
1729 put_bits(&s->pb, 1, 0); /* mb coded */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
1730
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 322
diff changeset
1731 cbpc = cbp & 3;
1637
7799582dc9b8 h263 alternative inter vlc support
michael
parents: 1633
diff changeset
1732 cbpy = cbp >> 2;
7799582dc9b8 h263 alternative inter vlc support
michael
parents: 1633
diff changeset
1733 if(s->alt_inter_vlc==0 || cbpc!=3)
7799582dc9b8 h263 alternative inter vlc support
michael
parents: 1633
diff changeset
1734 cbpy ^= 0xF;
695
3525da287ee2 adaptive quantization for h263
michaelni
parents: 692
diff changeset
1735 if(s->dquant) cbpc+= 8;
1633
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1736 if(s->mv_type==MV_TYPE_16X16){
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1737 put_bits(&s->pb,
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1738 inter_MCBPC_bits[cbpc],
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1739 inter_MCBPC_code[cbpc]);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1740
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1741 put_bits(&s->pb, cbpy_tab[cbpy][1], cbpy_tab[cbpy][0]);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1742 if(s->dquant)
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1743 put_bits(&s->pb, 2, dquant_code[s->dquant+2]);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
1744
1633
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1745 if(interleaved_stats){
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1746 s->misc_bits+= get_bits_diff(s);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1747 }
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1748
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1749 /* motion vectors: 16x16 mode */
1938
e2501e6e7ff7 unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents: 1936
diff changeset
1750 h263_pred_motion(s, 0, 0, &pred_x, &pred_y);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
1751
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
1752 if (!s->umvplus) {
2502
f5fe61bd08ac support skiping some bitstream encoding
michael
parents: 2437
diff changeset
1753 ff_h263_encode_motion_vector(s, motion_x - pred_x,
f5fe61bd08ac support skiping some bitstream encoding
michael
parents: 2437
diff changeset
1754 motion_y - pred_y, 1);
1633
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1755 }
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1756 else {
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1757 h263p_encode_umotion(s, motion_x - pred_x);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1758 h263p_encode_umotion(s, motion_y - pred_y);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1759 if (((motion_x - pred_x) == 1) && ((motion_y - pred_y) == 1))
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1760 /* To prevent Start Code emulation */
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1761 put_bits(&s->pb,1,1);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1762 }
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1763 }else{
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1764 put_bits(&s->pb,
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1765 inter_MCBPC_bits[cbpc+16],
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1766 inter_MCBPC_code[cbpc+16]);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1767 put_bits(&s->pb, cbpy_tab[cbpy][1], cbpy_tab[cbpy][0]);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1768 if(s->dquant)
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1769 put_bits(&s->pb, 2, dquant_code[s->dquant+2]);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1770
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1771 if(interleaved_stats){
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1772 s->misc_bits+= get_bits_diff(s);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1773 }
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1774
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1775 for(i=0; i<4; i++){
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1776 /* motion vectors: 8x8 mode*/
1938
e2501e6e7ff7 unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents: 1936
diff changeset
1777 h263_pred_motion(s, i, 0, &pred_x, &pred_y);
1633
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1778
1668
30746f429df6 move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1666
diff changeset
1779 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
1780 motion_y= s->current_picture.motion_val[0][ s->block_index[i] ][1];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
1781 if (!s->umvplus) {
2502
f5fe61bd08ac support skiping some bitstream encoding
michael
parents: 2437
diff changeset
1782 ff_h263_encode_motion_vector(s, motion_x - pred_x,
f5fe61bd08ac support skiping some bitstream encoding
michael
parents: 2437
diff changeset
1783 motion_y - pred_y, 1);
1633
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1784 }
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1785 else {
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1786 h263p_encode_umotion(s, motion_x - pred_x);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1787 h263p_encode_umotion(s, motion_y - pred_y);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1788 if (((motion_x - pred_x) == 1) && ((motion_y - pred_y) == 1))
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1789 /* To prevent Start Code emulation */
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1790 put_bits(&s->pb,1,1);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1791 }
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1792 }
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 322
diff changeset
1793 }
1353
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1350
diff changeset
1794
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1350
diff changeset
1795 if(interleaved_stats){
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1350
diff changeset
1796 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
1797 }
350
6ebbecc10063 - Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents: 346
diff changeset
1798 } else {
1639
3e2b774edce4 rv20 decoder
michael
parents: 1637
diff changeset
1799 assert(s->mb_intra);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
1800
350
6ebbecc10063 - Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents: 346
diff changeset
1801 cbp = 0;
1666
b76ab3c968ab AIC/MQ encoding fix
michael
parents: 1663
diff changeset
1802 if (s->h263_aic) {
350
6ebbecc10063 - Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents: 346
diff changeset
1803 /* Predict DC */
1666
b76ab3c968ab AIC/MQ encoding fix
michael
parents: 1663
diff changeset
1804 for(i=0; i<6; i++) {
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
1805 int16_t level = block[i][0];
1666
b76ab3c968ab AIC/MQ encoding fix
michael
parents: 1663
diff changeset
1806 int scale;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
1807
1666
b76ab3c968ab AIC/MQ encoding fix
michael
parents: 1663
diff changeset
1808 if(i<4) scale= s->y_dc_scale;
b76ab3c968ab AIC/MQ encoding fix
michael
parents: 1663
diff changeset
1809 else scale= s->c_dc_scale;
b76ab3c968ab AIC/MQ encoding fix
michael
parents: 1663
diff changeset
1810
350
6ebbecc10063 - Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents: 346
diff changeset
1811 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
1812 level -= pred_dc;
6ebbecc10063 - Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents: 346
diff changeset
1813 /* Quant */
1666
b76ab3c968ab AIC/MQ encoding fix
michael
parents: 1663
diff changeset
1814 if (level >= 0)
b76ab3c968ab AIC/MQ encoding fix
michael
parents: 1663
diff changeset
1815 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
1816 else
1666
b76ab3c968ab AIC/MQ encoding fix
michael
parents: 1663
diff changeset
1817 level = (level - (scale>>1))/scale;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
1818
350
6ebbecc10063 - Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents: 346
diff changeset
1819 /* AIC can change CBP */
6ebbecc10063 - Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents: 346
diff changeset
1820 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
1821 s->block_last_index[i] = -1;
1666
b76ab3c968ab AIC/MQ encoding fix
michael
parents: 1663
diff changeset
1822
b76ab3c968ab AIC/MQ encoding fix
michael
parents: 1663
diff changeset
1823 if(!s->modified_quant){
b76ab3c968ab AIC/MQ encoding fix
michael
parents: 1663
diff changeset
1824 if (level < -127)
b76ab3c968ab AIC/MQ encoding fix
michael
parents: 1663
diff changeset
1825 level = -127;
b76ab3c968ab AIC/MQ encoding fix
michael
parents: 1663
diff changeset
1826 else if (level > 127)
b76ab3c968ab AIC/MQ encoding fix
michael
parents: 1663
diff changeset
1827 level = 127;
b76ab3c968ab AIC/MQ encoding fix
michael
parents: 1663
diff changeset
1828 }
b76ab3c968ab AIC/MQ encoding fix
michael
parents: 1663
diff changeset
1829
350
6ebbecc10063 - Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents: 346
diff changeset
1830 block[i][0] = level;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
1831 /* Reconstruction */
1666
b76ab3c968ab AIC/MQ encoding fix
michael
parents: 1663
diff changeset
1832 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
1833 /* Oddify */
6ebbecc10063 - Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents: 346
diff changeset
1834 rec_intradc[i] |= 1;
6ebbecc10063 - Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents: 346
diff changeset
1835 //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
1836 // rec_intradc[i]++;
6ebbecc10063 - Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents: 346
diff changeset
1837 /* Clipping */
6ebbecc10063 - Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents: 346
diff changeset
1838 if (rec_intradc[i] < 0)
6ebbecc10063 - Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents: 346
diff changeset
1839 rec_intradc[i] = 0;
6ebbecc10063 - Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents: 346
diff changeset
1840 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
1841 rec_intradc[i] = 2047;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
1842
350
6ebbecc10063 - Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents: 346
diff changeset
1843 /* Update AC/DC tables */
6ebbecc10063 - Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents: 346
diff changeset
1844 *dc_ptr[i] = rec_intradc[i];
1666
b76ab3c968ab AIC/MQ encoding fix
michael
parents: 1663
diff changeset
1845 if (s->block_last_index[i] >= 0)
b76ab3c968ab AIC/MQ encoding fix
michael
parents: 1663
diff changeset
1846 cbp |= 1 << (5 - i);
350
6ebbecc10063 - Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents: 346
diff changeset
1847 }
1666
b76ab3c968ab AIC/MQ encoding fix
michael
parents: 1663
diff changeset
1848 }else{
b76ab3c968ab AIC/MQ encoding fix
michael
parents: 1663
diff changeset
1849 for(i=0; i<6; i++) {
b76ab3c968ab AIC/MQ encoding fix
michael
parents: 1663
diff changeset
1850 /* compute cbp */
b76ab3c968ab AIC/MQ encoding fix
michael
parents: 1663
diff changeset
1851 if (s->block_last_index[i] >= 1)
b76ab3c968ab AIC/MQ encoding fix
michael
parents: 1663
diff changeset
1852 cbp |= 1 << (5 - i);
b76ab3c968ab AIC/MQ encoding fix
michael
parents: 1663
diff changeset
1853 }
350
6ebbecc10063 - Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents: 346
diff changeset
1854 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1855
350
6ebbecc10063 - Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents: 346
diff changeset
1856 cbpc = cbp & 3;
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6211
diff changeset
1857 if (s->pict_type == FF_I_TYPE) {
695
3525da287ee2 adaptive quantization for h263
michaelni
parents: 692
diff changeset
1858 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
1859 put_bits(&s->pb,
6ebbecc10063 - Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents: 346
diff changeset
1860 intra_MCBPC_bits[cbpc],
6ebbecc10063 - Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents: 346
diff changeset
1861 intra_MCBPC_code[cbpc]);
6ebbecc10063 - Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents: 346
diff changeset
1862 } else {
695
3525da287ee2 adaptive quantization for h263
michaelni
parents: 692
diff changeset
1863 if(s->dquant) cbpc+=8;
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
1864 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
1865 put_bits(&s->pb,
6ebbecc10063 - Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents: 346
diff changeset
1866 inter_MCBPC_bits[cbpc + 4],
6ebbecc10063 - Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents: 346
diff changeset
1867 inter_MCBPC_code[cbpc + 4]);
6ebbecc10063 - Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents: 346
diff changeset
1868 }
6ebbecc10063 - Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents: 346
diff changeset
1869 if (s->h263_aic) {
6ebbecc10063 - Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents: 346
diff changeset
1870 /* XXX: currently, we do not try to use ac prediction */
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
1871 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
1872 }
6ebbecc10063 - Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents: 346
diff changeset
1873 cbpy = cbp >> 2;
6ebbecc10063 - Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents: 346
diff changeset
1874 put_bits(&s->pb, cbpy_tab[cbpy][1], cbpy_tab[cbpy][0]);
695
3525da287ee2 adaptive quantization for h263
michaelni
parents: 692
diff changeset
1875 if(s->dquant)
3525da287ee2 adaptive quantization for h263
michaelni
parents: 692
diff changeset
1876 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
1877
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1350
diff changeset
1878 if(interleaved_stats){
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1350
diff changeset
1879 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
1880 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1881 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1882
350
6ebbecc10063 - Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents: 346
diff changeset
1883 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
1884 /* encode each block */
1354
1f89adb69349 flv cleanup / simplify
michaelni
parents: 1353
diff changeset
1885 h263_encode_block(s, block[i], i);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
1886
350
6ebbecc10063 - Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents: 346
diff changeset
1887 /* Update INTRADC for decoding */
6ebbecc10063 - Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents: 346
diff changeset
1888 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
1889 block[i][0] = rec_intradc[i];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
1890
350
6ebbecc10063 - Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents: 346
diff changeset
1891 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1892 }
1353
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1350
diff changeset
1893
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1350
diff changeset
1894 if(interleaved_stats){
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1350
diff changeset
1895 if (!s->mb_intra) {
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1350
diff changeset
1896 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
1897 s->f_count++;
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1350
diff changeset
1898 }else{
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1350
diff changeset
1899 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
1900 s->i_count++;
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1350
diff changeset
1901 }
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1350
diff changeset
1902 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1903 }
815
78accc54493b put a few large tables under #ifdef CONFIG_ENCODERS or dynamically allocate them
michaelni
parents: 770
diff changeset
1904 #endif
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1905
1656
34b0e799aeb6 cleanup
michael
parents: 1655
diff changeset
1906 void ff_h263_loop_filter(MpegEncContext * s){
1644
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
1907 int qp_c;
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
1908 const int linesize = s->linesize;
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
1909 const int uvlinesize= s->uvlinesize;
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
1910 const int xy = s->mb_y * s->mb_stride + s->mb_x;
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
1911 uint8_t *dest_y = s->dest[0];
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
1912 uint8_t *dest_cb= s->dest[1];
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
1913 uint8_t *dest_cr= s->dest[2];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
1914
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6211
diff changeset
1915 // if(s->pict_type==FF_B_TYPE && !s->readable) return;
1644
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
1916
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
1917 /*
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
1918 Diag Top
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
1919 Left Center
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
1920 */
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
1921 if(!IS_SKIP(s->current_picture.mb_type[xy])){
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
1922 qp_c= s->qscale;
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
1923 s->dsp.h263_v_loop_filter(dest_y+8*linesize , linesize, qp_c);
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
1924 s->dsp.h263_v_loop_filter(dest_y+8*linesize+8, linesize, qp_c);
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
1925 }else
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
1926 qp_c= 0;
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
1927
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
1928 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
1929 int qp_dt, qp_tt, qp_tc;
1644
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
1930
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
1931 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
1932 qp_tt=0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
1933 else
8297
20e0f0809b27 s/qp_t/qp_tt/ to avoid bad examples that could lead to issues with reserved
michael
parents: 8288
diff changeset
1934 qp_tt= s->current_picture.qscale_table[xy-s->mb_stride];
1644
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
1935
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
1936 if(qp_c)
1644
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
1937 qp_tc= qp_c;
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
1938 else
8297
20e0f0809b27 s/qp_t/qp_tt/ to avoid bad examples that could lead to issues with reserved
michael
parents: 8288
diff changeset
1939 qp_tc= qp_tt;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
1940
1644
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
1941 if(qp_tc){
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
1942 const int chroma_qp= s->chroma_qscale_table[qp_tc];
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
1943 s->dsp.h263_v_loop_filter(dest_y , linesize, qp_tc);
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
1944 s->dsp.h263_v_loop_filter(dest_y+8, linesize, qp_tc);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
1945
1644
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
1946 s->dsp.h263_v_loop_filter(dest_cb , uvlinesize, chroma_qp);
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
1947 s->dsp.h263_v_loop_filter(dest_cr , uvlinesize, chroma_qp);
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
1948 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
1949
8297
20e0f0809b27 s/qp_t/qp_tt/ to avoid bad examples that could lead to issues with reserved
michael
parents: 8288
diff changeset
1950 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
1951 s->dsp.h263_h_loop_filter(dest_y-8*linesize+8 , linesize, qp_tt);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
1952
1644
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
1953 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
1954 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
1955 qp_dt= qp_tt;
1644
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
1956 else
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
1957 qp_dt= s->current_picture.qscale_table[xy-1-s->mb_stride];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
1958
1644
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
1959 if(qp_dt){
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
1960 const int chroma_qp= s->chroma_qscale_table[qp_dt];
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
1961 s->dsp.h263_h_loop_filter(dest_y -8*linesize , linesize, qp_dt);
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
1962 s->dsp.h263_h_loop_filter(dest_cb-8*uvlinesize, uvlinesize, chroma_qp);
2178
f140ada1f755 copy & paste bug
michael
parents: 2167
diff changeset
1963 s->dsp.h263_h_loop_filter(dest_cr-8*uvlinesize, uvlinesize, chroma_qp);
1644
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
1964 }
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
1965 }
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
1966 }
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
1967
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
1968 if(qp_c){
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
1969 s->dsp.h263_h_loop_filter(dest_y +8, linesize, qp_c);
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
1970 if(s->mb_y + 1 == s->mb_height)
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
1971 s->dsp.h263_h_loop_filter(dest_y+8*linesize+8, linesize, qp_c);
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
1972 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
1973
1644
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
1974 if(s->mb_x){
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
1975 int qp_lc;
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
1976 if(qp_c || IS_SKIP(s->current_picture.mb_type[xy-1]))
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
1977 qp_lc= qp_c;
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
1978 else
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
1979 qp_lc= s->current_picture.qscale_table[xy-1];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
1980
1644
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
1981 if(qp_lc){
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
1982 s->dsp.h263_h_loop_filter(dest_y, linesize, qp_lc);
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
1983 if(s->mb_y + 1 == s->mb_height){
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
1984 const int chroma_qp= s->chroma_qscale_table[qp_lc];
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
1985 s->dsp.h263_h_loop_filter(dest_y +8* linesize, linesize, qp_lc);
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
1986 s->dsp.h263_h_loop_filter(dest_cb , uvlinesize, chroma_qp);
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
1987 s->dsp.h263_h_loop_filter(dest_cr , uvlinesize, chroma_qp);
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
1988 }
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
1989 }
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
1990 }
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
1991 }
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
1992
1057
bb5de8a59da8 * static,const,compiler warning cleanup
kabi
parents: 1053
diff changeset
1993 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
1994 {
249
42a0b7b16738 - Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents: 248
diff changeset
1995 int x, y, wrap, a, c, pred_dc, scale, i;
3781
8e79b099d354 dc_val should be signed
mru
parents: 3777
diff changeset
1996 int16_t *dc_val, *ac_val, *ac_val1;
248
56ee684c48bb - H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents: 245
diff changeset
1997
56ee684c48bb - H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents: 245
diff changeset
1998 /* find prediction */
56ee684c48bb - H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents: 245
diff changeset
1999 if (n < 4) {
1938
e2501e6e7ff7 unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents: 1936
diff changeset
2000 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
2001 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
2002 wrap = s->b8_stride;
248
56ee684c48bb - H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents: 245
diff changeset
2003 dc_val = s->dc_val[0];
249
42a0b7b16738 - Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents: 248
diff changeset
2004 ac_val = s->ac_val[0][0];
248
56ee684c48bb - H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents: 245
diff changeset
2005 scale = s->y_dc_scale;
56ee684c48bb - H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents: 245
diff changeset
2006 } else {
1938
e2501e6e7ff7 unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents: 1936
diff changeset
2007 x = s->mb_x;
e2501e6e7ff7 unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents: 1936
diff changeset
2008 y = s->mb_y;
e2501e6e7ff7 unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents: 1936
diff changeset
2009 wrap = s->mb_stride;
248
56ee684c48bb - H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents: 245
diff changeset
2010 dc_val = s->dc_val[n - 4 + 1];
249
42a0b7b16738 - Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents: 248
diff changeset
2011 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
2012 scale = s->c_dc_scale;
56ee684c48bb - H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents: 245
diff changeset
2013 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
2014
249
42a0b7b16738 - Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents: 248
diff changeset
2015 ac_val += ((y) * wrap + (x)) * 16;
42a0b7b16738 - Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents: 248
diff changeset
2016 ac_val1 = ac_val;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
2017
248
56ee684c48bb - H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents: 245
diff changeset
2018 /* B C
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
2019 * A X
248
56ee684c48bb - H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents: 245
diff changeset
2020 */
56ee684c48bb - H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents: 245
diff changeset
2021 a = dc_val[(x - 1) + (y) * wrap];
56ee684c48bb - H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents: 245
diff changeset
2022 c = dc_val[(x) + (y - 1) * wrap];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
2023
350
6ebbecc10063 - Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents: 346
diff changeset
2024 /* No prediction outside GOB boundary */
1639
3e2b774edce4 rv20 decoder
michael
parents: 1637
diff changeset
2025 if(s->first_slice_line && n!=3){
3e2b774edce4 rv20 decoder
michael
parents: 1637
diff changeset
2026 if(n!=2) c= 1024;
3e2b774edce4 rv20 decoder
michael
parents: 1637
diff changeset
2027 if(n!=1 && s->mb_x == s->resync_mb_x) a= 1024;
3e2b774edce4 rv20 decoder
michael
parents: 1637
diff changeset
2028 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
2029
248
56ee684c48bb - H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents: 245
diff changeset
2030 if (s->ac_pred) {
1639
3e2b774edce4 rv20 decoder
michael
parents: 1637
diff changeset
2031 pred_dc = 1024;
248
56ee684c48bb - H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents: 245
diff changeset
2032 if (s->h263_aic_dir) {
56ee684c48bb - H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents: 245
diff changeset
2033 /* left prediction */
249
42a0b7b16738 - Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents: 248
diff changeset
2034 if (a != 1024) {
42a0b7b16738 - Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents: 248
diff changeset
2035 ac_val -= 16;
42a0b7b16738 - Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents: 248
diff changeset
2036 for(i=1;i<8;i++) {
1092
f59c3f66363b MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
michaelni
parents: 1090
diff changeset
2037 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
2038 }
42a0b7b16738 - Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents: 248
diff changeset
2039 pred_dc = a;
248
56ee684c48bb - H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents: 245
diff changeset
2040 }
56ee684c48bb - H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents: 245
diff changeset
2041 } else {
56ee684c48bb - H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents: 245
diff changeset
2042 /* top prediction */
249
42a0b7b16738 - Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents: 248
diff changeset
2043 if (c != 1024) {
42a0b7b16738 - Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents: 248
diff changeset
2044 ac_val -= 16 * wrap;
42a0b7b16738 - Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents: 248
diff changeset
2045 for(i=1;i<8;i++) {
1092
f59c3f66363b MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
michaelni
parents: 1090
diff changeset
2046 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
2047 }
42a0b7b16738 - Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents: 248
diff changeset
2048 pred_dc = c;
248
56ee684c48bb - H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents: 245
diff changeset
2049 }
56ee684c48bb - H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents: 245
diff changeset
2050 }
249
42a0b7b16738 - Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents: 248
diff changeset
2051 } else {
42a0b7b16738 - Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents: 248
diff changeset
2052 /* just DC prediction */
42a0b7b16738 - Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents: 248
diff changeset
2053 if (a != 1024 && c != 1024)
42a0b7b16738 - Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents: 248
diff changeset
2054 pred_dc = (a + c) >> 1;
42a0b7b16738 - Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents: 248
diff changeset
2055 else if (a != 1024)
42a0b7b16738 - Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents: 248
diff changeset
2056 pred_dc = a;
42a0b7b16738 - Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents: 248
diff changeset
2057 else
42a0b7b16738 - Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents: 248
diff changeset
2058 pred_dc = c;
248
56ee684c48bb - H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents: 245
diff changeset
2059 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
2060
249
42a0b7b16738 - Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents: 248
diff changeset
2061 /* we assume pred is positive */
42a0b7b16738 - Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents: 248
diff changeset
2062 block[0]=block[0]*scale + pred_dc;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
2063
249
42a0b7b16738 - Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents: 248
diff changeset
2064 if (block[0] < 0)
42a0b7b16738 - Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents: 248
diff changeset
2065 block[0] = 0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
2066 else
1639
3e2b774edce4 rv20 decoder
michael
parents: 1637
diff changeset
2067 block[0] |= 1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
2068
249
42a0b7b16738 - Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents: 248
diff changeset
2069 /* Update AC/DC tables */
42a0b7b16738 - Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents: 248
diff changeset
2070 dc_val[(x) + (y) * wrap] = block[0];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
2071
248
56ee684c48bb - H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents: 245
diff changeset
2072 /* left copy */
56ee684c48bb - H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents: 245
diff changeset
2073 for(i=1;i<8;i++)
1092
f59c3f66363b MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
michaelni
parents: 1090
diff changeset
2074 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
2075 /* top copy */
56ee684c48bb - H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents: 245
diff changeset
2076 for(i=1;i<8;i++)
1092
f59c3f66363b MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
michaelni
parents: 1090
diff changeset
2077 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
2078 }
56ee684c48bb - H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents: 245
diff changeset
2079
1938
e2501e6e7ff7 unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents: 1936
diff changeset
2080 int16_t *h263_pred_motion(MpegEncContext * s, int block, int dir,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2081 int *px, int *py)
986e461dc072 Initial revision
glantau
parents:
diff changeset
2082 {
1938
e2501e6e7ff7 unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents: 1936
diff changeset
2083 int wrap;
1655
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
2084 int16_t *A, *B, *C, (*mot_val)[2];
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
2085 static const int off[4]= {2, 1, 1, -1};
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
2086
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
2087 wrap = s->b8_stride;
1938
e2501e6e7ff7 unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents: 1936
diff changeset
2088 mot_val = s->current_picture.motion_val[dir] + s->block_index[block];
1655
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
2089
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
2090 A = mot_val[ - 1];
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
2091 /* special case for first (slice) line */
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
2092 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
2093 // we can't just change some MVs to simulate that as we need them for the B frames (and ME)
1655
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
2094 // and if we ever support non rectangular objects than we need to do a few ifs here anyway :(
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
2095 if(block==0){ //most common case
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
2096 if(s->mb_x == s->resync_mb_x){ //rare
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
2097 *px= *py = 0;
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
2098 }else if(s->mb_x + 1 == s->resync_mb_x && s->h263_pred){ //rare
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
2099 C = mot_val[off[block] - wrap];
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
2100 if(s->mb_x==0){
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
2101 *px = C[0];
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
2102 *py = C[1];
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
2103 }else{
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
2104 *px = mid_pred(A[0], 0, C[0]);
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
2105 *py = mid_pred(A[1], 0, C[1]);
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
2106 }
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
2107 }else{
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
2108 *px = A[0];
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
2109 *py = A[1];
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
2110 }
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
2111 }else if(block==1){
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
2112 if(s->mb_x + 1 == s->resync_mb_x && s->h263_pred){ //rare
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
2113 C = mot_val[off[block] - wrap];
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
2114 *px = mid_pred(A[0], 0, C[0]);
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
2115 *py = mid_pred(A[1], 0, C[1]);
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
2116 }else{
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
2117 *px = A[0];
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
2118 *py = A[1];
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
2119 }
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
2120 }else{ /* block==2*/
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
2121 B = mot_val[ - wrap];
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
2122 C = mot_val[off[block] - wrap];
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
2123 if(s->mb_x == s->resync_mb_x) //rare
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
2124 A[0]=A[1]=0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
2125
1655
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
2126 *px = mid_pred(A[0], B[0], C[0]);
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
2127 *py = mid_pred(A[1], B[1], C[1]);
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
2128 }
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
2129 } else {
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
2130 B = mot_val[ - wrap];
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
2131 C = mot_val[off[block] - wrap];
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
2132 *px = mid_pred(A[0], B[0], C[0]);
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
2133 *py = mid_pred(A[1], B[1], C[1]);
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
2134 }
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
2135 return *mot_val;
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
2136 }
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
2137
8590
7a463923ecd1 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 8418
diff changeset
2138 #if CONFIG_ENCODERS
10755
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2139
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2140 /***************************************************/
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2141 /**
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2142 * add mpeg4 stuffing bits (01...1)
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2143 */
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2144 void ff_mpeg4_stuffing(PutBitContext * pbc)
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2145 {
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2146 int length;
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2147 put_bits(pbc, 1, 0);
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2148 length= (-put_bits_count(pbc))&7;
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2149 if(length) put_bits(pbc, length, (1<<length)-1);
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2150 }
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2151
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2152 /* must be called before writing the header */
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2153 void ff_set_mpeg4_time(MpegEncContext * s){
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2154 if(s->pict_type==FF_B_TYPE){
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2155 ff_mpeg4_init_direct_mv(s);
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2156 }else{
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2157 s->last_time_base= s->time_base;
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2158 s->time_base= s->time/s->avctx->time_base.den;
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2159 }
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2160 }
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2161
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2162 static void mpeg4_encode_gop_header(MpegEncContext * s){
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2163 int hours, minutes, seconds;
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2164 int64_t time;
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2165
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2166 put_bits(&s->pb, 16, 0);
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2167 put_bits(&s->pb, 16, GOP_STARTCODE);
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2168
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2169 time= s->current_picture_ptr->pts;
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2170 if(s->reordered_input_picture[1])
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2171 time= FFMIN(time, s->reordered_input_picture[1]->pts);
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2172 time= time*s->avctx->time_base.num;
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2173
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2174 seconds= time/s->avctx->time_base.den;
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2175 minutes= seconds/60; seconds %= 60;
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2176 hours= minutes/60; minutes %= 60;
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2177 hours%=24;
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2178
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2179 put_bits(&s->pb, 5, hours);
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2180 put_bits(&s->pb, 6, minutes);
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2181 put_bits(&s->pb, 1, 1);
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2182 put_bits(&s->pb, 6, seconds);
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2183
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2184 put_bits(&s->pb, 1, !!(s->flags&CODEC_FLAG_CLOSED_GOP));
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2185 put_bits(&s->pb, 1, 0); //broken link == NO
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2186
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2187 s->last_time_base= time / s->avctx->time_base.den;
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2188
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2189 ff_mpeg4_stuffing(&s->pb);
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2190 }
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2191
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2192 static void mpeg4_encode_visual_object_header(MpegEncContext * s){
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2193 int profile_and_level_indication;
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2194 int vo_ver_id;
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2195
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2196 if(s->avctx->profile != FF_PROFILE_UNKNOWN){
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2197 profile_and_level_indication = s->avctx->profile << 4;
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2198 }else if(s->max_b_frames || s->quarter_sample){
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2199 profile_and_level_indication= 0xF0; // adv simple
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2200 }else{
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2201 profile_and_level_indication= 0x00; // simple
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2202 }
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2203
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2204 if(s->avctx->level != FF_LEVEL_UNKNOWN){
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2205 profile_and_level_indication |= s->avctx->level;
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2206 }else{
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2207 profile_and_level_indication |= 1; //level 1
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2208 }
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2209
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2210 if(profile_and_level_indication>>4 == 0xF){
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2211 vo_ver_id= 5;
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2212 }else{
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2213 vo_ver_id= 1;
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2214 }
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2215
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2216 //FIXME levels
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2217
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2218 put_bits(&s->pb, 16, 0);
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2219 put_bits(&s->pb, 16, VOS_STARTCODE);
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2220
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2221 put_bits(&s->pb, 8, profile_and_level_indication);
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2222
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2223 put_bits(&s->pb, 16, 0);
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2224 put_bits(&s->pb, 16, VISUAL_OBJ_STARTCODE);
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2225
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2226 put_bits(&s->pb, 1, 1);
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2227 put_bits(&s->pb, 4, vo_ver_id);
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2228 put_bits(&s->pb, 3, 1); //priority
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2229
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2230 put_bits(&s->pb, 4, 1); //visual obj type== video obj
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2231
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2232 put_bits(&s->pb, 1, 0); //video signal type == no clue //FIXME
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2233
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2234 ff_mpeg4_stuffing(&s->pb);
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2235 }
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2236
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2237 static void mpeg4_encode_vol_header(MpegEncContext * s, int vo_number, int vol_number)
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2238 {
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2239 int vo_ver_id;
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2240
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2241 if (!CONFIG_MPEG4_ENCODER) return;
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2242
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2243 if(s->max_b_frames || s->quarter_sample){
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2244 vo_ver_id= 5;
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2245 s->vo_type= ADV_SIMPLE_VO_TYPE;
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2246 }else{
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2247 vo_ver_id= 1;
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2248 s->vo_type= SIMPLE_VO_TYPE;
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2249 }
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2250
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2251 put_bits(&s->pb, 16, 0);
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2252 put_bits(&s->pb, 16, 0x100 + vo_number); /* video obj */
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2253 put_bits(&s->pb, 16, 0);
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2254 put_bits(&s->pb, 16, 0x120 + vol_number); /* video obj layer */
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2255
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2256 put_bits(&s->pb, 1, 0); /* random access vol */
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2257 put_bits(&s->pb, 8, s->vo_type); /* video obj type indication */
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2258 if(s->workaround_bugs & FF_BUG_MS) {
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2259 put_bits(&s->pb, 1, 0); /* is obj layer id= no */
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2260 } else {
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2261 put_bits(&s->pb, 1, 1); /* is obj layer id= yes */
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2262 put_bits(&s->pb, 4, vo_ver_id); /* is obj layer ver id */
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2263 put_bits(&s->pb, 3, 1); /* is obj layer priority */
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2264 }
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2265
10785
bb3abb64e395 Cleanup aspect_to_info().
michael
parents: 10784
diff changeset
2266 s->aspect_ratio_info= aspect_to_info(s->avctx->sample_aspect_ratio);
10755
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2267
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2268 put_bits(&s->pb, 4, s->aspect_ratio_info);/* aspect ratio info */
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2269 if (s->aspect_ratio_info == FF_ASPECT_EXTENDED){
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2270 put_bits(&s->pb, 8, s->avctx->sample_aspect_ratio.num);
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2271 put_bits(&s->pb, 8, s->avctx->sample_aspect_ratio.den);
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2272 }
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2273
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2274 if(s->workaround_bugs & FF_BUG_MS) { //
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2275 put_bits(&s->pb, 1, 0); /* vol control parameters= no @@@ */
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2276 } else {
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2277 put_bits(&s->pb, 1, 1); /* vol control parameters= yes */
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2278 put_bits(&s->pb, 2, 1); /* chroma format YUV 420/YV12 */
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2279 put_bits(&s->pb, 1, s->low_delay);
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2280 put_bits(&s->pb, 1, 0); /* vbv parameters= no */
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2281 }
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2282
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2283 put_bits(&s->pb, 2, RECT_SHAPE); /* vol shape= rectangle */
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2284 put_bits(&s->pb, 1, 1); /* marker bit */
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2285
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2286 put_bits(&s->pb, 16, s->avctx->time_base.den);
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2287 if (s->time_increment_bits < 1)
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2288 s->time_increment_bits = 1;
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2289 put_bits(&s->pb, 1, 1); /* marker bit */
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2290 put_bits(&s->pb, 1, 0); /* fixed vop rate=no */
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2291 put_bits(&s->pb, 1, 1); /* marker bit */
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2292 put_bits(&s->pb, 13, s->width); /* vol width */
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2293 put_bits(&s->pb, 1, 1); /* marker bit */
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2294 put_bits(&s->pb, 13, s->height); /* vol height */
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2295 put_bits(&s->pb, 1, 1); /* marker bit */
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2296 put_bits(&s->pb, 1, s->progressive_sequence ? 0 : 1);
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2297 put_bits(&s->pb, 1, 1); /* obmc disable */
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2298 if (vo_ver_id == 1) {
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2299 put_bits(&s->pb, 1, s->vol_sprite_usage); /* sprite enable */
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2300 }else{
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2301 put_bits(&s->pb, 2, s->vol_sprite_usage); /* sprite enable */
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2302 }
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2303
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2304 put_bits(&s->pb, 1, 0); /* not 8 bit == false */
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2305 put_bits(&s->pb, 1, s->mpeg_quant); /* quant type= (0=h263 style)*/
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2306
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2307 if(s->mpeg_quant){
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2308 ff_write_quant_matrix(&s->pb, s->avctx->intra_matrix);
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2309 ff_write_quant_matrix(&s->pb, s->avctx->inter_matrix);
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2310 }
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2311
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2312 if (vo_ver_id != 1)
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2313 put_bits(&s->pb, 1, s->quarter_sample);
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2314 put_bits(&s->pb, 1, 1); /* complexity estimation disable */
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2315 s->resync_marker= s->rtp_mode;
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2316 put_bits(&s->pb, 1, s->resync_marker ? 0 : 1);/* resync marker disable */
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2317 put_bits(&s->pb, 1, s->data_partitioning ? 1 : 0);
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2318 if(s->data_partitioning){
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2319 put_bits(&s->pb, 1, 0); /* no rvlc */
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2320 }
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2321
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2322 if (vo_ver_id != 1){
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2323 put_bits(&s->pb, 1, 0); /* newpred */
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2324 put_bits(&s->pb, 1, 0); /* reduced res vop */
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2325 }
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2326 put_bits(&s->pb, 1, 0); /* scalability */
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2327
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2328 ff_mpeg4_stuffing(&s->pb);
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2329
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2330 /* user data */
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2331 if(!(s->flags & CODEC_FLAG_BITEXACT)){
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2332 put_bits(&s->pb, 16, 0);
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2333 put_bits(&s->pb, 16, 0x1B2); /* user_data */
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2334 ff_put_string(&s->pb, LIBAVCODEC_IDENT, 0);
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2335 }
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2336 }
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2337
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2338 /* write mpeg4 VOP header */
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2339 void mpeg4_encode_picture_header(MpegEncContext * s, int picture_number)
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2340 {
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2341 int time_incr;
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2342 int time_div, time_mod;
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2343
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2344 if(s->pict_type==FF_I_TYPE){
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2345 if(!(s->flags&CODEC_FLAG_GLOBAL_HEADER)){
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2346 if(s->strict_std_compliance < FF_COMPLIANCE_VERY_STRICT) //HACK, the reference sw is buggy
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2347 mpeg4_encode_visual_object_header(s);
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2348 if(s->strict_std_compliance < FF_COMPLIANCE_VERY_STRICT || picture_number==0) //HACK, the reference sw is buggy
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2349 mpeg4_encode_vol_header(s, 0, 0);
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2350 }
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2351 if(!(s->workaround_bugs & FF_BUG_MS))
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2352 mpeg4_encode_gop_header(s);
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2353 }
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2354
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2355 s->partitioned_frame= s->data_partitioning && s->pict_type!=FF_B_TYPE;
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2356
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2357 put_bits(&s->pb, 16, 0); /* vop header */
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2358 put_bits(&s->pb, 16, VOP_STARTCODE); /* vop header */
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2359 put_bits(&s->pb, 2, s->pict_type - 1); /* pict type: I = 0 , P = 1 */
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2360
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2361 assert(s->time>=0);
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2362 time_div= s->time/s->avctx->time_base.den;
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2363 time_mod= s->time%s->avctx->time_base.den;
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2364 time_incr= time_div - s->last_time_base;
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2365 assert(time_incr >= 0);
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2366 while(time_incr--)
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2367 put_bits(&s->pb, 1, 1);
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2368
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2369 put_bits(&s->pb, 1, 0);
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2370
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2371 put_bits(&s->pb, 1, 1); /* marker */
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2372 put_bits(&s->pb, s->time_increment_bits, time_mod); /* time increment */
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2373 put_bits(&s->pb, 1, 1); /* marker */
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2374 put_bits(&s->pb, 1, 1); /* vop coded */
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2375 if ( s->pict_type == FF_P_TYPE
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2376 || (s->pict_type == FF_S_TYPE && s->vol_sprite_usage==GMC_SPRITE)) {
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2377 put_bits(&s->pb, 1, s->no_rounding); /* rounding type */
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2378 }
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2379 put_bits(&s->pb, 3, 0); /* intra dc VLC threshold */
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2380 if(!s->progressive_sequence){
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2381 put_bits(&s->pb, 1, s->current_picture_ptr->top_field_first);
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2382 put_bits(&s->pb, 1, s->alternate_scan);
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2383 }
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2384 //FIXME sprite stuff
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2385
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2386 put_bits(&s->pb, 5, s->qscale);
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2387
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2388 if (s->pict_type != FF_I_TYPE)
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2389 put_bits(&s->pb, 3, s->f_code); /* fcode_for */
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2390 if (s->pict_type == FF_B_TYPE)
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2391 put_bits(&s->pb, 3, s->b_code); /* fcode_back */
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2392 }
465c9e1cad02 cosmetics: Move MPEG-4 encoding functions around to avoid forward declarations.
diego
parents: 10754
diff changeset
2393
2017
f089d25c82f0 motion estimation for SVQ1
michael
parents: 2004
diff changeset
2394 void ff_h263_encode_motion(MpegEncContext * s, int val, int f_code)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2395 {
702
2cff6fc37716 minor optimization of h263_encode_motion()
michaelni
parents: 701
diff changeset
2396 int range, l, bit_size, sign, code, bits;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2397
986e461dc072 Initial revision
glantau
parents:
diff changeset
2398 if (val == 0) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
2399 /* zero vector */
986e461dc072 Initial revision
glantau
parents:
diff changeset
2400 code = 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
2401 put_bits(&s->pb, mvtab[code][1], mvtab[code][0]);
986e461dc072 Initial revision
glantau
parents:
diff changeset
2402 } else {
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 322
diff changeset
2403 bit_size = f_code - 1;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2404 range = 1 << bit_size;
986e461dc072 Initial revision
glantau
parents:
diff changeset
2405 /* modulo encoding */
2093
82816cad0e29 optimization
michael
parents: 2080
diff changeset
2406 l= INT_BIT - 6 - bit_size;
82816cad0e29 optimization
michael
parents: 2080
diff changeset
2407 val = (val<<l)>>l;
702
2cff6fc37716 minor optimization of h263_encode_motion()
michaelni
parents: 701
diff changeset
2408 sign = val>>31;
2cff6fc37716 minor optimization of h263_encode_motion()
michaelni
parents: 701
diff changeset
2409 val= (val^sign)-sign;
2cff6fc37716 minor optimization of h263_encode_motion()
michaelni
parents: 701
diff changeset
2410 sign&=1;
2093
82816cad0e29 optimization
michael
parents: 2080
diff changeset
2411
312
8cf5507e6ca5 mpeg4 mpeg quantizer support
michaelni
parents: 301
diff changeset
2412 val--;
8cf5507e6ca5 mpeg4 mpeg quantizer support
michaelni
parents: 301
diff changeset
2413 code = (val >> bit_size) + 1;
8cf5507e6ca5 mpeg4 mpeg quantizer support
michaelni
parents: 301
diff changeset
2414 bits = val & (range - 1);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2415
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
2416 put_bits(&s->pb, mvtab[code][1] + 1, (mvtab[code][0] << 1) | sign);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2417 if (bit_size > 0) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
2418 put_bits(&s->pb, bit_size, bits);
986e461dc072 Initial revision
glantau
parents:
diff changeset
2419 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
2420 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
2421 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
2422
277
5cb2978e701f new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents: 274
diff changeset
2423 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
2424 {
5cb2978e701f new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents: 274
diff changeset
2425 int f_code;
5cb2978e701f new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents: 274
diff changeset
2426 int mv;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
2427
277
5cb2978e701f new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents: 274
diff changeset
2428 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
2429 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
2430 int len;
5cb2978e701f new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents: 274
diff changeset
2431
5cb2978e701f new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents: 274
diff changeset
2432 if(mv==0) len= mvtab[0][1];
5cb2978e701f new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents: 274
diff changeset
2433 else{
9465
9dcb191f1df3 Remove unused variable in init_mv_penalty_and_fcode() found by CSA.
michael
parents: 9458
diff changeset
2434 int val, bit_size, code;
277
5cb2978e701f new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents: 274
diff changeset
2435
1893
779bdf5063ce 1000000l (using uninitalized variable for initalizing bits per MV table)
michael
parents: 1873
diff changeset
2436 bit_size = f_code - 1;
277
5cb2978e701f new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents: 274
diff changeset
2437
5cb2978e701f new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents: 274
diff changeset
2438 val=mv;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
2439 if (val < 0)
277
5cb2978e701f new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents: 274
diff changeset
2440 val = -val;
5cb2978e701f new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents: 274
diff changeset
2441 val--;
5cb2978e701f new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents: 274
diff changeset
2442 code = (val >> bit_size) + 1;
5cb2978e701f new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents: 274
diff changeset
2443 if(code<33){
5cb2978e701f new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents: 274
diff changeset
2444 len= mvtab[code][1] + 1 + bit_size;
5cb2978e701f new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents: 274
diff changeset
2445 }else{
2985
7de97d3ac7ef slightly better mv_penalty table
michael
parents: 2979
diff changeset
2446 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
2447 }
5cb2978e701f new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents: 274
diff changeset
2448 }
5cb2978e701f new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents: 274
diff changeset
2449
5cb2978e701f new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents: 274
diff changeset
2450 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
2451 }
5cb2978e701f new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents: 274
diff changeset
2452 }
5cb2978e701f new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents: 274
diff changeset
2453
5cb2978e701f new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents: 274
diff changeset
2454 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
2455 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
2456 fcode_tab[mv+MAX_MV]= f_code;
5cb2978e701f new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents: 274
diff changeset
2457 }
5cb2978e701f new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents: 274
diff changeset
2458 }
287
32a3dcce2e9b fixing motion estimation with h263p hopefully
michaelni
parents: 286
diff changeset
2459
32a3dcce2e9b fixing motion estimation with h263p hopefully
michaelni
parents: 286
diff changeset
2460 for(mv=0; mv<MAX_MV*2+1; mv++){
32a3dcce2e9b fixing motion estimation with h263p hopefully
michaelni
parents: 286
diff changeset
2461 umv_fcode_tab[mv]= 1;
32a3dcce2e9b fixing motion estimation with h263p hopefully
michaelni
parents: 286
diff changeset
2462 }
277
5cb2978e701f new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents: 274
diff changeset
2463 }
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
2464
468
1e23eae32087 Minor warning cleanup.
mellum
parents: 453
diff changeset
2465 static void init_uni_dc_tab(void)
293
6eaf5da091fa optimizing mpeg4_encode_dc
michaelni
parents: 292
diff changeset
2466 {
6eaf5da091fa optimizing mpeg4_encode_dc
michaelni
parents: 292
diff changeset
2467 int level, uni_code, uni_len;
6eaf5da091fa optimizing mpeg4_encode_dc
michaelni
parents: 292
diff changeset
2468
312
8cf5507e6ca5 mpeg4 mpeg quantizer support
michaelni
parents: 301
diff changeset
2469 for(level=-256; level<256; level++){
293
6eaf5da091fa optimizing mpeg4_encode_dc
michaelni
parents: 292
diff changeset
2470 int size, v, l;
6eaf5da091fa optimizing mpeg4_encode_dc
michaelni
parents: 292
diff changeset
2471 /* find number of bits */
6eaf5da091fa optimizing mpeg4_encode_dc
michaelni
parents: 292
diff changeset
2472 size = 0;
6eaf5da091fa optimizing mpeg4_encode_dc
michaelni
parents: 292
diff changeset
2473 v = abs(level);
6eaf5da091fa optimizing mpeg4_encode_dc
michaelni
parents: 292
diff changeset
2474 while (v) {
6eaf5da091fa optimizing mpeg4_encode_dc
michaelni
parents: 292
diff changeset
2475 v >>= 1;
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
2476 size++;
293
6eaf5da091fa optimizing mpeg4_encode_dc
michaelni
parents: 292
diff changeset
2477 }
6eaf5da091fa optimizing mpeg4_encode_dc
michaelni
parents: 292
diff changeset
2478
6eaf5da091fa optimizing mpeg4_encode_dc
michaelni
parents: 292
diff changeset
2479 if (level < 0)
6eaf5da091fa optimizing mpeg4_encode_dc
michaelni
parents: 292
diff changeset
2480 l= (-level) ^ ((1 << size) - 1);
6eaf5da091fa optimizing mpeg4_encode_dc
michaelni
parents: 292
diff changeset
2481 else
6eaf5da091fa optimizing mpeg4_encode_dc
michaelni
parents: 292
diff changeset
2482 l= level;
6eaf5da091fa optimizing mpeg4_encode_dc
michaelni
parents: 292
diff changeset
2483
6eaf5da091fa optimizing mpeg4_encode_dc
michaelni
parents: 292
diff changeset
2484 /* luminance */
6eaf5da091fa optimizing mpeg4_encode_dc
michaelni
parents: 292
diff changeset
2485 uni_code= DCtab_lum[size][0];
6eaf5da091fa optimizing mpeg4_encode_dc
michaelni
parents: 292
diff changeset
2486 uni_len = DCtab_lum[size][1];
6eaf5da091fa optimizing mpeg4_encode_dc
michaelni
parents: 292
diff changeset
2487
6eaf5da091fa optimizing mpeg4_encode_dc
michaelni
parents: 292
diff changeset
2488 if (size > 0) {
6eaf5da091fa optimizing mpeg4_encode_dc
michaelni
parents: 292
diff changeset
2489 uni_code<<=size; uni_code|=l;
6eaf5da091fa optimizing mpeg4_encode_dc
michaelni
parents: 292
diff changeset
2490 uni_len+=size;
6eaf5da091fa optimizing mpeg4_encode_dc
michaelni
parents: 292
diff changeset
2491 if (size > 8){
6eaf5da091fa optimizing mpeg4_encode_dc
michaelni
parents: 292
diff changeset
2492 uni_code<<=1; uni_code|=1;
6eaf5da091fa optimizing mpeg4_encode_dc
michaelni
parents: 292
diff changeset
2493 uni_len++;
6eaf5da091fa optimizing mpeg4_encode_dc
michaelni
parents: 292
diff changeset
2494 }
6eaf5da091fa optimizing mpeg4_encode_dc
michaelni
parents: 292
diff changeset
2495 }
1013
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1008
diff changeset
2496 uni_DCtab_lum_bits[level+256]= uni_code;
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1008
diff changeset
2497 uni_DCtab_lum_len [level+256]= uni_len;
293
6eaf5da091fa optimizing mpeg4_encode_dc
michaelni
parents: 292
diff changeset
2498
6eaf5da091fa optimizing mpeg4_encode_dc
michaelni
parents: 292
diff changeset
2499 /* chrominance */
6eaf5da091fa optimizing mpeg4_encode_dc
michaelni
parents: 292
diff changeset
2500 uni_code= DCtab_chrom[size][0];
6eaf5da091fa optimizing mpeg4_encode_dc
michaelni
parents: 292
diff changeset
2501 uni_len = DCtab_chrom[size][1];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
2502
293
6eaf5da091fa optimizing mpeg4_encode_dc
michaelni
parents: 292
diff changeset
2503 if (size > 0) {
6eaf5da091fa optimizing mpeg4_encode_dc
michaelni
parents: 292
diff changeset
2504 uni_code<<=size; uni_code|=l;
6eaf5da091fa optimizing mpeg4_encode_dc
michaelni
parents: 292
diff changeset
2505 uni_len+=size;
6eaf5da091fa optimizing mpeg4_encode_dc
michaelni
parents: 292
diff changeset
2506 if (size > 8){
6eaf5da091fa optimizing mpeg4_encode_dc
michaelni
parents: 292
diff changeset
2507 uni_code<<=1; uni_code|=1;
6eaf5da091fa optimizing mpeg4_encode_dc
michaelni
parents: 292
diff changeset
2508 uni_len++;
6eaf5da091fa optimizing mpeg4_encode_dc
michaelni
parents: 292
diff changeset
2509 }
6eaf5da091fa optimizing mpeg4_encode_dc
michaelni
parents: 292
diff changeset
2510 }
1013
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1008
diff changeset
2511 uni_DCtab_chrom_bits[level+256]= uni_code;
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1008
diff changeset
2512 uni_DCtab_chrom_len [level+256]= uni_len;
293
6eaf5da091fa optimizing mpeg4_encode_dc
michaelni
parents: 292
diff changeset
2513
6eaf5da091fa optimizing mpeg4_encode_dc
michaelni
parents: 292
diff changeset
2514 }
6eaf5da091fa optimizing mpeg4_encode_dc
michaelni
parents: 292
diff changeset
2515 }
6eaf5da091fa optimizing mpeg4_encode_dc
michaelni
parents: 292
diff changeset
2516
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
2517 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
2518 int slevel, run, last;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
2519
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
2520 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
2521 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
2522
dddcff6841f2 optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents: 619
diff changeset
2523 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
2524 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
2525 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
2526 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
2527 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
2528 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
2529 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
2530 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
2531 int level1, run1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
2532
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
2533 len_tab[index]= 100;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
2534
648
dddcff6841f2 optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents: 619
diff changeset
2535 /* 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
2536 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
2537 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
2538 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
2539 bits=bits*2+sign; len++;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
2540
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
2541 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
2542 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
2543 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
2544 }
dddcff6841f2 optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents: 619
diff changeset
2545 /* 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
2546 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
2547 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
2548 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
2549 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
2550 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
2551 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
2552 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
2553 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
2554 bits += rl->table_vlc[code][0];
dddcff6841f2 optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents: 619
diff changeset
2555 bits=bits*2+sign; len++;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
2556
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
2557 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
2558 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
2559 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
2560 }
dddcff6841f2 optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents: 619
diff changeset
2561 }
dddcff6841f2 optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents: 619
diff changeset
2562 /* 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
2563 bits= rl->table_vlc[rl->n][0];
dddcff6841f2 optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents: 619
diff changeset
2564 len= rl->table_vlc[rl->n][1];
dddcff6841f2 optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents: 619
diff changeset
2565 bits=bits*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
2566 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
2567 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
2568 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
2569 bits<<= rl->table_vlc[code][1];
dddcff6841f2 optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents: 619
diff changeset
2570 len += rl->table_vlc[code][1];
dddcff6841f2 optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents: 619
diff changeset
2571 bits += rl->table_vlc[code][0];
dddcff6841f2 optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents: 619
diff changeset
2572 bits=bits*2+sign; len++;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
2573
648
dddcff6841f2 optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents: 619
diff changeset
2574 if(code!=rl->n && len < len_tab[index]){
dddcff6841f2 optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents: 619
diff changeset
2575 bits_tab[index]= bits;
dddcff6841f2 optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents: 619
diff changeset
2576 len_tab [index]= len;
dddcff6841f2 optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents: 619
diff changeset
2577 }
dddcff6841f2 optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents: 619
diff changeset
2578 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
2579 /* 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
2580 bits= rl->table_vlc[rl->n][0];
dddcff6841f2 optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents: 619
diff changeset
2581 len = rl->table_vlc[rl->n][1];
dddcff6841f2 optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents: 619
diff changeset
2582 bits=bits*4+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
2583 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
2584 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
2585 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
2586 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
2587 bits=bits*2+1; len++; //marker
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
2588
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
2589 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
2590 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
2591 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
2592 }
dddcff6841f2 optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents: 619
diff changeset
2593 }
dddcff6841f2 optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents: 619
diff changeset
2594 }
dddcff6841f2 optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents: 619
diff changeset
2595 }
dddcff6841f2 optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents: 619
diff changeset
2596 }
dddcff6841f2 optimizing mpeg4_encode_block(), generates allso slightly shorter bitstream as some codes can be represented as esc1 and esc2 and esc2 is shorter for a few of them
michaelni
parents: 619
diff changeset
2597
2253
1085c5284bf1 trellis quantization for h263(p)
michael
parents: 2243
diff changeset
2598 static void init_uni_h263_rl_tab(RLTable *rl, uint32_t *bits_tab, uint8_t *len_tab){
1085c5284bf1 trellis quantization for h263(p)
michael
parents: 2243
diff changeset
2599 int slevel, run, last;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
2600
2253
1085c5284bf1 trellis quantization for h263(p)
michael
parents: 2243
diff changeset
2601 assert(MAX_LEVEL >= 64);
1085c5284bf1 trellis quantization for h263(p)
michael
parents: 2243
diff changeset
2602 assert(MAX_RUN >= 63);
1085c5284bf1 trellis quantization for h263(p)
michael
parents: 2243
diff changeset
2603
1085c5284bf1 trellis quantization for h263(p)
michael
parents: 2243
diff changeset
2604 for(slevel=-64; slevel<64; slevel++){
1085c5284bf1 trellis quantization for h263(p)
michael
parents: 2243
diff changeset
2605 if(slevel==0) continue;
1085c5284bf1 trellis quantization for h263(p)
michael
parents: 2243
diff changeset
2606 for(run=0; run<64; run++){
1085c5284bf1 trellis quantization for h263(p)
michael
parents: 2243
diff changeset
2607 for(last=0; last<=1; last++){
1085c5284bf1 trellis quantization for h263(p)
michael
parents: 2243
diff changeset
2608 const int index= UNI_MPEG4_ENC_INDEX(last, run, slevel+64);
1085c5284bf1 trellis quantization for h263(p)
michael
parents: 2243
diff changeset
2609 int level= slevel < 0 ? -slevel : slevel;
1085c5284bf1 trellis quantization for h263(p)
michael
parents: 2243
diff changeset
2610 int sign= slevel < 0 ? 1 : 0;
1085c5284bf1 trellis quantization for h263(p)
michael
parents: 2243
diff changeset
2611 int bits, len, code;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
2612
2253
1085c5284bf1 trellis quantization for h263(p)
michael
parents: 2243
diff changeset
2613 len_tab[index]= 100;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
2614
2253
1085c5284bf1 trellis quantization for h263(p)
michael
parents: 2243
diff changeset
2615 /* ESC0 */
1085c5284bf1 trellis quantization for h263(p)
michael
parents: 2243
diff changeset
2616 code= get_rl_index(rl, last, run, level);
1085c5284bf1 trellis quantization for h263(p)
michael
parents: 2243
diff changeset
2617 bits= rl->table_vlc[code][0];
1085c5284bf1 trellis quantization for h263(p)
michael
parents: 2243
diff changeset
2618 len= rl->table_vlc[code][1];
1085c5284bf1 trellis quantization for h263(p)
michael
parents: 2243
diff changeset
2619 bits=bits*2+sign; len++;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
2620
2253
1085c5284bf1 trellis quantization for h263(p)
michael
parents: 2243
diff changeset
2621 if(code!=rl->n && len < len_tab[index]){
1085c5284bf1 trellis quantization for h263(p)
michael
parents: 2243
diff changeset
2622 if(bits_tab) bits_tab[index]= bits;
1085c5284bf1 trellis quantization for h263(p)
michael
parents: 2243
diff changeset
2623 len_tab [index]= len;
1085c5284bf1 trellis quantization for h263(p)
michael
parents: 2243
diff changeset
2624 }
1085c5284bf1 trellis quantization for h263(p)
michael
parents: 2243
diff changeset
2625 /* ESC */
1085c5284bf1 trellis quantization for h263(p)
michael
parents: 2243
diff changeset
2626 bits= rl->table_vlc[rl->n][0];
1085c5284bf1 trellis quantization for h263(p)
michael
parents: 2243
diff changeset
2627 len = rl->table_vlc[rl->n][1];
1085c5284bf1 trellis quantization for h263(p)
michael
parents: 2243
diff changeset
2628 bits=bits*2+last; len++;
1085c5284bf1 trellis quantization for h263(p)
michael
parents: 2243
diff changeset
2629 bits=bits*64+run; len+=6;
1085c5284bf1 trellis quantization for h263(p)
michael
parents: 2243
diff changeset
2630 bits=bits*256+(level&0xff); len+=8;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
2631
2253
1085c5284bf1 trellis quantization for h263(p)
michael
parents: 2243
diff changeset
2632 if(len < len_tab[index]){
1085c5284bf1 trellis quantization for h263(p)
michael
parents: 2243
diff changeset
2633 if(bits_tab) bits_tab[index]= bits;
1085c5284bf1 trellis quantization for h263(p)
michael
parents: 2243
diff changeset
2634 len_tab [index]= len;
1085c5284bf1 trellis quantization for h263(p)
michael
parents: 2243
diff changeset
2635 }
1085c5284bf1 trellis quantization for h263(p)
michael
parents: 2243
diff changeset
2636 }
1085c5284bf1 trellis quantization for h263(p)
michael
parents: 2243
diff changeset
2637 }
1085c5284bf1 trellis quantization for h263(p)
michael
parents: 2243
diff changeset
2638 }
1085c5284bf1 trellis quantization for h263(p)
michael
parents: 2243
diff changeset
2639 }
1085c5284bf1 trellis quantization for h263(p)
michael
parents: 2243
diff changeset
2640
277
5cb2978e701f new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents: 274
diff changeset
2641 void h263_encode_init(MpegEncContext *s)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2642 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
2643 static int done = 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
2644
986e461dc072 Initial revision
glantau
parents:
diff changeset
2645 if (!done) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
2646 done = 1;
293
6eaf5da091fa optimizing mpeg4_encode_dc
michaelni
parents: 292
diff changeset
2647
6eaf5da091fa optimizing mpeg4_encode_dc
michaelni
parents: 292
diff changeset
2648 init_uni_dc_tab();
6eaf5da091fa optimizing mpeg4_encode_dc
michaelni
parents: 292
diff changeset
2649
4668
1f1a0e67b961 kill av_mallocz_static() calls in init_rl()
michael
parents: 4655
diff changeset
2650 init_rl(&rl_inter, static_rl_table_store[0]);
1f1a0e67b961 kill av_mallocz_static() calls in init_rl()
michael
parents: 4655
diff changeset
2651 init_rl(&rl_intra, static_rl_table_store[1]);
1f1a0e67b961 kill av_mallocz_static() calls in init_rl()
michael
parents: 4655
diff changeset
2652 init_rl(&rl_intra_aic, static_rl_table_store[2]);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
2653
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
2654 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
2655 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
2656
2253
1085c5284bf1 trellis quantization for h263(p)
michael
parents: 2243
diff changeset
2657 init_uni_h263_rl_tab(&rl_intra_aic, NULL, uni_h263_intra_aic_rl_len);
1085c5284bf1 trellis quantization for h263(p)
michael
parents: 2243
diff changeset
2658 init_uni_h263_rl_tab(&rl_inter , NULL, uni_h263_inter_rl_len);
1085c5284bf1 trellis quantization for h263(p)
michael
parents: 2243
diff changeset
2659
277
5cb2978e701f new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents: 274
diff changeset
2660 init_mv_penalty_and_fcode(s);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2661 }
936
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
2662 s->me.mv_penalty= mv_penalty; //FIXME exact table for msmpeg4 & h263p
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
2663
2253
1085c5284bf1 trellis quantization for h263(p)
michael
parents: 2243
diff changeset
2664 s->intra_ac_vlc_length =s->inter_ac_vlc_length = uni_h263_inter_rl_len;
1085c5284bf1 trellis quantization for h263(p)
michael
parents: 2243
diff changeset
2665 s->intra_ac_vlc_last_length=s->inter_ac_vlc_last_length= uni_h263_inter_rl_len + 128*64;
1085c5284bf1 trellis quantization for h263(p)
michael
parents: 2243
diff changeset
2666 if(s->h263_aic){
1085c5284bf1 trellis quantization for h263(p)
michael
parents: 2243
diff changeset
2667 s->intra_ac_vlc_length = uni_h263_intra_aic_rl_len;
1085c5284bf1 trellis quantization for h263(p)
michael
parents: 2243
diff changeset
2668 s->intra_ac_vlc_last_length= uni_h263_intra_aic_rl_len + 128*64;
1085c5284bf1 trellis quantization for h263(p)
michael
parents: 2243
diff changeset
2669 }
1085c5284bf1 trellis quantization for h263(p)
michael
parents: 2243
diff changeset
2670 s->ac_esc_length= 7+1+6+8;
1085c5284bf1 trellis quantization for h263(p)
michael
parents: 2243
diff changeset
2671
287
32a3dcce2e9b fixing motion estimation with h263p hopefully
michaelni
parents: 286
diff changeset
2672 // use fcodes >1 only for mpeg4 & h263 & h263p FIXME
344
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
2673 switch(s->codec_id){
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
2674 case CODEC_ID_MPEG4:
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
2675 s->fcode_tab= fcode_tab;
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
2676 s->min_qcoeff= -2048;
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
2677 s->max_qcoeff= 2047;
945
463f7260b155 trellis quantization
michaelni
parents: 942
diff changeset
2678 s->intra_ac_vlc_length = uni_mpeg4_intra_rl_len;
463f7260b155 trellis quantization
michaelni
parents: 942
diff changeset
2679 s->intra_ac_vlc_last_length= uni_mpeg4_intra_rl_len + 128*64;
463f7260b155 trellis quantization
michaelni
parents: 942
diff changeset
2680 s->inter_ac_vlc_length = uni_mpeg4_inter_rl_len;
463f7260b155 trellis quantization
michaelni
parents: 942
diff changeset
2681 s->inter_ac_vlc_last_length= uni_mpeg4_inter_rl_len + 128*64;
1013
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1008
diff changeset
2682 s->luma_dc_vlc_length= uni_DCtab_lum_len;
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1008
diff changeset
2683 s->chroma_dc_vlc_length= uni_DCtab_chrom_len;
945
463f7260b155 trellis quantization
michaelni
parents: 942
diff changeset
2684 s->ac_esc_length= 7+2+1+6+1+12+1;
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1796
diff changeset
2685 s->y_dc_scale_table= ff_mpeg4_y_dc_scale_table;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1796
diff changeset
2686 s->c_dc_scale_table= ff_mpeg4_c_dc_scale_table;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1796
diff changeset
2687
1424
39ebefd82728 fixing CODEC_FLAG_GLOBAL_HEADER
michaelni
parents: 1419
diff changeset
2688 if(s->flags & CODEC_FLAG_GLOBAL_HEADER){
1483
michaelni
parents: 1482
diff changeset
2689
1424
39ebefd82728 fixing CODEC_FLAG_GLOBAL_HEADER
michaelni
parents: 1419
diff changeset
2690 s->avctx->extradata= av_malloc(1024);
1522
79dddc5cd990 removed the obsolete and unused parameters of init_put_bits
alex
parents: 1521
diff changeset
2691 init_put_bits(&s->pb, s->avctx->extradata, 1024);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
2692
2572
c22ad129a91b support omiting various headers in mpeg4 as WMP seems to have difficulty with them
michael
parents: 2554
diff changeset
2693 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
2694 mpeg4_encode_visual_object_header(s);
1424
39ebefd82728 fixing CODEC_FLAG_GLOBAL_HEADER
michaelni
parents: 1419
diff changeset
2695 mpeg4_encode_vol_header(s, 0, 0);
39ebefd82728 fixing CODEC_FLAG_GLOBAL_HEADER
michaelni
parents: 1419
diff changeset
2696
39ebefd82728 fixing CODEC_FLAG_GLOBAL_HEADER
michaelni
parents: 1419
diff changeset
2697 // ff_mpeg4_stuffing(&s->pb); ?
39ebefd82728 fixing CODEC_FLAG_GLOBAL_HEADER
michaelni
parents: 1419
diff changeset
2698 flush_put_bits(&s->pb);
1786
b7340afa261a get_bit_count -> put_bits_count
alex
parents: 1773
diff changeset
2699 s->avctx->extradata_size= (put_bits_count(&s->pb)+7)>>3;
1424
39ebefd82728 fixing CODEC_FLAG_GLOBAL_HEADER
michaelni
parents: 1419
diff changeset
2700 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
2701
344
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
2702 break;
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
2703 case CODEC_ID_H263P:
1666
b76ab3c968ab AIC/MQ encoding fix
michael
parents: 1663
diff changeset
2704 if(s->umvplus)
b76ab3c968ab AIC/MQ encoding fix
michael
parents: 1663
diff changeset
2705 s->fcode_tab= umv_fcode_tab;
b76ab3c968ab AIC/MQ encoding fix
michael
parents: 1663
diff changeset
2706 if(s->modified_quant){
b76ab3c968ab AIC/MQ encoding fix
michael
parents: 1663
diff changeset
2707 s->min_qcoeff= -2047;
b76ab3c968ab AIC/MQ encoding fix
michael
parents: 1663
diff changeset
2708 s->max_qcoeff= 2047;
b76ab3c968ab AIC/MQ encoding fix
michael
parents: 1663
diff changeset
2709 }else{
b76ab3c968ab AIC/MQ encoding fix
michael
parents: 1663
diff changeset
2710 s->min_qcoeff= -127;
b76ab3c968ab AIC/MQ encoding fix
michael
parents: 1663
diff changeset
2711 s->max_qcoeff= 127;
b76ab3c968ab AIC/MQ encoding fix
michael
parents: 1663
diff changeset
2712 }
344
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
2713 break;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
2714 //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
2715 case CODEC_ID_FLV1:
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1350
diff changeset
2716 if (s->h263_flv > 1) {
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1350
diff changeset
2717 s->min_qcoeff= -1023;
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1350
diff changeset
2718 s->max_qcoeff= 1023;
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1350
diff changeset
2719 } else {
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1350
diff changeset
2720 s->min_qcoeff= -127;
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1350
diff changeset
2721 s->max_qcoeff= 127;
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1350
diff changeset
2722 }
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1350
diff changeset
2723 s->y_dc_scale_table=
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1350
diff changeset
2724 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
2725 break;
2646
c735e3e60ca7 Even More spelling errors. patch by (Kevin Baragona <kevinmb500 gawab com)
michael
parents: 2639
diff changeset
2726 default: //nothing needed - default table already set in mpegvideo.c
1089
7e79a58954b1 h263(+) clenaup & bugfixes
michaelni
parents: 1070
diff changeset
2727 s->min_qcoeff= -127;
344
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
2728 s->max_qcoeff= 127;
498
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 482
diff changeset
2729 s->y_dc_scale_table=
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 482
diff changeset
2730 s->c_dc_scale_table= ff_mpeg1_dc_scale_table;
344
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
2731 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2732 }
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
2733 #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
2734
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
2735 /**
1034
af7ba8d8b43a feeding doxygen
michaelni
parents: 1025
diff changeset
2736 * predicts the ac.
af7ba8d8b43a feeding doxygen
michaelni
parents: 1025
diff changeset
2737 * @param n block index (0-3 are luma, 4-5 are chroma)
af7ba8d8b43a feeding doxygen
michaelni
parents: 1025
diff changeset
2738 * @param dir the ac prediction direction
af7ba8d8b43a feeding doxygen
michaelni
parents: 1025
diff changeset
2739 */
1008
fb6cbb8a04a3 fixing DCTELEM != short
michaelni
parents: 999
diff changeset
2740 void mpeg4_pred_ac(MpegEncContext * s, DCTELEM *block, int n,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2741 int dir)
986e461dc072 Initial revision
glantau
parents:
diff changeset
2742 {
266
252444e5259b optimization
michaelni
parents: 265
diff changeset
2743 int i;
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
2744 int16_t *ac_val, *ac_val1;
903
22ee74da2cd3 cleanup
michaelni
parents: 892
diff changeset
2745 int8_t * const qscale_table= s->current_picture.qscale_table;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2746
986e461dc072 Initial revision
glantau
parents:
diff changeset
2747 /* find prediction */
266
252444e5259b optimization
michaelni
parents: 265
diff changeset
2748 ac_val = s->ac_val[0][0] + s->block_index[n] * 16;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2749 ac_val1 = ac_val;
986e461dc072 Initial revision
glantau
parents:
diff changeset
2750 if (s->ac_pred) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
2751 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
2752 const int xy= s->mb_x-1 + s->mb_y*s->mb_stride;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2753 /* left prediction */
986e461dc072 Initial revision
glantau
parents:
diff changeset
2754 ac_val -= 16;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
2755
903
22ee74da2cd3 cleanup
michaelni
parents: 892
diff changeset
2756 if(s->mb_x==0 || s->qscale == qscale_table[xy] || n==1 || n==3){
575
23eee7d73c4b minor optimizations
michaelni
parents: 564
diff changeset
2757 /* same qscale */
23eee7d73c4b minor optimizations
michaelni
parents: 564
diff changeset
2758 for(i=1;i<8;i++) {
1092
f59c3f66363b MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
michaelni
parents: 1090
diff changeset
2759 block[s->dsp.idct_permutation[i<<3]] += ac_val[i];
575
23eee7d73c4b minor optimizations
michaelni
parents: 564
diff changeset
2760 }
23eee7d73c4b minor optimizations
michaelni
parents: 564
diff changeset
2761 }else{
23eee7d73c4b minor optimizations
michaelni
parents: 564
diff changeset
2762 /* different qscale, we must rescale */
23eee7d73c4b minor optimizations
michaelni
parents: 564
diff changeset
2763 for(i=1;i<8;i++) {
1092
f59c3f66363b MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
michaelni
parents: 1090
diff changeset
2764 block[s->dsp.idct_permutation[i<<3]] += ROUNDED_DIV(ac_val[i]*qscale_table[xy], s->qscale);
575
23eee7d73c4b minor optimizations
michaelni
parents: 564
diff changeset
2765 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2766 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
2767 } 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
2768 const int xy= s->mb_x + s->mb_y*s->mb_stride - s->mb_stride;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2769 /* top prediction */
266
252444e5259b optimization
michaelni
parents: 265
diff changeset
2770 ac_val -= 16 * s->block_wrap[n];
575
23eee7d73c4b minor optimizations
michaelni
parents: 564
diff changeset
2771
903
22ee74da2cd3 cleanup
michaelni
parents: 892
diff changeset
2772 if(s->mb_y==0 || s->qscale == qscale_table[xy] || n==2 || n==3){
575
23eee7d73c4b minor optimizations
michaelni
parents: 564
diff changeset
2773 /* same qscale */
23eee7d73c4b minor optimizations
michaelni
parents: 564
diff changeset
2774 for(i=1;i<8;i++) {
1092
f59c3f66363b MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
michaelni
parents: 1090
diff changeset
2775 block[s->dsp.idct_permutation[i]] += ac_val[i + 8];
575
23eee7d73c4b minor optimizations
michaelni
parents: 564
diff changeset
2776 }
23eee7d73c4b minor optimizations
michaelni
parents: 564
diff changeset
2777 }else{
23eee7d73c4b minor optimizations
michaelni
parents: 564
diff changeset
2778 /* different qscale, we must rescale */
23eee7d73c4b minor optimizations
michaelni
parents: 564
diff changeset
2779 for(i=1;i<8;i++) {
1092
f59c3f66363b MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
michaelni
parents: 1090
diff changeset
2780 block[s->dsp.idct_permutation[i]] += ROUNDED_DIV(ac_val[i + 8]*qscale_table[xy], s->qscale);
575
23eee7d73c4b minor optimizations
michaelni
parents: 564
diff changeset
2781 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2782 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
2783 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
2784 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
2785 /* left copy */
986e461dc072 Initial revision
glantau
parents:
diff changeset
2786 for(i=1;i<8;i++)
1092
f59c3f66363b MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
michaelni
parents: 1090
diff changeset
2787 ac_val1[i ] = block[s->dsp.idct_permutation[i<<3]];
591
d3f374218030 fixing mpeg4 mpeg quantizers
michaelni
parents: 582
diff changeset
2788
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2789 /* top copy */
986e461dc072 Initial revision
glantau
parents:
diff changeset
2790 for(i=1;i<8;i++)
1092
f59c3f66363b MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
michaelni
parents: 1090
diff changeset
2791 ac_val1[8 + i] = block[s->dsp.idct_permutation[i ]];
591
d3f374218030 fixing mpeg4 mpeg quantizers
michaelni
parents: 582
diff changeset
2792
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2793 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
2794
986e461dc072 Initial revision
glantau
parents:
diff changeset
2795 /***********************************************/
986e461dc072 Initial revision
glantau
parents:
diff changeset
2796 /* decoding */
986e461dc072 Initial revision
glantau
parents:
diff changeset
2797
986e461dc072 Initial revision
glantau
parents:
diff changeset
2798 static VLC intra_MCBPC_vlc;
986e461dc072 Initial revision
glantau
parents:
diff changeset
2799 static VLC inter_MCBPC_vlc;
986e461dc072 Initial revision
glantau
parents:
diff changeset
2800 static VLC cbpy_vlc;
986e461dc072 Initial revision
glantau
parents:
diff changeset
2801 static VLC mv_vlc;
986e461dc072 Initial revision
glantau
parents:
diff changeset
2802 static VLC dc_lum, dc_chrom;
254
b4fed8b24e3a gmc bitstream decoding support (the real motion compensation isnt implemnted yet)
michaelni
parents: 253
diff changeset
2803 static VLC sprite_trajectory;
262
7d941b8c4e84 mpeg4 b-frames :)
michaelni
parents: 255
diff changeset
2804 static VLC mb_type_b_vlc;
1655
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
2805 static VLC h263_mbtype_b_vlc;
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
2806 static VLC cbpc_b_vlc;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2807
986e461dc072 Initial revision
glantau
parents:
diff changeset
2808 /* init vlcs */
986e461dc072 Initial revision
glantau
parents:
diff changeset
2809
986e461dc072 Initial revision
glantau
parents:
diff changeset
2810 /* XXX: find a better solution to handle static init */
986e461dc072 Initial revision
glantau
parents:
diff changeset
2811 void h263_decode_init_vlc(MpegEncContext *s)
986e461dc072 Initial revision
glantau
parents:
diff changeset
2812 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
2813 static int done = 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
2814
986e461dc072 Initial revision
glantau
parents:
diff changeset
2815 if (!done) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
2816 done = 1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
2817
7098
f49a53051803 Allocate static tables on stack, not heap.
benoit
parents: 6940
diff changeset
2818 INIT_VLC_STATIC(&intra_MCBPC_vlc, INTRA_MCBPC_VLC_BITS, 9,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2819 intra_MCBPC_bits, 1, 1,
7098
f49a53051803 Allocate static tables on stack, not heap.
benoit
parents: 6940
diff changeset
2820 intra_MCBPC_code, 1, 1, 72);
f49a53051803 Allocate static tables on stack, not heap.
benoit
parents: 6940
diff changeset
2821 INIT_VLC_STATIC(&inter_MCBPC_vlc, INTER_MCBPC_VLC_BITS, 28,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2822 inter_MCBPC_bits, 1, 1,
7098
f49a53051803 Allocate static tables on stack, not heap.
benoit
parents: 6940
diff changeset
2823 inter_MCBPC_code, 1, 1, 198);
f49a53051803 Allocate static tables on stack, not heap.
benoit
parents: 6940
diff changeset
2824 INIT_VLC_STATIC(&cbpy_vlc, CBPY_VLC_BITS, 16,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2825 &cbpy_tab[0][1], 2, 1,
7098
f49a53051803 Allocate static tables on stack, not heap.
benoit
parents: 6940
diff changeset
2826 &cbpy_tab[0][0], 2, 1, 64);
f49a53051803 Allocate static tables on stack, not heap.
benoit
parents: 6940
diff changeset
2827 INIT_VLC_STATIC(&mv_vlc, MV_VLC_BITS, 33,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2828 &mvtab[0][1], 2, 1,
7098
f49a53051803 Allocate static tables on stack, not heap.
benoit
parents: 6940
diff changeset
2829 &mvtab[0][0], 2, 1, 538);
4668
1f1a0e67b961 kill av_mallocz_static() calls in init_rl()
michael
parents: 4655
diff changeset
2830 init_rl(&rl_inter, static_rl_table_store[0]);
1f1a0e67b961 kill av_mallocz_static() calls in init_rl()
michael
parents: 4655
diff changeset
2831 init_rl(&rl_intra, static_rl_table_store[1]);
1f1a0e67b961 kill av_mallocz_static() calls in init_rl()
michael
parents: 4655
diff changeset
2832 init_rl(&rvlc_rl_inter, static_rl_table_store[3]);
1f1a0e67b961 kill av_mallocz_static() calls in init_rl()
michael
parents: 4655
diff changeset
2833 init_rl(&rvlc_rl_intra, static_rl_table_store[4]);
1f1a0e67b961 kill av_mallocz_static() calls in init_rl()
michael
parents: 4655
diff changeset
2834 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
2835 INIT_VLC_RL(rl_inter, 554);
778ecab25dd8 Change init_vlc_rl() so it does not use *alloc_static() anymore.
michael
parents: 6918
diff changeset
2836 INIT_VLC_RL(rl_intra, 554);
778ecab25dd8 Change init_vlc_rl() so it does not use *alloc_static() anymore.
michael
parents: 6918
diff changeset
2837 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
2838 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
2839 INIT_VLC_RL(rl_intra_aic, 554);
7098
f49a53051803 Allocate static tables on stack, not heap.
benoit
parents: 6940
diff changeset
2840 INIT_VLC_STATIC(&dc_lum, DC_VLC_BITS, 10 /* 13 */,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2841 &DCtab_lum[0][1], 2, 1,
7098
f49a53051803 Allocate static tables on stack, not heap.
benoit
parents: 6940
diff changeset
2842 &DCtab_lum[0][0], 2, 1, 512);
f49a53051803 Allocate static tables on stack, not heap.
benoit
parents: 6940
diff changeset
2843 INIT_VLC_STATIC(&dc_chrom, DC_VLC_BITS, 10 /* 13 */,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2844 &DCtab_chrom[0][1], 2, 1,
7098
f49a53051803 Allocate static tables on stack, not heap.
benoit
parents: 6940
diff changeset
2845 &DCtab_chrom[0][0], 2, 1, 512);
f49a53051803 Allocate static tables on stack, not heap.
benoit
parents: 6940
diff changeset
2846 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
2847 &sprite_trajectory_tab[0][1], 4, 2,
7098
f49a53051803 Allocate static tables on stack, not heap.
benoit
parents: 6940
diff changeset
2848 &sprite_trajectory_tab[0][0], 4, 2, 128);
f49a53051803 Allocate static tables on stack, not heap.
benoit
parents: 6940
diff changeset
2849 INIT_VLC_STATIC(&mb_type_b_vlc, MB_TYPE_B_VLC_BITS, 4,
262
7d941b8c4e84 mpeg4 b-frames :)
michaelni
parents: 255
diff changeset
2850 &mb_type_b_tab[0][1], 2, 1,
7098
f49a53051803 Allocate static tables on stack, not heap.
benoit
parents: 6940
diff changeset
2851 &mb_type_b_tab[0][0], 2, 1, 16);
f49a53051803 Allocate static tables on stack, not heap.
benoit
parents: 6940
diff changeset
2852 INIT_VLC_STATIC(&h263_mbtype_b_vlc, H263_MBTYPE_B_VLC_BITS, 15,
1655
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
2853 &h263_mbtype_b_tab[0][1], 2, 1,
7098
f49a53051803 Allocate static tables on stack, not heap.
benoit
parents: 6940
diff changeset
2854 &h263_mbtype_b_tab[0][0], 2, 1, 80);
f49a53051803 Allocate static tables on stack, not heap.
benoit
parents: 6940
diff changeset
2855 INIT_VLC_STATIC(&cbpc_b_vlc, CBPC_B_VLC_BITS, 4,
1655
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
2856 &cbpc_b_tab[0][1], 2, 1,
7098
f49a53051803 Allocate static tables on stack, not heap.
benoit
parents: 6940
diff changeset
2857 &cbpc_b_tab[0][0], 2, 1, 8);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2858 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
2859 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
2860
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
2861 /**
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
2862 * 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
2863 */
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
2864 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
2865 if (s->height <= 400)
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
2866 return 1;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
2867 else if (s->height <= 800)
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
2868 return 2;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
2869 else
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
2870 return 4;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
2871 }
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
2872
1661
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
2873 int ff_h263_decode_mba(MpegEncContext *s)
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
2874 {
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
2875 int i, mb_pos;
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
2876
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
2877 for(i=0; i<6; i++){
1670
d6f2520c0c43 slice structured fixes
michael
parents: 1668
diff changeset
2878 if(s->mb_num-1 <= ff_mba_max[i]) break;
1661
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
2879 }
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
2880 mb_pos= get_bits(&s->gb, ff_mba_length[i]);
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
2881 s->mb_x= mb_pos % s->mb_width;
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
2882 s->mb_y= mb_pos / s->mb_width;
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
2883
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
2884 return mb_pos;
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
2885 }
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
2886
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
2887 void ff_h263_encode_mba(MpegEncContext *s)
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
2888 {
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
2889 int i, mb_pos;
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
2890
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
2891 for(i=0; i<6; i++){
1670
d6f2520c0c43 slice structured fixes
michael
parents: 1668
diff changeset
2892 if(s->mb_num-1 <= ff_mba_max[i]) break;
1661
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
2893 }
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
2894 mb_pos= s->mb_x + s->mb_width*s->mb_y;
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
2895 put_bits(&s->pb, ff_mba_length[i], mb_pos);
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
2896 }
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
2897
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
2898 /**
1661
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
2899 * decodes the group of blocks header or slice header.
6524
01647ac078a7 typo: occured --> occurred
diego
parents: 6497
diff changeset
2900 * @return <0 if an error occurred
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
2901 */
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
2902 static int h263_decode_gob_header(MpegEncContext *s)
162
de80712db90b - Preliminary RTP friendly mode for H.263.
pulento
parents: 161
diff changeset
2903 {
1661
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
2904 unsigned int val, gfid, gob_number;
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
2905 int left;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
2906
162
de80712db90b - Preliminary RTP friendly mode for H.263.
pulento
parents: 161
diff changeset
2907 /* Check for GOB Start Code */
de80712db90b - Preliminary RTP friendly mode for H.263.
pulento
parents: 161
diff changeset
2908 val = show_bits(&s->gb, 16);
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
2909 if(val)
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
2910 return -1;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
2911
162
de80712db90b - Preliminary RTP friendly mode for H.263.
pulento
parents: 161
diff changeset
2912 /* 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
2913 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
2914 left= get_bits_left(&s->gb);
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
2915 //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
2916 for(;left>13; left--){
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
2917 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
2918 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
2919 if(left<=13)
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
2920 return -1;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
2921
1661
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
2922 if(s->h263_slice_structured){
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
2923 if(get_bits1(&s->gb)==0)
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
2924 return -1;
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
2925
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
2926 ff_h263_decode_mba(s);
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
2927
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
2928 if(s->mb_num > 1583)
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
2929 if(get_bits1(&s->gb)==0)
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
2930 return -1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
2931
1661
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
2932 s->qscale = get_bits(&s->gb, 5); /* SQUANT */
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
2933 if(get_bits1(&s->gb)==0)
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
2934 return -1;
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
2935 gfid = get_bits(&s->gb, 2); /* GFID */
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
2936 }else{
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
2937 gob_number = get_bits(&s->gb, 5); /* GN */
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
2938 s->mb_x= 0;
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
2939 s->mb_y= s->gob_index* gob_number;
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
2940 gfid = get_bits(&s->gb, 2); /* GFID */
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
2941 s->qscale = get_bits(&s->gb, 5); /* GQUANT */
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
2942 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
2943
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
2944 if(s->mb_y >= s->mb_height)
1661
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
2945 return -1;
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
2946
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
2947 if(s->qscale==0)
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
2948 return -1;
1644
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
2949
162
de80712db90b - Preliminary RTP friendly mode for H.263.
pulento
parents: 161
diff changeset
2950 return 0;
de80712db90b - Preliminary RTP friendly mode for H.263.
pulento
parents: 161
diff changeset
2951 }
de80712db90b - Preliminary RTP friendly mode for H.263.
pulento
parents: 161
diff changeset
2952
290
2899263586cd resync marker support, needed for some mp4 files
michaelni
parents: 287
diff changeset
2953 static inline void memsetw(short *tab, int val, int n)
2899263586cd resync marker support, needed for some mp4 files
michaelni
parents: 287
diff changeset
2954 {
2899263586cd resync marker support, needed for some mp4 files
michaelni
parents: 287
diff changeset
2955 int i;
2899263586cd resync marker support, needed for some mp4 files
michaelni
parents: 287
diff changeset
2956 for(i=0;i<n;i++)
2899263586cd resync marker support, needed for some mp4 files
michaelni
parents: 287
diff changeset
2957 tab[i] = val;
2899263586cd resync marker support, needed for some mp4 files
michaelni
parents: 287
diff changeset
2958 }
2899263586cd resync marker support, needed for some mp4 files
michaelni
parents: 287
diff changeset
2959
8590
7a463923ecd1 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 8418
diff changeset
2960 #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
2961
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
2962 void ff_mpeg4_init_partitions(MpegEncContext *s)
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
2963 {
9431
932543edc1d2 Rename pbBufPtr() to put_bits_ptr().
stefano
parents: 9290
diff changeset
2964 uint8_t *start= put_bits_ptr(&s->pb);
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1796
diff changeset
2965 uint8_t *end= s->pb.buf_end;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1796
diff changeset
2966 int size= end - start;
9259
a031926f7d6b Use intptr_t when casting pointers to int.
ramiro
parents: 9104
diff changeset
2967 int pb_size = (((intptr_t)start + size/3)&(~3)) - (intptr_t)start;
1912
351e996f29d9 fixing alignment, 2nd try
michael
parents: 1910
diff changeset
2968 int tex_size= (size - 2*pb_size)&(~3);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
2969
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1796
diff changeset
2970 set_put_bits_buffer_size(&s->pb, pb_size);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1796
diff changeset
2971 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
2972 init_put_bits(&s->pb2 , start + pb_size + tex_size, pb_size);
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
2973 }
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
2974
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
2975 void ff_mpeg4_merge_partitions(MpegEncContext *s)
290
2899263586cd resync marker support, needed for some mp4 files
michaelni
parents: 287
diff changeset
2976 {
1786
b7340afa261a get_bit_count -> put_bits_count
alex
parents: 1773
diff changeset
2977 const int pb2_len = put_bits_count(&s->pb2 );
b7340afa261a get_bit_count -> put_bits_count
alex
parents: 1773
diff changeset
2978 const int tex_pb_len= put_bits_count(&s->tex_pb);
b7340afa261a get_bit_count -> put_bits_count
alex
parents: 1773
diff changeset
2979 const int bits= put_bits_count(&s->pb);
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
2980
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6211
diff changeset
2981 if(s->pict_type==FF_I_TYPE){
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
2982 put_bits(&s->pb, 19, DC_MARKER);
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
2983 s->misc_bits+=19 + pb2_len + bits - s->last_bits;
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
2984 s->i_tex_bits+= tex_pb_len;
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
2985 }else{
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
2986 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
2987 s->misc_bits+=17 + pb2_len;
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
2988 s->mv_bits+= bits - s->last_bits;
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
2989 s->p_tex_bits+= tex_pb_len;
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
2990 }
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
2991
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
2992 flush_put_bits(&s->pb2);
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
2993 flush_put_bits(&s->tex_pb);
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
2994
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1796
diff changeset
2995 set_put_bits_buffer_size(&s->pb, s->pb2.buf_end - s->pb.buf);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1796
diff changeset
2996 ff_copy_bits(&s->pb, s->pb2.buf , pb2_len);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1796
diff changeset
2997 ff_copy_bits(&s->pb, s->tex_pb.buf, tex_pb_len);
1786
b7340afa261a get_bit_count -> put_bits_count
alex
parents: 1773
diff changeset
2998 s->last_bits= put_bits_count(&s->pb);
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
2999 }
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3000
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
3001 #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
3002
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3003 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
3004 switch(s->pict_type){
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6211
diff changeset
3005 case FF_I_TYPE:
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3006 return 16;
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6211
diff changeset
3007 case FF_P_TYPE:
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6211
diff changeset
3008 case FF_S_TYPE:
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3009 return s->f_code+15;
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6211
diff changeset
3010 case FF_B_TYPE:
6655
22cca5d3173a Implement FFMAX3(a,b,c) - maximum over three arguments.
voroshil
parents: 6524
diff changeset
3011 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
3012 default:
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3013 return -1;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3014 }
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3015 }
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3016
8590
7a463923ecd1 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 8418
diff changeset
3017 #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
3018
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3019 void ff_mpeg4_encode_video_packet_header(MpegEncContext *s)
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3020 {
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3021 int mb_num_bits= av_log2(s->mb_num - 1) + 1;
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3022
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3023 put_bits(&s->pb, ff_mpeg4_get_video_packet_prefix_length(s), 0);
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3024 put_bits(&s->pb, 1, 1);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
3025
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3026 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
3027 put_bits(&s->pb, s->quant_precision, s->qscale);
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3028 put_bits(&s->pb, 1, 0); /* no HEC */
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3029 }
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3030
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
3031 #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
3032
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3033 /**
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3034 * 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
3035 * @return 0 if not
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3036 */
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3037 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
3038 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
3039 int v= show_bits(&s->gb, 16);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
3040
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3041 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
3042 return 0;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3043 }
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3044
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
3045 while(v<=0xFF){
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6211
diff changeset
3046 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
3047 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
3048 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
3049 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
3050 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
3051 }
f81bca10a740 100l for me, iam being to stupid to read the mpeg4 spec / eat stuffing mbs a the end of the picture
michael
parents: 4155
diff changeset
3052
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
3053 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
3054 v>>=8;
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3055 v|= 0x7F >> (7-(bits_count&7));
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
3056
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3057 if(v==0x7F)
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3058 return 1;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3059 }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
3060 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
3061 int len;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3062 GetBitContext gb= s->gb;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
3063
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3064 skip_bits(&s->gb, 1);
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3065 align_get_bits(&s->gb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
3066
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3067 for(len=0; len<32; len++){
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3068 if(get_bits1(&s->gb)) break;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3069 }
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3070
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3071 s->gb= gb;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3072
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3073 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
3074 return 1;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3075 }
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3076 }
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3077 return 0;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3078 }
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3079
10753
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3080 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
3081 {
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3082 int i;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3083 int a= 2<<s->sprite_warping_accuracy;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3084 int rho= 3-s->sprite_warping_accuracy;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3085 int r=16/a;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3086 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
3087 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
3088 int sprite_ref[4][2];
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3089 int virtual_ref[2][2];
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3090 int w2, h2, w3, h3;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3091 int alpha=0, beta=0;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3092 int w= s->width;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3093 int h= s->height;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3094 int min_ab;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3095
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3096 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
3097 int length;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3098 int x=0, y=0;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3099
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3100 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
3101 if(length){
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3102 x= get_xbits(gb, length);
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3103 }
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3104 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
3105
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3106 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
3107 if(length){
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3108 y=get_xbits(gb, length);
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3109 }
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3110 skip_bits1(gb); /* marker bit */
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3111 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
3112 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
3113 }
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3114 for(; i<4; i++)
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3115 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
3116
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3117 while((1<<alpha)<w) alpha++;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3118 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
3119 w2= 1<<alpha;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3120 h2= 1<<beta;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3121
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3122 // 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
3123 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
3124 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
3125 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
3126 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
3127 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
3128 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
3129 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
3130 } else {
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3131 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
3132 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
3133 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
3134 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
3135 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
3136 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
3137 }
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3138 /* 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
3139 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
3140
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3141 // 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
3142 // 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
3143 // 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
3144 // 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
3145 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
3146 + 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
3147 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
3148 + 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
3149 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
3150 + 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
3151 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
3152 + 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
3153
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3154 switch(s->num_sprite_warping_points)
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 case 0:
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3157 s->sprite_offset[0][0]= 0;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3158 s->sprite_offset[0][1]= 0;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3159 s->sprite_offset[1][0]= 0;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3160 s->sprite_offset[1][1]= 0;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3161 s->sprite_delta[0][0]= a;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3162 s->sprite_delta[0][1]= 0;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3163 s->sprite_delta[1][0]= 0;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3164 s->sprite_delta[1][1]= a;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3165 s->sprite_shift[0]= 0;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3166 s->sprite_shift[1]= 0;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3167 break;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3168 case 1: //GMC only
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3169 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
3170 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
3171 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
3172 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
3173 s->sprite_delta[0][0]= a;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3174 s->sprite_delta[0][1]= 0;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3175 s->sprite_delta[1][0]= 0;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3176 s->sprite_delta[1][1]= a;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3177 s->sprite_shift[0]= 0;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3178 s->sprite_shift[1]= 0;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3179 break;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3180 case 2:
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3181 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
3182 + (-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
3183 + ( 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
3184 + (1<<(alpha+rho-1));
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3185 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
3186 + (-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
3187 + (-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
3188 + (1<<(alpha+rho-1));
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3189 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
3190 +( 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
3191 +2*w2*r*sprite_ref[0][0]
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3192 - 16*w2
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3193 + (1<<(alpha+rho+1)));
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3194 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
3195 +(-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
3196 +2*w2*r*sprite_ref[0][1]
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3197 - 16*w2
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3198 + (1<<(alpha+rho+1)));
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3199 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
3200 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
3201 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
3202 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
3203
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3204 s->sprite_shift[0]= alpha+rho;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3205 s->sprite_shift[1]= alpha+rho+2;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3206 break;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3207 case 3:
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3208 min_ab= FFMIN(alpha, beta);
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3209 w3= w2>>min_ab;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3210 h3= h2>>min_ab;
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]<<(alpha+beta+rho-min_ab))
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3212 + (-r*sprite_ref[0][0] + virtual_ref[0][0])*h3*(-vop_ref[0][0])
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3213 + (-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
3214 + (1<<(alpha+beta+rho-min_ab-1));
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3215 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
3216 + (-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
3217 + (-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
3218 + (1<<(alpha+beta+rho-min_ab-1));
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3219 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
3220 + (-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
3221 + 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
3222 - 16*w2*h3
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3223 + (1<<(alpha+beta+rho-min_ab+1));
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3224 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
3225 + (-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
3226 + 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
3227 - 16*w2*h3
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3228 + (1<<(alpha+beta+rho-min_ab+1));
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3229 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
3230 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
3231 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
3232 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
3233
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3234 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
3235 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
3236 break;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3237 }
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3238 /* try to simplify the situation */
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3239 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
3240 && s->sprite_delta[0][1] == 0
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3241 && s->sprite_delta[1][0] == 0
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3242 && 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
3243 {
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3244 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
3245 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
3246 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
3247 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
3248 s->sprite_delta[0][0]= a;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3249 s->sprite_delta[0][1]= 0;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3250 s->sprite_delta[1][0]= 0;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3251 s->sprite_delta[1][1]= a;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3252 s->sprite_shift[0]= 0;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3253 s->sprite_shift[1]= 0;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3254 s->real_sprite_warping_points=1;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3255 }
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3256 else{
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3257 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
3258 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
3259 for(i=0; i<2; i++){
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3260 s->sprite_offset[0][i]<<= shift_y;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3261 s->sprite_offset[1][i]<<= shift_c;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3262 s->sprite_delta[0][i]<<= shift_y;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3263 s->sprite_delta[1][i]<<= shift_y;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3264 s->sprite_shift[i]= 16;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3265 }
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3266 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
3267 }
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3268 }
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3269
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3270 /**
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3271 * decodes the next video packet.
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3272 * @return <0 if something went wrong
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3273 */
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3274 static int mpeg4_decode_video_packet_header(MpegEncContext *s)
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3275 {
290
2899263586cd resync marker support, needed for some mp4 files
michaelni
parents: 287
diff changeset
3276 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
3277 int header_extension=0, mb_num, len;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
3278
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3279 /* 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
3280 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
3281
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3282 for(len=0; len<32; len++){
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3283 if(get_bits1(&s->gb)) break;
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3284 }
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3285
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3286 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
3287 av_log(s->avctx, AV_LOG_ERROR, "marker does not match f_code\n");
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3288 return -1;
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3289 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
3290
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3291 if(s->shape != RECT_SHAPE){
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3292 header_extension= get_bits1(&s->gb);
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3293 //FIXME more stuff here
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3294 }
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3295
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3296 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
3297 if(mb_num>=s->mb_num){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1586
diff changeset
3298 av_log(s->avctx, AV_LOG_ERROR, "illegal mb_num in video packet (%d %d) \n", mb_num, s->mb_num);
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3299 return -1;
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3300 }
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6211
diff changeset
3301 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
3302 while(s->next_picture.mbskip_table[ s->mb_index2xy[ mb_num ] ]) mb_num++;
6497
e44443c512b1 typo fixes
diego
parents: 6481
diff changeset
3303 if(mb_num >= s->mb_num) return -1; // slice contains just skipped MBs which where already decoded
1176
a39d55237445 b frames + slices bugfix
michaelni
parents: 1164
diff changeset
3304 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
3305
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3306 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
3307 s->mb_y= mb_num / s->mb_width;
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3308
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3309 if(s->shape != BIN_ONLY_SHAPE){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
3310 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
3311 if(qscale)
1644
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
3312 s->chroma_qscale=s->qscale= qscale;
290
2899263586cd resync marker support, needed for some mp4 files
michaelni
parents: 287
diff changeset
3313 }
2899263586cd resync marker support, needed for some mp4 files
michaelni
parents: 287
diff changeset
3314
2899263586cd resync marker support, needed for some mp4 files
michaelni
parents: 287
diff changeset
3315 if(s->shape == RECT_SHAPE){
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3316 header_extension= get_bits1(&s->gb);
290
2899263586cd resync marker support, needed for some mp4 files
michaelni
parents: 287
diff changeset
3317 }
2899263586cd resync marker support, needed for some mp4 files
michaelni
parents: 287
diff changeset
3318 if(header_extension){
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3319 int time_increment;
290
2899263586cd resync marker support, needed for some mp4 files
michaelni
parents: 287
diff changeset
3320 int time_incr=0;
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3321
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
3322 while (get_bits1(&s->gb) != 0)
290
2899263586cd resync marker support, needed for some mp4 files
michaelni
parents: 287
diff changeset
3323 time_incr++;
2899263586cd resync marker support, needed for some mp4 files
michaelni
parents: 287
diff changeset
3324
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3325 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
3326 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
3327 check_marker(&s->gb, "before vop_coding_type in video packed header");
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
3328
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3329 skip_bits(&s->gb, 2); /* vop coding type */
290
2899263586cd resync marker support, needed for some mp4 files
michaelni
parents: 287
diff changeset
3330 //FIXME not rect stuff here
2899263586cd resync marker support, needed for some mp4 files
michaelni
parents: 287
diff changeset
3331
2899263586cd resync marker support, needed for some mp4 files
michaelni
parents: 287
diff changeset
3332 if(s->shape != BIN_ONLY_SHAPE){
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3333 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
3334 //FIXME don't just ignore everything
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6211
diff changeset
3335 if(s->pict_type == FF_S_TYPE && s->vol_sprite_usage==GMC_SPRITE){
1914
8337c46a5abe gmc segfault fix
michael
parents: 1912
diff changeset
3336 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
3337 av_log(s->avctx, AV_LOG_ERROR, "untested\n");
290
2899263586cd resync marker support, needed for some mp4 files
michaelni
parents: 287
diff changeset
3338 }
2899263586cd resync marker support, needed for some mp4 files
michaelni
parents: 287
diff changeset
3339
2899263586cd resync marker support, needed for some mp4 files
michaelni
parents: 287
diff changeset
3340 //FIXME reduced res stuff here
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
3341
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6211
diff changeset
3342 if (s->pict_type != FF_I_TYPE) {
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
3343 int f_code = get_bits(&s->gb, 3); /* fcode_for */
660
b8e268337a1d parsing resync header extension support
michaelni
parents: 659
diff changeset
3344 if(f_code==0){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1586
diff changeset
3345 av_log(s->avctx, AV_LOG_ERROR, "Error, video packet header damaged (f_code=0)\n");
290
2899263586cd resync marker support, needed for some mp4 files
michaelni
parents: 287
diff changeset
3346 }
2899263586cd resync marker support, needed for some mp4 files
michaelni
parents: 287
diff changeset
3347 }
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6211
diff changeset
3348 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
3349 int b_code = get_bits(&s->gb, 3);
660
b8e268337a1d parsing resync header extension support
michaelni
parents: 659
diff changeset
3350 if(b_code==0){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1586
diff changeset
3351 av_log(s->avctx, AV_LOG_ERROR, "Error, video packet header damaged (b_code=0)\n");
660
b8e268337a1d parsing resync header extension support
michaelni
parents: 659
diff changeset
3352 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
3353 }
290
2899263586cd resync marker support, needed for some mp4 files
michaelni
parents: 287
diff changeset
3354 }
2899263586cd resync marker support, needed for some mp4 files
michaelni
parents: 287
diff changeset
3355 }
2899263586cd resync marker support, needed for some mp4 files
michaelni
parents: 287
diff changeset
3356 //FIXME new-pred stuff
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
3357
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3358 return 0;
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3359 }
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3360
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3361 void ff_mpeg4_clean_buffers(MpegEncContext *s)
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3362 {
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3363 int c_wrap, c_xy, l_wrap, l_xy;
290
2899263586cd resync marker support, needed for some mp4 files
michaelni
parents: 287
diff changeset
3364
1938
e2501e6e7ff7 unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents: 1936
diff changeset
3365 l_wrap= s->b8_stride;
e2501e6e7ff7 unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents: 1936
diff changeset
3366 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
3367 c_wrap= s->mb_stride;
e2501e6e7ff7 unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents: 1936
diff changeset
3368 c_xy= (s->mb_y-1)*c_wrap + s->mb_x - 1;
290
2899263586cd resync marker support, needed for some mp4 files
michaelni
parents: 287
diff changeset
3369
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3370 #if 0
290
2899263586cd resync marker support, needed for some mp4 files
michaelni
parents: 287
diff changeset
3371 /* clean DC */
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3372 memsetw(s->dc_val[0] + l_xy, 1024, l_wrap*2+1);
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3373 memsetw(s->dc_val[1] + c_xy, 1024, c_wrap+1);
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3374 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
3375 #endif
290
2899263586cd resync marker support, needed for some mp4 files
michaelni
parents: 287
diff changeset
3376
2899263586cd resync marker support, needed for some mp4 files
michaelni
parents: 287
diff changeset
3377 /* clean AC */
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
3378 memset(s->ac_val[0] + l_xy, 0, (l_wrap*2+1)*16*sizeof(int16_t));
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
3379 memset(s->ac_val[1] + c_xy, 0, (c_wrap +1)*16*sizeof(int16_t));
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
3380 memset(s->ac_val[2] + c_xy, 0, (c_wrap +1)*16*sizeof(int16_t));
290
2899263586cd resync marker support, needed for some mp4 files
michaelni
parents: 287
diff changeset
3381
2899263586cd resync marker support, needed for some mp4 files
michaelni
parents: 287
diff changeset
3382 /* clean MV */
2646
c735e3e60ca7 Even More spelling errors. patch by (Kevin Baragona <kevinmb500 gawab com)
michael
parents: 2639
diff changeset
3383 // we can't clear the MVs as they might be needed by a b frame
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
3384 // memset(s->motion_val + l_xy, 0, (l_wrap*2+1)*2*sizeof(int16_t));
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
3385 // memset(s->motion_val, 0, 2*sizeof(int16_t)*(2 + s->mb_width*2)*(2 + s->mb_height*2));
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3386 s->last_mv[0][0][0]=
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3387 s->last_mv[0][0][1]=
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3388 s->last_mv[1][0][0]=
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3389 s->last_mv[1][0][1]= 0;
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3390 }
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3391
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3392 /**
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
3393 * 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
3394 * @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
3395 * @param end pointer to the end of the buffer
10759
2bcd7a44350f Remove residual use of the doxygen markup which is deprecated,
stefano
parents: 10755
diff changeset
3396 * @return pointer to the next resync_marker, or end if none was found
9024
2bf694251330 Add ff_h263_find_resync_marker() to find the bit position of the next resync_marker, if any.
michael
parents: 9008
diff changeset
3397 */
2bf694251330 Add ff_h263_find_resync_marker() to find the bit position of the next resync_marker, if any.
michael
parents: 9008
diff changeset
3398 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
3399 {
2bf694251330 Add ff_h263_find_resync_marker() to find the bit position of the next resync_marker, if any.
michael
parents: 9008
diff changeset
3400 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
3401
2bf694251330 Add ff_h263_find_resync_marker() to find the bit position of the next resync_marker, if any.
michael
parents: 9008
diff changeset
3402 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
3403 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
3404 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
3405 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
3406 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
3407 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
3408 }
2bf694251330 Add ff_h263_find_resync_marker() to find the bit position of the next resync_marker, if any.
michael
parents: 9008
diff changeset
3409 }
2bf694251330 Add ff_h263_find_resync_marker() to find the bit position of the next resync_marker, if any.
michael
parents: 9008
diff changeset
3410 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
3411 }
2bf694251330 Add ff_h263_find_resync_marker() to find the bit position of the next resync_marker, if any.
michael
parents: 9008
diff changeset
3412
2bf694251330 Add ff_h263_find_resync_marker() to find the bit position of the next resync_marker, if any.
michael
parents: 9008
diff changeset
3413 /**
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3414 * 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
3415 * @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
3416 */
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3417 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
3418 int left, pos, ret;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
3419
1521
c232b6753012 h263 GOB decoding fix
michael
parents: 1520
diff changeset
3420 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
3421 skip_bits1(&s->gb);
1521
c232b6753012 h263 GOB decoding fix
michael
parents: 1520
diff changeset
3422 align_get_bits(&s->gb);
c232b6753012 h263 GOB decoding fix
michael
parents: 1520
diff changeset
3423 }
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3424
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3425 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
3426 pos= get_bits_count(&s->gb);
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3427 if(s->codec_id==CODEC_ID_MPEG4)
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3428 ret= mpeg4_decode_video_packet_header(s);
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3429 else
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3430 ret= h263_decode_gob_header(s);
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3431 if(ret>=0)
8691
25aa5388fa97 Make ff_h263_resync() return the bit position of the resync_marker or
benoit
parents: 8690
diff changeset
3432 return pos;
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3433 }
5129
0244bba24b43 misc typo fixes
diego
parents: 5075
diff changeset
3434 //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
3435 s->gb= s->last_resync_gb;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3436 align_get_bits(&s->gb);
10535
95f3daa991a2 Use get_bits_left() instead of size_in_bits - get_bits_count().
rbultje
parents: 9999
diff changeset
3437 left= get_bits_left(&s->gb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
3438
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
3439 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
3440 if(show_bits(&s->gb, 16)==0){
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3441 GetBitContext bak= s->gb;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3442
8691
25aa5388fa97 Make ff_h263_resync() return the bit position of the resync_marker or
benoit
parents: 8690
diff changeset
3443 pos= get_bits_count(&s->gb);
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3444 if(s->codec_id==CODEC_ID_MPEG4)
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3445 ret= mpeg4_decode_video_packet_header(s);
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3446 else
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3447 ret= h263_decode_gob_header(s);
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3448 if(ret>=0)
8691
25aa5388fa97 Make ff_h263_resync() return the bit position of the resync_marker or
benoit
parents: 8690
diff changeset
3449 return pos;
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3450
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3451 s->gb= bak;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3452 }
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3453 skip_bits(&s->gb, 8);
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3454 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
3455
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3456 return -1;
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3457 }
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3458
10752
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
3459 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
3460 {
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
3461 int code, val, sign, shift, l;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
3462 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
3463
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
3464 if (code == 0)
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
3465 return pred;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
3466 if (code < 0)
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
3467 return 0xffff;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
3468
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
3469 sign = get_bits1(&s->gb);
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
3470 shift = f_code - 1;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
3471 val = code;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
3472 if (shift) {
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
3473 val = (val - 1) << shift;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
3474 val |= get_bits(&s->gb, shift);
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
3475 val++;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
3476 }
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
3477 if (sign)
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
3478 val = -val;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
3479 val += pred;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
3480
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
3481 /* modulo decoding */
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
3482 if (!s->h263_long_vectors) {
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
3483 l = INT_BIT - 5 - f_code;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
3484 val = (val<<l)>>l;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
3485 } else {
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
3486 /* horrible h263 long vector mode */
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
3487 if (pred < -31 && val < -63)
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
3488 val += 64;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
3489 if (pred > 32 && val > 63)
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
3490 val -= 64;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
3491
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
3492 }
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
3493 return val;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
3494 }
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
3495
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3496 /**
1034
af7ba8d8b43a feeding doxygen
michaelni
parents: 1025
diff changeset
3497 * gets the average motion vector for a GMC MB.
753
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 751
diff changeset
3498 * @param n either 0 for the x component or 1 for y
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 751
diff changeset
3499 * @returns the average MV for a GMC MB
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 751
diff changeset
3500 */
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 751
diff changeset
3501 static inline int get_amv(MpegEncContext *s, int n){
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 751
diff changeset
3502 int x, y, mb_v, sum, dx, dy, shift;
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 751
diff changeset
3503 int len = 1 << (s->f_code + 4);
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 751
diff changeset
3504 const int a= s->sprite_warping_accuracy;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
3505
1997
7bd3932bc918 AMV bug workaround
michael
parents: 1983
diff changeset
3506 if(s->workaround_bugs & FF_BUG_AMV)
7bd3932bc918 AMV bug workaround
michael
parents: 1983
diff changeset
3507 len >>= s->quarter_sample;
753
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 751
diff changeset
3508
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 751
diff changeset
3509 if(s->real_sprite_warping_points==1){
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 751
diff changeset
3510 if(s->divx_version==500 && s->divx_build==413)
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 751
diff changeset
3511 sum= s->sprite_offset[0][n] / (1<<(a - s->quarter_sample));
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 751
diff changeset
3512 else
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 751
diff changeset
3513 sum= RSHIFT(s->sprite_offset[0][n]<<s->quarter_sample, a);
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 751
diff changeset
3514 }else{
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 751
diff changeset
3515 dx= s->sprite_delta[n][0];
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 751
diff changeset
3516 dy= s->sprite_delta[n][1];
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 751
diff changeset
3517 shift= s->sprite_shift[0];
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 751
diff changeset
3518 if(n) dy -= 1<<(shift + a + 1);
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 751
diff changeset
3519 else dx -= 1<<(shift + a + 1);
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 751
diff changeset
3520 mb_v= s->sprite_offset[0][n] + dx*s->mb_x*16 + dy*s->mb_y*16;
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 751
diff changeset
3521
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 751
diff changeset
3522 sum=0;
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 751
diff changeset
3523 for(y=0; y<16; y++){
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 751
diff changeset
3524 int v;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
3525
753
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 751
diff changeset
3526 v= mb_v + dy*y;
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 751
diff changeset
3527 //XXX FIXME optimize
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 751
diff changeset
3528 for(x=0; x<16; x++){
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 751
diff changeset
3529 sum+= v>>shift;
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 751
diff changeset
3530 v+= dx;
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 751
diff changeset
3531 }
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 751
diff changeset
3532 }
999
74dc4105e147 average motion vector rounding like the reference says and not what the standard says
michaelni
parents: 953
diff changeset
3533 sum= RSHIFT(sum, a+8-s->quarter_sample);
753
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 751
diff changeset
3534 }
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 751
diff changeset
3535
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 751
diff changeset
3536 if (sum < -len) sum= -len;
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 751
diff changeset
3537 else if (sum >= len) sum= len-1;
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 751
diff changeset
3538
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 751
diff changeset
3539 return sum;
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 751
diff changeset
3540 }
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 751
diff changeset
3541
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 751
diff changeset
3542 /**
10753
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3543 * decodes the dc value.
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3544 * @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
3545 * @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
3546 * @return the quantized dc
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3547 */
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3548 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
3549 {
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3550 int level, code;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3551
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3552 if (n < 4)
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3553 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
3554 else
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3555 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
3556 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
3557 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
3558 return -1;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3559 }
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3560 if (code == 0) {
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3561 level = 0;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3562 } else {
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3563 if(IS_3IV1){
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3564 if(code==1)
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3565 level= 2*get_bits1(&s->gb)-1;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3566 else{
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3567 if(get_bits1(&s->gb))
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3568 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
3569 else
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3570 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
3571 }
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3572 }else{
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3573 level = get_xbits(&s->gb, code);
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3574 }
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3575
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3576 if (code > 8){
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3577 if(get_bits1(&s->gb)==0){ /* marker */
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3578 if(s->error_recognition>=2){
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3579 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
3580 return -1;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3581 }
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3582 }
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3583 }
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3584 }
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3585
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3586 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
3587 }
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3588
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3589 /**
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3590 * decodes first partition.
6524
01647ac078a7 typo: occured --> occurred
diego
parents: 6497
diff changeset
3591 * @return number of MBs decoded or <0 if an error occurred
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3592 */
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3593 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
3594 int mb_num;
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
3595 static const int8_t quant_tab[4] = { -1, -2, 1, 2 };
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
3596
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3597 /* decode first partition */
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3598 mb_num=0;
290
2899263586cd resync marker support, needed for some mp4 files
michaelni
parents: 287
diff changeset
3599 s->first_slice_line=1;
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3600 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
3601 ff_init_block_index(s);
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3602 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
3603 const int xy= s->mb_x + s->mb_y*s->mb_stride;
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3604 int cbpc;
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3605 int dir=0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
3606
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3607 mb_num++;
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3608 ff_update_block_index(s);
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3609 if(s->mb_x == s->resync_mb_x && s->mb_y == s->resync_mb_y+1)
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3610 s->first_slice_line=0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
3611
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6211
diff changeset
3612 if(s->pict_type==FF_I_TYPE){
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3613 int i;
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3614
1482
b372ecde32a8 h263 stuffing decode fix
michaelni
parents: 1457
diff changeset
3615 do{
1873
c26242faa246 mb stuffing in partitioned frames fix
michael
parents: 1872
diff changeset
3616 if(show_bits_long(&s->gb, 19)==DC_MARKER){
c26242faa246 mb stuffing in partitioned frames fix
michael
parents: 1872
diff changeset
3617 return mb_num-1;
c26242faa246 mb stuffing in partitioned frames fix
michael
parents: 1872
diff changeset
3618 }
c26242faa246 mb stuffing in partitioned frames fix
michael
parents: 1872
diff changeset
3619
1482
b372ecde32a8 h263 stuffing decode fix
michaelni
parents: 1457
diff changeset
3620 cbpc = get_vlc2(&s->gb, intra_MCBPC_vlc.table, INTRA_MCBPC_VLC_BITS, 2);
b372ecde32a8 h263 stuffing decode fix
michaelni
parents: 1457
diff changeset
3621 if (cbpc < 0){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1586
diff changeset
3622 av_log(s->avctx, AV_LOG_ERROR, "cbpc corrupted at %d %d\n", s->mb_x, s->mb_y);
1482
b372ecde32a8 h263 stuffing decode fix
michaelni
parents: 1457
diff changeset
3623 return -1;
b372ecde32a8 h263 stuffing decode fix
michaelni
parents: 1457
diff changeset
3624 }
b372ecde32a8 h263 stuffing decode fix
michaelni
parents: 1457
diff changeset
3625 }while(cbpc == 8);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
3626
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3627 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
3628 s->current_picture.mb_type[xy]= MB_TYPE_INTRA;
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3629 s->mb_intra = 1;
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3630
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3631 if(cbpc & 4) {
1652
834922115010 cleanup
michael
parents: 1649
diff changeset
3632 ff_set_qscale(s, s->qscale + quant_tab[get_bits(&s->gb, 2)]);
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3633 }
903
22ee74da2cd3 cleanup
michaelni
parents: 892
diff changeset
3634 s->current_picture.qscale_table[xy]= s->qscale;
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3635
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3636 s->mbintra_table[xy]= 1;
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3637 for(i=0; i<6; i++){
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3638 int dc_pred_dir;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
3639 int dc= mpeg4_decode_dc(s, i, &dc_pred_dir);
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3640 if(dc < 0){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1586
diff changeset
3641 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
3642 return -1;
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3643 }
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3644 dir<<=1;
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3645 if(dc_pred_dir) dir|=1;
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3646 }
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3647 s->pred_dir_table[xy]= dir;
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3648 }else{ /* P/S_TYPE */
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3649 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
3650 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
3651 const int stride= s->b8_stride*2;
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3652
1873
c26242faa246 mb stuffing in partitioned frames fix
michael
parents: 1872
diff changeset
3653 try_again:
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3654 bits= show_bits(&s->gb, 17);
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3655 if(bits==MOTION_MARKER){
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3656 return mb_num-1;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3657 }
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3658 skip_bits1(&s->gb);
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3659 if(bits&0x10000){
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3660 /* skip mb */
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6211
diff changeset
3661 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
3662 s->current_picture.mb_type[xy]= MB_TYPE_SKIP | MB_TYPE_16x16 | MB_TYPE_GMC | MB_TYPE_L0;
753
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 751
diff changeset
3663 mx= get_amv(s, 0);
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 751
diff changeset
3664 my= get_amv(s, 1);
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3665 }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
3666 s->current_picture.mb_type[xy]= MB_TYPE_SKIP | MB_TYPE_16x16 | MB_TYPE_L0;
753
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 751
diff changeset
3667 mx=my=0;
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3668 }
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3669 mot_val[0 ]= mot_val[2 ]=
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3670 mot_val[0+stride]= mot_val[2+stride]= mx;
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3671 mot_val[1 ]= mot_val[3 ]=
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3672 mot_val[1+stride]= mot_val[3+stride]= my;
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3673
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3674 if(s->mbintra_table[xy])
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3675 ff_clean_intra_table_entries(s);
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3676 continue;
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3677 }
1482
b372ecde32a8 h263 stuffing decode fix
michaelni
parents: 1457
diff changeset
3678
544
5264fb104700 optimization (get_vlc -> get_vlc2)
michaelni
parents: 542
diff changeset
3679 cbpc = get_vlc2(&s->gb, inter_MCBPC_vlc.table, INTER_MCBPC_VLC_BITS, 2);
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3680 if (cbpc < 0){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1586
diff changeset
3681 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
3682 return -1;
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3683 }
1873
c26242faa246 mb stuffing in partitioned frames fix
michael
parents: 1872
diff changeset
3684 if(cbpc == 20)
c26242faa246 mb stuffing in partitioned frames fix
michael
parents: 1872
diff changeset
3685 goto try_again;
1482
b372ecde32a8 h263 stuffing decode fix
michaelni
parents: 1457
diff changeset
3686
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3687 s->cbp_table[xy]= cbpc&(8+3); //8 is dquant
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
3688
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3689 s->mb_intra = ((cbpc & 4) != 0);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
3690
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3691 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
3692 s->current_picture.mb_type[xy]= MB_TYPE_INTRA;
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3693 s->mbintra_table[xy]= 1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
3694 mot_val[0 ]= mot_val[2 ]=
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3695 mot_val[0+stride]= mot_val[2+stride]= 0;
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3696 mot_val[1 ]= mot_val[3 ]=
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3697 mot_val[1+stride]= mot_val[3+stride]= 0;
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3698 }else{
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3699 if(s->mbintra_table[xy])
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3700 ff_clean_intra_table_entries(s);
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3701
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6211
diff changeset
3702 if(s->pict_type==FF_S_TYPE && s->vol_sprite_usage==GMC_SPRITE && (cbpc & 16) == 0)
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3703 s->mcsel= get_bits1(&s->gb);
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3704 else s->mcsel= 0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
3705
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3706 if ((cbpc & 16) == 0) {
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3707 /* 16x16 motion prediction */
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3708
1938
e2501e6e7ff7 unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents: 1936
diff changeset
3709 h263_pred_motion(s, 0, 0, &pred_x, &pred_y);
753
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 751
diff changeset
3710 if(!s->mcsel){
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 751
diff changeset
3711 mx = h263_decode_motion(s, pred_x, s->f_code);
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 751
diff changeset
3712 if (mx >= 0xffff)
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 751
diff changeset
3713 return -1;
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 751
diff changeset
3714
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 751
diff changeset
3715 my = h263_decode_motion(s, pred_y, s->f_code);
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 751
diff changeset
3716 if (my >= 0xffff)
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 751
diff changeset
3717 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
3718 s->current_picture.mb_type[xy]= MB_TYPE_16x16 | MB_TYPE_L0;
753
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 751
diff changeset
3719 } else {
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 751
diff changeset
3720 mx = get_amv(s, 0);
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 751
diff changeset
3721 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
3722 s->current_picture.mb_type[xy]= MB_TYPE_16x16 | MB_TYPE_GMC | MB_TYPE_L0;
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3723 }
753
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 751
diff changeset
3724
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3725 mot_val[0 ]= mot_val[2 ] =
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3726 mot_val[0+stride]= mot_val[2+stride]= mx;
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3727 mot_val[1 ]= mot_val[3 ]=
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3728 mot_val[1+stride]= mot_val[3+stride]= my;
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3729 } else {
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3730 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
3731 s->current_picture.mb_type[xy]= MB_TYPE_8x8 | MB_TYPE_L0;
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3732 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
3733 int16_t *mot_val= h263_pred_motion(s, i, 0, &pred_x, &pred_y);
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3734 mx = h263_decode_motion(s, pred_x, s->f_code);
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3735 if (mx >= 0xffff)
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3736 return -1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
3737
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3738 my = h263_decode_motion(s, pred_y, s->f_code);
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3739 if (my >= 0xffff)
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3740 return -1;
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3741 mot_val[0] = mx;
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3742 mot_val[1] = my;
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3743 }
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3744 }
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3745 }
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3746 }
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3747 }
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3748 s->mb_x= 0;
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3749 }
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3750
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3751 return mb_num;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3752 }
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3753
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3754 /**
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3755 * decode second partition.
6524
01647ac078a7 typo: occured --> occurred
diego
parents: 6497
diff changeset
3756 * @return <0 if an error occurred
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3757 */
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3758 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
3759 int mb_num=0;
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
3760 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
3761
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3762 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
3763 s->first_slice_line=1;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3764 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
3765 ff_init_block_index(s);
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3766 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
3767 const int xy= s->mb_x + s->mb_y*s->mb_stride;
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3768
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3769 mb_num++;
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3770 ff_update_block_index(s);
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3771 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
3772 s->first_slice_line=0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
3773
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6211
diff changeset
3774 if(s->pict_type==FF_I_TYPE){
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3775 int ac_pred= get_bits1(&s->gb);
544
5264fb104700 optimization (get_vlc -> get_vlc2)
michaelni
parents: 542
diff changeset
3776 int cbpy = get_vlc2(&s->gb, cbpy_vlc.table, CBPY_VLC_BITS, 1);
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3777 if(cbpy<0){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1586
diff changeset
3778 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
3779 return -1;
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3780 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
3781
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3782 s->cbp_table[xy]|= cbpy<<2;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
3783 s->current_picture.mb_type[xy] |= ac_pred*MB_TYPE_ACPRED;
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3784 }else{ /* P || S_TYPE */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
3785 if(IS_INTRA(s->current_picture.mb_type[xy])){
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3786 int dir=0,i;
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3787 int ac_pred = get_bits1(&s->gb);
544
5264fb104700 optimization (get_vlc -> get_vlc2)
michaelni
parents: 542
diff changeset
3788 int cbpy = get_vlc2(&s->gb, cbpy_vlc.table, CBPY_VLC_BITS, 1);
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3789
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3790 if(cbpy<0){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1586
diff changeset
3791 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
3792 return -1;
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3793 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
3794
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3795 if(s->cbp_table[xy] & 8) {
1652
834922115010 cleanup
michael
parents: 1649
diff changeset
3796 ff_set_qscale(s, s->qscale + quant_tab[get_bits(&s->gb, 2)]);
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3797 }
903
22ee74da2cd3 cleanup
michaelni
parents: 892
diff changeset
3798 s->current_picture.qscale_table[xy]= s->qscale;
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3799
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3800 for(i=0; i<6; i++){
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3801 int dc_pred_dir;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
3802 int dc= mpeg4_decode_dc(s, i, &dc_pred_dir);
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3803 if(dc < 0){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1586
diff changeset
3804 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
3805 return -1;
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3806 }
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3807 dir<<=1;
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3808 if(dc_pred_dir) dir|=1;
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3809 }
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3810 s->cbp_table[xy]&= 3; //remove dquant
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3811 s->cbp_table[xy]|= cbpy<<2;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
3812 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
3813 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
3814 }else if(IS_SKIP(s->current_picture.mb_type[xy])){
903
22ee74da2cd3 cleanup
michaelni
parents: 892
diff changeset
3815 s->current_picture.qscale_table[xy]= s->qscale;
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3816 s->cbp_table[xy]= 0;
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3817 }else{
544
5264fb104700 optimization (get_vlc -> get_vlc2)
michaelni
parents: 542
diff changeset
3818 int cbpy = get_vlc2(&s->gb, cbpy_vlc.table, CBPY_VLC_BITS, 1);
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3819
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3820 if(cbpy<0){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1586
diff changeset
3821 av_log(s->avctx, AV_LOG_ERROR, "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
3822 return -1;
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3823 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
3824
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3825 if(s->cbp_table[xy] & 8) {
1652
834922115010 cleanup
michael
parents: 1649
diff changeset
3826 ff_set_qscale(s, s->qscale + quant_tab[get_bits(&s->gb, 2)]);
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3827 }
903
22ee74da2cd3 cleanup
michaelni
parents: 892
diff changeset
3828 s->current_picture.qscale_table[xy]= s->qscale;
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3829
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3830 s->cbp_table[xy]&= 3; //remove dquant
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3831 s->cbp_table[xy]|= (cbpy^0xf)<<2;
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3832 }
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3833 }
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3834 }
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3835 if(mb_num >= mb_count) return 0;
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3836 s->mb_x= 0;
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3837 }
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3838 return 0;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3839 }
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3840
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3841 /**
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3842 * decodes the first & second partition
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3843 * @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
3844 */
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3845 int ff_mpeg4_decode_partitions(MpegEncContext *s)
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3846 {
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3847 int mb_num;
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6211
diff changeset
3848 const int part_a_error= s->pict_type==FF_I_TYPE ? (DC_ERROR|MV_ERROR) : MV_ERROR;
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6211
diff changeset
3849 const int part_a_end = s->pict_type==FF_I_TYPE ? (DC_END |MV_END) : MV_END;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
3850
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
3851 mb_num= mpeg4_decode_partition_a(s);
1144
21c85c4ab2f0 error resilience cleanup (its faster too...)
michaelni
parents: 1137
diff changeset
3852 if(mb_num<0){
21c85c4ab2f0 error resilience cleanup (its faster too...)
michaelni
parents: 1137
diff changeset
3853 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
3854 return -1;
1144
21c85c4ab2f0 error resilience cleanup (its faster too...)
michaelni
parents: 1137
diff changeset
3855 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
3856
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3857 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
3858 av_log(s->avctx, AV_LOG_ERROR, "slice below monitor ...\n");
1144
21c85c4ab2f0 error resilience cleanup (its faster too...)
michaelni
parents: 1137
diff changeset
3859 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
3860 return -1;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3861 }
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3862
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3863 s->mb_num_left= mb_num;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
3864
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6211
diff changeset
3865 if(s->pict_type==FF_I_TYPE){
1873
c26242faa246 mb stuffing in partitioned frames fix
michael
parents: 1872
diff changeset
3866 while(show_bits(&s->gb, 9) == 1)
c26242faa246 mb stuffing in partitioned frames fix
michael
parents: 1872
diff changeset
3867 skip_bits(&s->gb, 9);
1257
6defe392d5d2 libmpeg2 style bitstream reader fixes
michaelni
parents: 1255
diff changeset
3868 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
3869 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
3870 return -1;
1144
21c85c4ab2f0 error resilience cleanup (its faster too...)
michaelni
parents: 1137
diff changeset
3871 }
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3872 }else{
1873
c26242faa246 mb stuffing in partitioned frames fix
michael
parents: 1872
diff changeset
3873 while(show_bits(&s->gb, 10) == 1)
c26242faa246 mb stuffing in partitioned frames fix
michael
parents: 1872
diff changeset
3874 skip_bits(&s->gb, 10);
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3875 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
3876 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
3877 return -1;
1144
21c85c4ab2f0 error resilience cleanup (its faster too...)
michaelni
parents: 1137
diff changeset
3878 }
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3879 }
1144
21c85c4ab2f0 error resilience cleanup (its faster too...)
michaelni
parents: 1137
diff changeset
3880 ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y, s->mb_x-1, s->mb_y, part_a_end);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
3881
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3882 if( mpeg4_decode_partition_b(s, mb_num) < 0){
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6211
diff changeset
3883 if(s->pict_type==FF_P_TYPE)
1144
21c85c4ab2f0 error resilience cleanup (its faster too...)
michaelni
parents: 1137
diff changeset
3884 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
3885 return -1;
1144
21c85c4ab2f0 error resilience cleanup (its faster too...)
michaelni
parents: 1137
diff changeset
3886 }else{
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6211
diff changeset
3887 if(s->pict_type==FF_P_TYPE)
1144
21c85c4ab2f0 error resilience cleanup (its faster too...)
michaelni
parents: 1137
diff changeset
3888 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
3889 }
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3890
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
3891 return 0;
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3892 }
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
3893
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
3894 /**
10753
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3895 * decodes a block.
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3896 * @return <0 if an error occurred
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3897 */
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3898 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
3899 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
3900 {
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3901 int level, i, last, run;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3902 int dc_pred_dir;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3903 RLTable * rl;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3904 RL_VLC_ELEM * rl_vlc;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3905 const uint8_t * scan_table;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3906 int qmul, qadd;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3907
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3908 //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
3909
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3910 if(intra) {
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3911 if(s->use_intra_dc_vlc){
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3912 /* DC coef */
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3913 if(s->partitioned_frame){
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3914 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
3915 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
3916 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
3917 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
3918 }else{
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3919 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
3920 if (level < 0)
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3921 return -1;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3922 }
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3923 block[0] = level;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3924 i = 0;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3925 }else{
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3926 i = -1;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3927 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
3928 }
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3929 if (!coded)
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3930 goto not_coded;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3931
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3932 if(rvlc){
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3933 rl = &rvlc_rl_intra;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3934 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
3935 }else{
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3936 rl = &rl_intra;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3937 rl_vlc = rl_intra.rl_vlc[0];
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3938 }
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3939 if (s->ac_pred) {
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3940 if (dc_pred_dir == 0)
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3941 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
3942 else
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3943 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
3944 } else {
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3945 scan_table = s->intra_scantable.permutated;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3946 }
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3947 qmul=1;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3948 qadd=0;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3949 } else {
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3950 i = -1;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3951 if (!coded) {
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3952 s->block_last_index[n] = i;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3953 return 0;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3954 }
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3955 if(rvlc) rl = &rvlc_rl_inter;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3956 else rl = &rl_inter;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3957
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3958 scan_table = s->intra_scantable.permutated;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3959
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3960 if(s->mpeg_quant){
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3961 qmul=1;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3962 qadd=0;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3963 if(rvlc){
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3964 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
3965 }else{
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3966 rl_vlc = rl_inter.rl_vlc[0];
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3967 }
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3968 }else{
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3969 qmul = s->qscale << 1;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3970 qadd = (s->qscale - 1) | 1;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3971 if(rvlc){
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3972 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
3973 }else{
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3974 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
3975 }
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3976 }
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3977 }
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3978 {
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3979 OPEN_READER(re, &s->gb);
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3980 for(;;) {
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3981 UPDATE_CACHE(re, &s->gb);
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3982 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
3983 if (level==0) {
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3984 /* escape */
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3985 if(rvlc){
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3986 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
3987 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
3988 return -1;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3989 }; SKIP_CACHE(re, &s->gb, 1);
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3990
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3991 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
3992 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
3993 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
3994 UPDATE_CACHE(re, &s->gb);
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3995
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3996 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
3997 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
3998 return -1;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
3999 }; SKIP_CACHE(re, &s->gb, 1);
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4000
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4001 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
4002
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4003 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
4004 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
4005 return -1;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4006 }; SKIP_CACHE(re, &s->gb, 5);
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4007
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4008 level= level * qmul + qadd;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4009 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
4010 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
4011
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4012 i+= run + 1;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4013 if(last) i+=192;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4014 }else{
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4015 int cache;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4016 cache= GET_CACHE(re, &s->gb);
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 if(IS_3IV1)
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4019 cache ^= 0xC0000000;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4020
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4021 if (cache&0x80000000) {
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4022 if (cache&0x40000000) {
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4023 /* third escape */
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4024 SKIP_CACHE(re, &s->gb, 2);
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4025 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
4026 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
4027 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
4028 UPDATE_CACHE(re, &s->gb);
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4029
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4030 if(IS_3IV1){
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4031 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
4032 }else{
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4033 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
4034 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
4035 return -1;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4036 }; SKIP_CACHE(re, &s->gb, 1);
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 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
4039
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4040 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
4041 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
4042 return -1;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4043 }; LAST_SKIP_CACHE(re, &s->gb, 1);
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 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
4046 }
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4047
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4048 #if 0
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4049 if(s->error_recognition >= FF_ER_COMPLIANT){
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4050 const int abs_level= FFABS(level);
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4051 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
4052 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
4053 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
4054 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
4055 return -1;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4056 }
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4057 if(s->error_recognition > FF_ER_COMPLIANT){
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4058 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
4059 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
4060 return -1;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4061 }
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4062 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
4063 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
4064 return -1;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4065 }
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4066 }
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4067 }
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4068 }
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4069 #endif
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4070 if (level>0) level= level * qmul + qadd;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4071 else level= level * qmul - qadd;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4072
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4073 if((unsigned)(level + 2048) > 4095){
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4074 if(s->error_recognition > FF_ER_COMPLIANT){
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4075 if(level > 2560 || level<-2560){
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, "|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
4077 return -1;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4078 }
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4079 }
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4080 level= level<0 ? -2048 : 2047;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4081 }
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4082
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4083 i+= run + 1;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4084 if(last) i+=192;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4085 } else {
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4086 /* second escape */
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4087 #if MIN_CACHE_BITS < 20
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4088 LAST_SKIP_BITS(re, &s->gb, 2);
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4089 UPDATE_CACHE(re, &s->gb);
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4090 #else
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4091 SKIP_BITS(re, &s->gb, 2);
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4092 #endif
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4093 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
4094 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
4095 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
4096 LAST_SKIP_BITS(re, &s->gb, 1);
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4097 }
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4098 } else {
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4099 /* first escape */
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4100 #if MIN_CACHE_BITS < 19
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4101 LAST_SKIP_BITS(re, &s->gb, 1);
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4102 UPDATE_CACHE(re, &s->gb);
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4103 #else
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4104 SKIP_BITS(re, &s->gb, 1);
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4105 #endif
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4106 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
4107 i+= run;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4108 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
4109 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
4110 LAST_SKIP_BITS(re, &s->gb, 1);
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4111 }
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4112 }
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4113 } else {
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4114 i+= run;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4115 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
4116 LAST_SKIP_BITS(re, &s->gb, 1);
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4117 }
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4118 if (i > 62){
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4119 i-= 192;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4120 if(i&(~63)){
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4121 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
4122 return -1;
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 block[scan_table[i]] = level;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4126 break;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4127 }
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4128
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4129 block[scan_table[i]] = level;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4130 }
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4131 CLOSE_READER(re, &s->gb);
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4132 }
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4133 not_coded:
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4134 if (intra) {
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4135 if(!s->use_intra_dc_vlc){
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4136 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
4137
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4138 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
4139 }
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4140
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4141 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
4142 if (s->ac_pred) {
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4143 i = 63; /* XXX: not optimal */
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4144 }
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4145 }
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4146 s->block_last_index[n] = i;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4147 return 0;
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4148 }
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4149
3790420a84b6 cosmetics: Move MPEG-4 decoding functions around to avoid forward declarations.
diego
parents: 10752
diff changeset
4150 /**
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
4151 * decode partition C of one MB.
6524
01647ac078a7 typo: occured --> occurred
diego
parents: 6497
diff changeset
4152 * @return <0 if an error occurred
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
4153 */
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
4154 static int mpeg4_decode_partitioned_mb(MpegEncContext *s, DCTELEM block[6][64])
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
4155 {
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
4156 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
4157 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
4158
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1176
diff changeset
4159 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
4160 cbp = s->cbp_table[xy];
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
4161
3282
ecc93139021c use previous qscale for intra_dc_threshold check
michael
parents: 3256
diff changeset
4162 s->use_intra_dc_vlc= s->qscale < s->intra_dc_threshold;
ecc93139021c use previous qscale for intra_dc_threshold check
michael
parents: 3256
diff changeset
4163
903
22ee74da2cd3 cleanup
michaelni
parents: 892
diff changeset
4164 if(s->current_picture.qscale_table[xy] != s->qscale){
1652
834922115010 cleanup
michael
parents: 1649
diff changeset
4165 ff_set_qscale(s, s->current_picture.qscale_table[xy] );
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
4166 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
4167
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6211
diff changeset
4168 if (s->pict_type == FF_P_TYPE || s->pict_type==FF_S_TYPE) {
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
4169 int i;
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
4170 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
4171 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
4172 s->mv[0][i][1] = s->current_picture.motion_val[0][ s->block_index[i] ][1];
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
4173 }
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1176
diff changeset
4174 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
4175
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1176
diff changeset
4176 if (IS_SKIP(mb_type)) {
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
4177 /* skip mb */
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
4178 for(i=0;i<6;i++)
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
4179 s->block_last_index[i] = -1;
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
4180 s->mv_dir = MV_DIR_FORWARD;
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
4181 s->mv_type = MV_TYPE_16X16;
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6211
diff changeset
4182 if(s->pict_type==FF_S_TYPE && s->vol_sprite_usage==GMC_SPRITE){
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
4183 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
4184 s->mb_skipped = 0;
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
4185 }else{
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
4186 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
4187 s->mb_skipped = 1;
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
4188 }
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
4189 }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
4190 s->ac_pred = IS_ACPRED(s->current_picture.mb_type[xy]);
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
4191 }else if(!s->mb_intra){
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
4192 // s->mcsel= 0; //FIXME do we need to init that
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
4193
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
4194 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
4195 if (IS_8X8(mb_type)) {
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
4196 s->mv_type = MV_TYPE_8X8;
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
4197 } else {
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
4198 s->mv_type = MV_TYPE_16X16;
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
4199 }
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
4200 }
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
4201 } else { /* I-Frame */
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
4202 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
4203 s->ac_pred = IS_ACPRED(s->current_picture.mb_type[xy]);
1132
61c89e8ffa88 rvlc decoding support
michaelni
parents: 1126
diff changeset
4204 }
61c89e8ffa88 rvlc decoding support
michaelni
parents: 1126
diff changeset
4205
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1176
diff changeset
4206 if (!IS_SKIP(mb_type)) {
1132
61c89e8ffa88 rvlc decoding support
michaelni
parents: 1126
diff changeset
4207 int i;
2632
67171616ead6 avoid unneeded clear_blocks()
michael
parents: 2628
diff changeset
4208 s->dsp.clear_blocks(s->block[0]);
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
4209 /* decode each block */
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
4210 for (i = 0; i < 6; i++) {
1132
61c89e8ffa88 rvlc decoding support
michaelni
parents: 1126
diff changeset
4211 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
4212 av_log(s->avctx, AV_LOG_ERROR, "texture corrupted at %d %d %d\n", s->mb_x, s->mb_y, s->mb_intra);
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
4213 return -1;
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
4214 }
718
16dab8296293 fixing custom quantizer matrix decoding
michaelni
parents: 706
diff changeset
4215 cbp+=cbp;
453
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
4216 }
69876443a723 error concealment / error resilience
michaelni
parents: 429
diff changeset
4217 }
290
2899263586cd resync marker support, needed for some mp4 files
michaelni
parents: 287
diff changeset
4218
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
4219 /* per-MB end of slice check */
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
4220
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
4221 if(--s->mb_num_left <= 0){
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
4222 if(mpeg4_is_resync(s))
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
4223 return SLICE_END;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
4224 else
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
4225 return SLICE_NOEND;
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
4226 }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
4227 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
4228 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
4229 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
4230 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
4231 }
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead 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 return SLICE_OK;
619
2be2cc8fd0a1 mpeg4 interlaced decoding support (not completly implemented/tested due to lack of samples)
michaelni
parents: 617
diff changeset
4233 }
2be2cc8fd0a1 mpeg4 interlaced decoding support (not completly implemented/tested due to lack of samples)
michaelni
parents: 617
diff changeset
4234 }
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
4235
10752
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4236 /* Decodes RVLC of H.263+ UMV */
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4237 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
4238 {
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4239 int code = 0, sign;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4240
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4241 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
4242 return pred;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4243
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4244 code = 2 + get_bits1(&s->gb);
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4245
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4246 while (get_bits1(&s->gb))
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4247 {
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4248 code <<= 1;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4249 code += get_bits1(&s->gb);
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4250 }
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4251 sign = code & 1;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4252 code >>= 1;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4253
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4254 code = (sign) ? (pred - code) : (pred + code);
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4255 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
4256 return code;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4257
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4258 }
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4259
1633
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
4260 /**
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
4261 * read the next MVs for OBMC. yes this is a ugly hack, feel free to send a patch :)
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
4262 */
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
4263 static void preview_obmc(MpegEncContext *s){
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
4264 GetBitContext gb= s->gb;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
4265
1633
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
4266 int cbpc, i, pred_x, pred_y, mx, my;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
4267 int16_t *mot_val;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
4268 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
4269 const int stride= s->b8_stride*2;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
4270
1633
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
4271 for(i=0; i<4; i++)
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
4272 s->block_index[i]+= 2;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
4273 for(i=4; i<6; i++)
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
4274 s->block_index[i]+= 1;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
4275 s->mb_x++;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
4276
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6211
diff changeset
4277 assert(s->pict_type == FF_P_TYPE);
1633
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
4278
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
4279 do{
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
4280 if (get_bits1(&s->gb)) {
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
4281 /* 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
4282 mot_val = s->current_picture.motion_val[0][ s->block_index[0] ];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
4283 mot_val[0 ]= mot_val[2 ]=
1633
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
4284 mot_val[0+stride]= mot_val[2+stride]= 0;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
4285 mot_val[1 ]= mot_val[3 ]=
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
4286 mot_val[1+stride]= mot_val[3+stride]= 0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
4287
1633
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
4288 s->current_picture.mb_type[xy]= MB_TYPE_SKIP | MB_TYPE_16x16 | MB_TYPE_L0;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
4289 goto end;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
4290 }
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
4291 cbpc = get_vlc2(&s->gb, inter_MCBPC_vlc.table, INTER_MCBPC_VLC_BITS, 2);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
4292 }while(cbpc == 20);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
4293
1633
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
4294 if(cbpc & 4){
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
4295 s->current_picture.mb_type[xy]= MB_TYPE_INTRA;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
4296 }else{
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
4297 get_vlc2(&s->gb, cbpy_vlc.table, CBPY_VLC_BITS, 1);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
4298 if (cbpc & 8) {
1656
34b0e799aeb6 cleanup
michael
parents: 1655
diff changeset
4299 if(s->modified_quant){
34b0e799aeb6 cleanup
michael
parents: 1655
diff changeset
4300 if(get_bits1(&s->gb)) skip_bits(&s->gb, 1);
34b0e799aeb6 cleanup
michael
parents: 1655
diff changeset
4301 else skip_bits(&s->gb, 5);
34b0e799aeb6 cleanup
michael
parents: 1655
diff changeset
4302 }else
34b0e799aeb6 cleanup
michael
parents: 1655
diff changeset
4303 skip_bits(&s->gb, 2);
1633
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
4304 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
4305
1633
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
4306 if ((cbpc & 16) == 0) {
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
4307 s->current_picture.mb_type[xy]= MB_TYPE_16x16 | MB_TYPE_L0;
1633
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
4308 /* 16x16 motion prediction */
1938
e2501e6e7ff7 unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents: 1936
diff changeset
4309 mot_val= h263_pred_motion(s, 0, 0, &pred_x, &pred_y);
1633
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
4310 if (s->umvplus)
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
4311 mx = h263p_decode_umotion(s, pred_x);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
4312 else
1655
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
4313 mx = h263_decode_motion(s, pred_x, 1);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
4314
1633
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
4315 if (s->umvplus)
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
4316 my = h263p_decode_umotion(s, pred_y);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
4317 else
1655
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
4318 my = h263_decode_motion(s, pred_y, 1);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
4319
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
4320 mot_val[0 ]= mot_val[2 ]=
1633
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
4321 mot_val[0+stride]= mot_val[2+stride]= mx;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
4322 mot_val[1 ]= mot_val[3 ]=
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
4323 mot_val[1+stride]= mot_val[3+stride]= my;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
4324 } else {
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
4325 s->current_picture.mb_type[xy]= MB_TYPE_8x8 | MB_TYPE_L0;
1633
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
4326 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
4327 mot_val = h263_pred_motion(s, i, 0, &pred_x, &pred_y);
1633
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
4328 if (s->umvplus)
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
4329 mx = h263p_decode_umotion(s, pred_x);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
4330 else
1655
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
4331 mx = h263_decode_motion(s, pred_x, 1);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
4332
1633
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
4333 if (s->umvplus)
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
4334 my = h263p_decode_umotion(s, pred_y);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
4335 else
1655
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
4336 my = h263_decode_motion(s, pred_y, 1);
1633
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
4337 if (s->umvplus && (mx - pred_x) == 1 && (my - pred_y) == 1)
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
4338 skip_bits1(&s->gb); /* Bit stuffing to prevent PSC */
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
4339 mot_val[0] = mx;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
4340 mot_val[1] = my;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
4341 }
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
4342 }
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
4343 }
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
4344 end:
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
4345
1633
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
4346 for(i=0; i<4; i++)
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
4347 s->block_index[i]-= 2;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
4348 for(i=4; i<6; i++)
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
4349 s->block_index[i]-= 1;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
4350 s->mb_x--;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
4351
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
4352 s->gb= gb;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
4353 }
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
4354
1656
34b0e799aeb6 cleanup
michael
parents: 1655
diff changeset
4355 static void h263_decode_dquant(MpegEncContext *s){
34b0e799aeb6 cleanup
michael
parents: 1655
diff changeset
4356 static const int8_t quant_tab[4] = { -1, -2, 1, 2 };
34b0e799aeb6 cleanup
michael
parents: 1655
diff changeset
4357
34b0e799aeb6 cleanup
michael
parents: 1655
diff changeset
4358 if(s->modified_quant){
34b0e799aeb6 cleanup
michael
parents: 1655
diff changeset
4359 if(get_bits1(&s->gb))
34b0e799aeb6 cleanup
michael
parents: 1655
diff changeset
4360 s->qscale= modified_quant_tab[get_bits1(&s->gb)][ s->qscale ];
34b0e799aeb6 cleanup
michael
parents: 1655
diff changeset
4361 else
34b0e799aeb6 cleanup
michael
parents: 1655
diff changeset
4362 s->qscale= get_bits(&s->gb, 5);
34b0e799aeb6 cleanup
michael
parents: 1655
diff changeset
4363 }else
34b0e799aeb6 cleanup
michael
parents: 1655
diff changeset
4364 s->qscale += quant_tab[get_bits(&s->gb, 2)];
34b0e799aeb6 cleanup
michael
parents: 1655
diff changeset
4365 ff_set_qscale(s, s->qscale);
34b0e799aeb6 cleanup
michael
parents: 1655
diff changeset
4366 }
34b0e799aeb6 cleanup
michael
parents: 1655
diff changeset
4367
10752
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4368 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
4369 int n, int coded)
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4370 {
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4371 int code, level, i, j, last, run;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4372 RLTable *rl = &rl_inter;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4373 const uint8_t *scan_table;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4374 GetBitContext gb= s->gb;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4375
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4376 scan_table = s->intra_scantable.permutated;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4377 if (s->h263_aic && s->mb_intra) {
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4378 rl = &rl_intra_aic;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4379 i = 0;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4380 if (s->ac_pred) {
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4381 if (s->h263_aic_dir)
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4382 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
4383 else
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4384 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
4385 }
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4386 } else if (s->mb_intra) {
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4387 /* DC coef */
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4388 if(s->codec_id == CODEC_ID_RV10){
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4389 #if CONFIG_RV10_DECODER
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4390 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
4391 int component, diff;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4392 component = (n <= 3 ? 0 : n - 4 + 1);
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4393 level = s->last_dc[component];
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4394 if (s->rv10_first_dc_coded[component]) {
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4395 diff = rv_decode_dc(s, n);
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4396 if (diff == 0xffff)
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4397 return -1;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4398 level += diff;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4399 level = level & 0xff; /* handle wrap round */
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4400 s->last_dc[component] = level;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4401 } else {
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4402 s->rv10_first_dc_coded[component] = 1;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4403 }
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4404 } else {
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4405 level = get_bits(&s->gb, 8);
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4406 if (level == 255)
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4407 level = 128;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4408 }
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4409 #endif
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4410 }else{
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4411 level = get_bits(&s->gb, 8);
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4412 if((level&0x7F) == 0){
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4413 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
4414 if(s->error_recognition >= FF_ER_COMPLIANT)
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4415 return -1;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4416 }
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4417 if (level == 255)
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4418 level = 128;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4419 }
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4420 block[0] = level;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4421 i = 1;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4422 } else {
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4423 i = 0;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4424 }
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4425 if (!coded) {
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4426 if (s->mb_intra && s->h263_aic)
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4427 goto not_coded;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4428 s->block_last_index[n] = i - 1;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4429 return 0;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4430 }
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4431 retry:
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4432 for(;;) {
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4433 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
4434 if (code < 0){
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4435 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
4436 return -1;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4437 }
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4438 if (code == rl->n) {
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4439 /* escape */
10788
0c8f9288b5e4 Split flv decoding out.
michael
parents: 10787
diff changeset
4440 if (CONFIG_FLV_DECODER && s->h263_flv > 1) {
0c8f9288b5e4 Split flv decoding out.
michael
parents: 10787
diff changeset
4441 ff_flv2_decode_ac_esc(&s->gb, &level, &run, &last);
10752
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4442 } else {
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4443 last = get_bits1(&s->gb);
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4444 run = get_bits(&s->gb, 6);
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4445 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
4446 if(level == -128){
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4447 if (s->codec_id == CODEC_ID_RV10) {
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4448 /* XXX: should patch encoder too */
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4449 level = get_sbits(&s->gb, 12);
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4450 }else{
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4451 level = get_bits(&s->gb, 5);
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4452 level |= get_sbits(&s->gb, 6)<<5;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4453 }
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4454 }
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4455 }
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4456 } else {
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4457 run = rl->table_run[code];
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4458 level = rl->table_level[code];
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4459 last = code >= rl->last;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4460 if (get_bits1(&s->gb))
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4461 level = -level;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4462 }
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4463 i += run;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4464 if (i >= 64){
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4465 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
4466 //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
4467 rl = &rl_intra_aic;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4468 i = 0;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4469 s->gb= gb;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4470 s->dsp.clear_block(block);
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4471 goto retry;
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 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
4474 return -1;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4475 }
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4476 j = scan_table[i];
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4477 block[j] = level;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4478 if (last)
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4479 break;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4480 i++;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4481 }
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4482 not_coded:
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4483 if (s->mb_intra && s->h263_aic) {
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4484 h263_pred_acdc(s, block, n);
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4485 i = 63;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4486 }
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4487 s->block_last_index[n] = i;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4488 return 0;
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4489 }
56e57dc0fe19 cosmetics: Move H.263-related functions around to avoid forward declarations.
diego
parents: 10726
diff changeset
4490
9103
b626fed816d7 Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents: 9093
diff changeset
4491 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
4492 {
b626fed816d7 Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents: 9093
diff changeset
4493 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
4494 int i, mbi;
b626fed816d7 Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents: 9093
diff changeset
4495
b626fed816d7 Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents: 9093
diff changeset
4496 /* 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
4497 * 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
4498 */
b626fed816d7 Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents: 9093
diff changeset
4499 mbi = s->mb_intra;
b626fed816d7 Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents: 9093
diff changeset
4500 s->mb_intra = 0;
b626fed816d7 Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents: 9093
diff changeset
4501 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
4502 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
4503 return -1;
b626fed816d7 Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents: 9093
diff changeset
4504 cbp+=cbp;
b626fed816d7 Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents: 9093
diff changeset
4505 }
b626fed816d7 Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents: 9093
diff changeset
4506 s->mb_intra = mbi;
b626fed816d7 Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents: 9093
diff changeset
4507 return 0;
b626fed816d7 Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents: 9093
diff changeset
4508 }
b626fed816d7 Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents: 9093
diff changeset
4509
b626fed816d7 Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents: 9093
diff changeset
4510 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
4511 {
b626fed816d7 Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents: 9093
diff changeset
4512 int c, mv = 1;
b626fed816d7 Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents: 9093
diff changeset
4513
b626fed816d7 Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents: 9093
diff changeset
4514 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
4515 c = get_bits1(gb);
b626fed816d7 Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents: 9093
diff changeset
4516 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
4517 mv = !get_bits1(gb);
b626fed816d7 Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents: 9093
diff changeset
4518 } 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
4519 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
4520 c = mv & 1;
b626fed816d7 Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents: 9093
diff changeset
4521 mv = !!(mv & 2);
b626fed816d7 Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents: 9093
diff changeset
4522 }
b626fed816d7 Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents: 9093
diff changeset
4523 if(c)
b626fed816d7 Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents: 9093
diff changeset
4524 *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
4525 return mv;
b626fed816d7 Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents: 9093
diff changeset
4526 }
b626fed816d7 Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents: 9093
diff changeset
4527
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
4528 int ff_h263_decode_mb(MpegEncContext *s,
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
4529 DCTELEM block[6][64])
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
4530 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
4531 int cbpc, cbpy, i, cbp, pred_x, pred_y, mx, my, dquant;
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
4532 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
4533 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
4534 int cbpb = 0, pb_mv_count = 0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
4535
1649
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4536 assert(!s->h263_pred);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
4537
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6211
diff changeset
4538 if (s->pict_type == FF_P_TYPE) {
1649
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4539 do{
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4540 if (get_bits1(&s->gb)) {
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4541 /* skip mb */
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4542 s->mb_intra = 0;
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4543 for(i=0;i<6;i++)
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4544 s->block_last_index[i] = -1;
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4545 s->mv_dir = MV_DIR_FORWARD;
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4546 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
4547 s->current_picture.mb_type[xy]= MB_TYPE_SKIP | MB_TYPE_16x16 | MB_TYPE_L0;
255
db20b987c32d divx5-gmc support
michaelni
parents: 254
diff changeset
4548 s->mv[0][0][0] = 0;
db20b987c32d divx5-gmc support
michaelni
parents: 254
diff changeset
4549 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
4550 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
4551 goto end;
255
db20b987c32d divx5-gmc support
michaelni
parents: 254
diff changeset
4552 }
1649
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4553 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
4554 if (cbpc < 0){
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4555 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
4556 return -1;
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4557 }
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4558 }while(cbpc == 20);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
4559
2632
67171616ead6 avoid unneeded clear_blocks()
michael
parents: 2628
diff changeset
4560 s->dsp.clear_blocks(s->block[0]);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
4561
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
4562 dquant = cbpc & 8;
986e461dc072 Initial revision
glantau
parents:
diff changeset
4563 s->mb_intra = ((cbpc & 4) != 0);
262
7d941b8c4e84 mpeg4 b-frames :)
michaelni
parents: 255
diff changeset
4564 if (s->mb_intra) goto intra;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
4565
9103
b626fed816d7 Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents: 9093
diff changeset
4566 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
4567 pb_mv_count = h263_get_modb(&s->gb, s->pb_frame, &cbpb);
544
5264fb104700 optimization (get_vlc -> get_vlc2)
michaelni
parents: 542
diff changeset
4568 cbpy = get_vlc2(&s->gb, cbpy_vlc.table, CBPY_VLC_BITS, 1);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
4569
1637
7799582dc9b8 h263 alternative inter vlc support
michael
parents: 1633
diff changeset
4570 if(s->alt_inter_vlc==0 || (cbpc & 3)!=3)
7799582dc9b8 h263 alternative inter vlc support
michael
parents: 1633
diff changeset
4571 cbpy ^= 0xF;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
4572
1637
7799582dc9b8 h263 alternative inter vlc support
michael
parents: 1633
diff changeset
4573 cbp = (cbpc & 3) | (cbpy << 2);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
4574 if (dquant) {
1656
34b0e799aeb6 cleanup
michael
parents: 1655
diff changeset
4575 h263_decode_dquant(s);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
4576 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
4577
1649
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4578 s->mv_dir = MV_DIR_FORWARD;
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4579 if ((cbpc & 16) == 0) {
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
4580 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
4581 /* 16x16 motion prediction */
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4582 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
4583 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
4584 if (s->umvplus)
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4585 mx = h263p_decode_umotion(s, pred_x);
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4586 else
1655
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
4587 mx = h263_decode_motion(s, pred_x, 1);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
4588
1649
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4589 if (mx >= 0xffff)
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4590 return -1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
4591
1649
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4592 if (s->umvplus)
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4593 my = h263p_decode_umotion(s, pred_y);
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4594 else
1655
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
4595 my = h263_decode_motion(s, pred_y, 1);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
4596
1649
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4597 if (my >= 0xffff)
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4598 return -1;
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4599 s->mv[0][0][0] = mx;
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4600 s->mv[0][0][1] = my;
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4601
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4602 if (s->umvplus && (mx - pred_x) == 1 && (my - pred_y) == 1)
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
4603 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
4604 } else {
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
4605 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
4606 s->mv_type = MV_TYPE_8X8;
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4607 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
4608 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
4609 if (s->umvplus)
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4610 mx = h263p_decode_umotion(s, pred_x);
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4611 else
1655
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
4612 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
4613 if (mx >= 0xffff)
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4614 return -1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
4615
1649
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4616 if (s->umvplus)
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4617 my = h263p_decode_umotion(s, pred_y);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
4618 else
1655
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
4619 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
4620 if (my >= 0xffff)
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4621 return -1;
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4622 s->mv[0][i][0] = mx;
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4623 s->mv[0][i][1] = my;
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4624 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
4625 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
4626 mot_val[0] = mx;
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4627 mot_val[1] = my;
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4628 }
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4629 }
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6211
diff changeset
4630 } else if(s->pict_type==FF_B_TYPE) {
1655
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
4631 int mb_type;
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
4632 const int stride= s->b8_stride;
1701
95b7ac3344df rv20 / h263 b frame fix
michael
parents: 1680
diff changeset
4633 int16_t *mot_val0 = s->current_picture.motion_val[0][ 2*(s->mb_x + s->mb_y*stride) ];
95b7ac3344df rv20 / h263 b frame fix
michael
parents: 1680
diff changeset
4634 int16_t *mot_val1 = s->current_picture.motion_val[1][ 2*(s->mb_x + s->mb_y*stride) ];
1655
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
4635 // const int mv_xy= s->mb_x + 1 + s->mb_y * s->mb_stride;
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
4636
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
4637 //FIXME ugly
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
4638 mot_val0[0 ]= mot_val0[2 ]= mot_val0[0+2*stride]= mot_val0[2+2*stride]=
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
4639 mot_val0[1 ]= mot_val0[3 ]= mot_val0[1+2*stride]= mot_val0[3+2*stride]=
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
4640 mot_val1[0 ]= mot_val1[2 ]= mot_val1[0+2*stride]= mot_val1[2+2*stride]=
1701
95b7ac3344df rv20 / h263 b frame fix
michael
parents: 1680
diff changeset
4641 mot_val1[1 ]= mot_val1[3 ]= mot_val1[1+2*stride]= mot_val1[3+2*stride]= 0;
1655
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
4642
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
4643 do{
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
4644 mb_type= get_vlc2(&s->gb, h263_mbtype_b_vlc.table, H263_MBTYPE_B_VLC_BITS, 2);
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
4645 if (mb_type < 0){
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
4646 av_log(s->avctx, AV_LOG_ERROR, "b mb_type damaged at %d %d\n", s->mb_x, s->mb_y);
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
4647 return -1;
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
4648 }
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
4649
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
4650 mb_type= h263_mb_type_b_map[ mb_type ];
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
4651 }while(!mb_type);
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
4652
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
4653 s->mb_intra = IS_INTRA(mb_type);
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
4654 if(HAS_CBP(mb_type)){
2632
67171616ead6 avoid unneeded clear_blocks()
michael
parents: 2628
diff changeset
4655 s->dsp.clear_blocks(s->block[0]);
1655
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
4656 cbpc = get_vlc2(&s->gb, cbpc_b_vlc.table, CBPC_B_VLC_BITS, 1);
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
4657 if(s->mb_intra){
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
4658 dquant = IS_QUANT(mb_type);
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
4659 goto intra;
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
4660 }
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
4661
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
4662 cbpy = get_vlc2(&s->gb, cbpy_vlc.table, CBPY_VLC_BITS, 1);
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
4663
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
4664 if (cbpy < 0){
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
4665 av_log(s->avctx, AV_LOG_ERROR, "b cbpy damaged at %d %d\n", s->mb_x, s->mb_y);
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
4666 return -1;
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
4667 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
4668
1655
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
4669 if(s->alt_inter_vlc==0 || (cbpc & 3)!=3)
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
4670 cbpy ^= 0xF;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
4671
1655
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
4672 cbp = (cbpc & 3) | (cbpy << 2);
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
4673 }else
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
4674 cbp=0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
4675
1655
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
4676 assert(!s->mb_intra);
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
4677
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
4678 if(IS_QUANT(mb_type)){
1656
34b0e799aeb6 cleanup
michael
parents: 1655
diff changeset
4679 h263_decode_dquant(s);
1655
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
4680 }
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
4681
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
4682 if(IS_DIRECT(mb_type)){
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
4683 s->mv_dir = MV_DIR_FORWARD | MV_DIR_BACKWARD | MV_DIRECT;
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
4684 mb_type |= ff_mpeg4_set_direct_mv(s, 0, 0);
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
4685 }else{
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
4686 s->mv_dir = 0;
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
4687 s->mv_type= MV_TYPE_16X16;
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
4688 //FIXME UMV
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
4689
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
4690 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
4691 int16_t *mot_val= h263_pred_motion(s, 0, 0, &mx, &my);
1655
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
4692 s->mv_dir = MV_DIR_FORWARD;
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
4693
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
4694 mx = h263_decode_motion(s, mx, 1);
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
4695 my = h263_decode_motion(s, my, 1);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
4696
1655
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
4697 s->mv[0][0][0] = mx;
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
4698 s->mv[0][0][1] = my;
1701
95b7ac3344df rv20 / h263 b frame fix
michael
parents: 1680
diff changeset
4699 mot_val[0 ]= mot_val[2 ]= mot_val[0+2*stride]= mot_val[2+2*stride]= mx;
95b7ac3344df rv20 / h263 b frame fix
michael
parents: 1680
diff changeset
4700 mot_val[1 ]= mot_val[3 ]= mot_val[1+2*stride]= mot_val[3+2*stride]= my;
1655
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
4701 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
4702
1655
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
4703 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
4704 int16_t *mot_val= h263_pred_motion(s, 0, 1, &mx, &my);
1655
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
4705 s->mv_dir |= MV_DIR_BACKWARD;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
4706
1655
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
4707 mx = h263_decode_motion(s, mx, 1);
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
4708 my = h263_decode_motion(s, my, 1);
1701
95b7ac3344df rv20 / h263 b frame fix
michael
parents: 1680
diff changeset
4709
1655
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
4710 s->mv[1][0][0] = mx;
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
4711 s->mv[1][0][1] = my;
1701
95b7ac3344df rv20 / h263 b frame fix
michael
parents: 1680
diff changeset
4712 mot_val[0 ]= mot_val[2 ]= mot_val[0+2*stride]= mot_val[2+2*stride]= mx;
95b7ac3344df rv20 / h263 b frame fix
michael
parents: 1680
diff changeset
4713 mot_val[1 ]= mot_val[3 ]= mot_val[1+2*stride]= mot_val[3+2*stride]= my;
1655
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
4714 }
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
4715 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
4716
1655
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
4717 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
4718 } else { /* I-Frame */
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4719 do{
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4720 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
4721 if (cbpc < 0){
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4722 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
4723 return -1;
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4724 }
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4725 }while(cbpc == 8);
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4726
2632
67171616ead6 avoid unneeded clear_blocks()
michael
parents: 2628
diff changeset
4727 s->dsp.clear_blocks(s->block[0]);
67171616ead6 avoid unneeded clear_blocks()
michael
parents: 2628
diff changeset
4728
1649
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4729 dquant = cbpc & 4;
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4730 s->mb_intra = 1;
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4731 intra:
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4732 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
4733 if (s->h263_aic) {
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4734 s->ac_pred = get_bits1(&s->gb);
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4735 if(s->ac_pred){
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4736 s->current_picture.mb_type[xy]= MB_TYPE_INTRA | MB_TYPE_ACPRED;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
4737
1649
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4738 s->h263_aic_dir = get_bits1(&s->gb);
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4739 }
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4740 }else
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4741 s->ac_pred = 0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
4742
9103
b626fed816d7 Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents: 9093
diff changeset
4743 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
4744 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
4745 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
4746 if(cbpy<0){
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4747 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
4748 return -1;
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4749 }
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4750 cbp = (cbpc & 3) | (cbpy << 2);
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4751 if (dquant) {
1656
34b0e799aeb6 cleanup
michael
parents: 1655
diff changeset
4752 h263_decode_dquant(s);
1649
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4753 }
9103
b626fed816d7 Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents: 9093
diff changeset
4754
b626fed816d7 Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents: 9093
diff changeset
4755 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
4756 }
b626fed816d7 Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents: 9093
diff changeset
4757
b626fed816d7 Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents: 9093
diff changeset
4758 while(pb_mv_count--){
b626fed816d7 Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents: 9093
diff changeset
4759 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
4760 h263_decode_motion(s, 0, 1);
9093
e9ba8210d495 Factor out block decoding in ff_h263_decode_mb()
kostya
parents: 9024
diff changeset
4761 }
e9ba8210d495 Factor out block decoding in ff_h263_decode_mb()
kostya
parents: 9024
diff changeset
4762
e9ba8210d495 Factor out block decoding in ff_h263_decode_mb()
kostya
parents: 9024
diff changeset
4763 /* decode each block */
e9ba8210d495 Factor out block decoding in ff_h263_decode_mb()
kostya
parents: 9024
diff changeset
4764 for (i = 0; i < 6; i++) {
e9ba8210d495 Factor out block decoding in ff_h263_decode_mb()
kostya
parents: 9024
diff changeset
4765 if (h263_decode_block(s, block[i], i, cbp&32) < 0)
e9ba8210d495 Factor out block decoding in ff_h263_decode_mb()
kostya
parents: 9024
diff changeset
4766 return -1;
e9ba8210d495 Factor out block decoding in ff_h263_decode_mb()
kostya
parents: 9024
diff changeset
4767 cbp+=cbp;
e9ba8210d495 Factor out block decoding in ff_h263_decode_mb()
kostya
parents: 9024
diff changeset
4768 }
e9ba8210d495 Factor out block decoding in ff_h263_decode_mb()
kostya
parents: 9024
diff changeset
4769
9103
b626fed816d7 Add PB-frame decoding support for H.263/i263 (and enable it for i263)
kostya
parents: 9093
diff changeset
4770 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
4771 return -1;
9093
e9ba8210d495 Factor out block decoding in ff_h263_decode_mb()
kostya
parents: 9024
diff changeset
4772 if(s->obmc && !s->mb_intra){
e9ba8210d495 Factor out block decoding in ff_h263_decode_mb()
kostya
parents: 9024
diff changeset
4773 if(s->pict_type == FF_P_TYPE && s->mb_x+1<s->mb_width && s->mb_num_left != 1)
e9ba8210d495 Factor out block decoding in ff_h263_decode_mb()
kostya
parents: 9024
diff changeset
4774 preview_obmc(s);
1649
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4775 }
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4776 end:
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4777
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4778 /* per-MB end of slice check */
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4779 {
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4780 int v= show_bits(&s->gb, 16);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
4781
1649
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4782 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
4783 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
4784 }
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4785
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4786 if(v==0)
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4787 return SLICE_END;
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
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
4790 return SLICE_OK;
1649
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4791 }
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4792
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4793 int ff_mpeg4_decode_mb(MpegEncContext *s,
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4794 DCTELEM block[6][64])
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4795 {
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4796 int 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
4797 int16_t *mot_val;
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4798 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
4799 const int xy= s->mb_x + s->mb_y * s->mb_stride;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
4800
1649
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4801 assert(s->h263_pred);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
4802
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6211
diff changeset
4803 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
4804 do{
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4805 if (get_bits1(&s->gb)) {
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4806 /* skip mb */
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4807 s->mb_intra = 0;
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4808 for(i=0;i<6;i++)
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4809 s->block_last_index[i] = -1;
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4810 s->mv_dir = MV_DIR_FORWARD;
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4811 s->mv_type = MV_TYPE_16X16;
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6211
diff changeset
4812 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
4813 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
4814 s->mcsel=1;
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4815 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
4816 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
4817
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
4818 s->mb_skipped = 0;
1649
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4819 }else{
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4820 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
4821 s->mcsel=0;
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4822 s->mv[0][0][0] = 0;
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4823 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
4824 s->mb_skipped = 1;
1649
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4825 }
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4826 goto end;
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4827 }
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4828 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
4829 if (cbpc < 0){
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4830 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
4831 return -1;
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4832 }
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4833 }while(cbpc == 20);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
4834
2632
67171616ead6 avoid unneeded clear_blocks()
michael
parents: 2628
diff changeset
4835 s->dsp.clear_blocks(s->block[0]);
1649
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4836 dquant = cbpc & 8;
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4837 s->mb_intra = ((cbpc & 4) != 0);
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4838 if (s->mb_intra) goto intra;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
4839
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6211
diff changeset
4840 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
4841 s->mcsel= get_bits1(&s->gb);
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4842 else s->mcsel= 0;
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4843 cbpy = get_vlc2(&s->gb, cbpy_vlc.table, CBPY_VLC_BITS, 1) ^ 0x0F;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
4844
1649
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4845 cbp = (cbpc & 3) | (cbpy << 2);
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4846 if (dquant) {
1652
834922115010 cleanup
michael
parents: 1649
diff changeset
4847 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
4848 }
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
4849 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
4850 s->interlaced_dct= get_bits1(&s->gb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
4851
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
4852 s->mv_dir = MV_DIR_FORWARD;
986e461dc072 Initial revision
glantau
parents:
diff changeset
4853 if ((cbpc & 16) == 0) {
619
2be2cc8fd0a1 mpeg4 interlaced decoding support (not completly implemented/tested due to lack of samples)
michaelni
parents: 617
diff changeset
4854 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
4855 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
4856 /* 16x16 global motion prediction */
2be2cc8fd0a1 mpeg4 interlaced decoding support (not completly implemented/tested due to lack of samples)
michaelni
parents: 617
diff changeset
4857 s->mv_type = MV_TYPE_16X16;
753
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 751
diff changeset
4858 mx= get_amv(s, 0);
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 751
diff changeset
4859 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
4860 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
4861 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
4862 }else if((!s->progressive_sequence) && get_bits1(&s->gb)){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
4863 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
4864 /* 16x8 field motion prediction */
2be2cc8fd0a1 mpeg4 interlaced decoding support (not completly implemented/tested due to lack of samples)
michaelni
parents: 617
diff changeset
4865 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
4866
2be2cc8fd0a1 mpeg4 interlaced decoding support (not completly implemented/tested due to lack of samples)
michaelni
parents: 617
diff changeset
4867 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
4868 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
4869
1938
e2501e6e7ff7 unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents: 1936
diff changeset
4870 h263_pred_motion(s, 0, 0, &pred_x, &pred_y);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
4871
619
2be2cc8fd0a1 mpeg4 interlaced decoding support (not completly implemented/tested due to lack of samples)
michaelni
parents: 617
diff changeset
4872 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
4873 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
4874 if (mx >= 0xffff)
2be2cc8fd0a1 mpeg4 interlaced decoding support (not completly implemented/tested due to lack of samples)
michaelni
parents: 617
diff changeset
4875 return -1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
4876
619
2be2cc8fd0a1 mpeg4 interlaced decoding support (not completly implemented/tested due to lack of samples)
michaelni
parents: 617
diff changeset
4877 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
4878 if (my >= 0xffff)
2be2cc8fd0a1 mpeg4 interlaced decoding support (not completly implemented/tested due to lack of samples)
michaelni
parents: 617
diff changeset
4879 return -1;
2be2cc8fd0a1 mpeg4 interlaced decoding support (not completly implemented/tested due to lack of samples)
michaelni
parents: 617
diff changeset
4880
2be2cc8fd0a1 mpeg4 interlaced decoding support (not completly implemented/tested due to lack of samples)
michaelni
parents: 617
diff changeset
4881 s->mv[0][i][0] = mx;
661
a0901e38c564 fixing interlaced mpeg4 decoding
michaelni
parents: 660
diff changeset
4882 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
4883 }
2be2cc8fd0a1 mpeg4 interlaced decoding support (not completly implemented/tested due to lack of samples)
michaelni
parents: 617
diff changeset
4884 }else{
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
4885 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
4886 /* 16x16 motion prediction */
2be2cc8fd0a1 mpeg4 interlaced decoding support (not completly implemented/tested due to lack of samples)
michaelni
parents: 617
diff changeset
4887 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
4888 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
4889 mx = h263_decode_motion(s, pred_x, s->f_code);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
4890
619
2be2cc8fd0a1 mpeg4 interlaced decoding support (not completly implemented/tested due to lack of samples)
michaelni
parents: 617
diff changeset
4891 if (mx >= 0xffff)
2be2cc8fd0a1 mpeg4 interlaced decoding support (not completly implemented/tested due to lack of samples)
michaelni
parents: 617
diff changeset
4892 return -1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
4893
1649
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4894 my = h263_decode_motion(s, pred_y, s->f_code);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
4895
619
2be2cc8fd0a1 mpeg4 interlaced decoding support (not completly implemented/tested due to lack of samples)
michaelni
parents: 617
diff changeset
4896 if (my >= 0xffff)
2be2cc8fd0a1 mpeg4 interlaced decoding support (not completly implemented/tested due to lack of samples)
michaelni
parents: 617
diff changeset
4897 return -1;
2be2cc8fd0a1 mpeg4 interlaced decoding support (not completly implemented/tested due to lack of samples)
michaelni
parents: 617
diff changeset
4898 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
4899 s->mv[0][0][1] = my;
255
db20b987c32d divx5-gmc support
michaelni
parents: 254
diff changeset
4900 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
4901 } else {
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
4902 s->current_picture.mb_type[xy]= MB_TYPE_8x8 | MB_TYPE_L0;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
4903 s->mv_type = MV_TYPE_8X8;
986e461dc072 Initial revision
glantau
parents:
diff changeset
4904 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
4905 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
4906 mx = h263_decode_motion(s, pred_x, s->f_code);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
4907 if (mx >= 0xffff)
986e461dc072 Initial revision
glantau
parents:
diff changeset
4908 return -1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
4909
1649
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
4910 my = h263_decode_motion(s, pred_y, s->f_code);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
4911 if (my >= 0xffff)
986e461dc072 Initial revision
glantau
parents:
diff changeset
4912 return -1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
4913 s->mv[0][i][0] = mx;
986e461dc072 Initial revision
glantau
parents:
diff changeset
4914 s->mv[0][i][1] = my;
986e461dc072 Initial revision
glantau
parents:
diff changeset
4915 mot_val[0] = mx;
986e461dc072 Initial revision
glantau
parents:
diff changeset
4916 mot_val[1] = my;
986e461dc072 Initial revision
glantau
parents:
diff changeset
4917 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
4918 }
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6211
diff changeset
4919 } else if(s->pict_type==FF_B_TYPE) {
262
7d941b8c4e84 mpeg4 b-frames :)
michaelni
parents: 255
diff changeset
4920 int modb1; // first bit of modb
7d941b8c4e84 mpeg4 b-frames :)
michaelni
parents: 255
diff changeset
4921 int modb2; // second bit of modb
7d941b8c4e84 mpeg4 b-frames :)
michaelni
parents: 255
diff changeset
4922 int mb_type;
7d941b8c4e84 mpeg4 b-frames :)
michaelni
parents: 255
diff changeset
4923
7d941b8c4e84 mpeg4 b-frames :)
michaelni
parents: 255
diff changeset
4924 s->mb_intra = 0; //B-frames never contain intra blocks
7d941b8c4e84 mpeg4 b-frames :)
michaelni
parents: 255
diff changeset
4925 s->mcsel=0; // ... true gmc blocks
7d941b8c4e84 mpeg4 b-frames :)
michaelni
parents: 255
diff changeset
4926
7d941b8c4e84 mpeg4 b-frames :)
michaelni
parents: 255
diff changeset
4927 if(s->mb_x==0){
674
4490bfbb932d interlaced b frames fix
michaelni
parents: 669
diff changeset
4928 for(i=0; i<2; i++){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
4929 s->last_mv[i][0][0]=
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
4930 s->last_mv[i][0][1]=
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
4931 s->last_mv[i][1][0]=
674
4490bfbb932d interlaced b frames fix
michaelni
parents: 669
diff changeset
4932 s->last_mv[i][1][1]= 0;
4490bfbb932d interlaced b frames fix
michaelni
parents: 669
diff changeset
4933 }
262
7d941b8c4e84 mpeg4 b-frames :)
michaelni
parents: 255
diff changeset
4934 }
7d941b8c4e84 mpeg4 b-frames :)
michaelni
parents: 255
diff changeset
4935
7d941b8c4e84 mpeg4 b-frames :)
michaelni
parents: 255
diff changeset
4936 /* 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
4937 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
4938
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
4939 if(s->mb_skipped){
262
7d941b8c4e84 mpeg4 b-frames :)
michaelni
parents: 255
diff changeset
4940 /* skip mb */
7d941b8c4e84 mpeg4 b-frames :)
michaelni
parents: 255
diff changeset
4941 for(i=0;i<6;i++)
7d941b8c4e84 mpeg4 b-frames :)
michaelni
parents: 255
diff changeset
4942 s->block_last_index[i] = -1;
7d941b8c4e84 mpeg4 b-frames :)
michaelni
parents: 255
diff changeset
4943
7d941b8c4e84 mpeg4 b-frames :)
michaelni
parents: 255
diff changeset
4944 s->mv_dir = MV_DIR_FORWARD;
7d941b8c4e84 mpeg4 b-frames :)
michaelni
parents: 255
diff changeset
4945 s->mv_type = MV_TYPE_16X16;
7d941b8c4e84 mpeg4 b-frames :)
michaelni
parents: 255
diff changeset
4946 s->mv[0][0][0] = 0;
7d941b8c4e84 mpeg4 b-frames :)
michaelni
parents: 255
diff changeset
4947 s->mv[0][0][1] = 0;
7d941b8c4e84 mpeg4 b-frames :)
michaelni
parents: 255
diff changeset
4948 s->mv[1][0][0] = 0;
7d941b8c4e84 mpeg4 b-frames :)
michaelni
parents: 255
diff changeset
4949 s->mv[1][0][1] = 0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
4950 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
4951 goto end;
262
7d941b8c4e84 mpeg4 b-frames :)
michaelni
parents: 255
diff changeset
4952 }
7d941b8c4e84 mpeg4 b-frames :)
michaelni
parents: 255
diff changeset
4953
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
4954 modb1= get_bits1(&s->gb);
666
f5b8b5dd50d7 interlaced b frames cleanup
michaelni
parents: 664
diff changeset
4955 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
4956 mb_type= MB_TYPE_DIRECT2 | MB_TYPE_SKIP | MB_TYPE_L0L1; //like MB_TYPE_B_DIRECT but no vectors coded
666
f5b8b5dd50d7 interlaced b frames cleanup
michaelni
parents: 664
diff changeset
4957 cbp=0;
f5b8b5dd50d7 interlaced b frames cleanup
michaelni
parents: 664
diff changeset
4958 }else{
262
7d941b8c4e84 mpeg4 b-frames :)
michaelni
parents: 255
diff changeset
4959 modb2= get_bits1(&s->gb);
544
5264fb104700 optimization (get_vlc -> get_vlc2)
michaelni
parents: 542
diff changeset
4960 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
4961 if(mb_type<0){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1586
diff changeset
4962 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
4963 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
4964 }
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1176
diff changeset
4965 mb_type= mb_type_b_map[ mb_type ];
666
f5b8b5dd50d7 interlaced b frames cleanup
michaelni
parents: 664
diff changeset
4966 if(modb2) cbp= 0;
2632
67171616ead6 avoid unneeded clear_blocks()
michael
parents: 2628
diff changeset
4967 else{
67171616ead6 avoid unneeded clear_blocks()
michael
parents: 2628
diff changeset
4968 s->dsp.clear_blocks(s->block[0]);
67171616ead6 avoid unneeded clear_blocks()
michael
parents: 2628
diff changeset
4969 cbp= get_bits(&s->gb, 6);
67171616ead6 avoid unneeded clear_blocks()
michael
parents: 2628
diff changeset
4970 }
666
f5b8b5dd50d7 interlaced b frames cleanup
michaelni
parents: 664
diff changeset
4971
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
4972 if ((!IS_DIRECT(mb_type)) && cbp) {
262
7d941b8c4e84 mpeg4 b-frames :)
michaelni
parents: 255
diff changeset
4973 if(get_bits1(&s->gb)){
1652
834922115010 cleanup
michael
parents: 1649
diff changeset
4974 ff_set_qscale(s, s->qscale + get_bits1(&s->gb)*4 - 2);
262
7d941b8c4e84 mpeg4 b-frames :)
michaelni
parents: 255
diff changeset
4975 }
7d941b8c4e84 mpeg4 b-frames :)
michaelni
parents: 255
diff changeset
4976 }
664
00a882f626bd interlaced mpeg4 b frame decoding
michaelni
parents: 662
diff changeset
4977
00a882f626bd interlaced mpeg4 b frame decoding
michaelni
parents: 662
diff changeset
4978 if(!s->progressive_sequence){
00a882f626bd interlaced mpeg4 b frame decoding
michaelni
parents: 662
diff changeset
4979 if(cbp)
00a882f626bd interlaced mpeg4 b frame decoding
michaelni
parents: 662
diff changeset
4980 s->interlaced_dct= get_bits1(&s->gb);
00a882f626bd interlaced mpeg4 b frame decoding
michaelni
parents: 662
diff changeset
4981
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
4982 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
4983 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
4984 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
4985
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1176
diff changeset
4986 if(USES_LIST(mb_type, 0)){
667
5446a41a00fe 10l (field select readed at the wrong place ...)
michaelni
parents: 666
diff changeset
4987 s->field_select[0][0]= get_bits1(&s->gb);
5446a41a00fe 10l (field select readed at the wrong place ...)
michaelni
parents: 666
diff changeset
4988 s->field_select[0][1]= get_bits1(&s->gb);
5446a41a00fe 10l (field select readed at the wrong place ...)
michaelni
parents: 666
diff changeset
4989 }
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
4990 if(USES_LIST(mb_type, 1)){
667
5446a41a00fe 10l (field select readed at the wrong place ...)
michaelni
parents: 666
diff changeset
4991 s->field_select[1][0]= get_bits1(&s->gb);
5446a41a00fe 10l (field select readed at the wrong place ...)
michaelni
parents: 666
diff changeset
4992 s->field_select[1][1]= get_bits1(&s->gb);
5446a41a00fe 10l (field select readed at the wrong place ...)
michaelni
parents: 666
diff changeset
4993 }
5446a41a00fe 10l (field select readed at the wrong place ...)
michaelni
parents: 666
diff changeset
4994 }
666
f5b8b5dd50d7 interlaced b frames cleanup
michaelni
parents: 664
diff changeset
4995 }
f5b8b5dd50d7 interlaced b frames cleanup
michaelni
parents: 664
diff changeset
4996
667
5446a41a00fe 10l (field select readed at the wrong place ...)
michaelni
parents: 666
diff changeset
4997 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
4998 if((mb_type & (MB_TYPE_DIRECT2|MB_TYPE_INTERLACED)) == 0){
666
f5b8b5dd50d7 interlaced b frames cleanup
michaelni
parents: 664
diff changeset
4999 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
5000
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1176
diff changeset
5001 if(USES_LIST(mb_type, 0)){
666
f5b8b5dd50d7 interlaced b frames cleanup
michaelni
parents: 664
diff changeset
5002 s->mv_dir = MV_DIR_FORWARD;
f5b8b5dd50d7 interlaced b frames cleanup
michaelni
parents: 664
diff changeset
5003
f5b8b5dd50d7 interlaced b frames cleanup
michaelni
parents: 664
diff changeset
5004 mx = h263_decode_motion(s, s->last_mv[0][0][0], s->f_code);
f5b8b5dd50d7 interlaced b frames cleanup
michaelni
parents: 664
diff changeset
5005 my = h263_decode_motion(s, s->last_mv[0][0][1], s->f_code);
f5b8b5dd50d7 interlaced b frames cleanup
michaelni
parents: 664
diff changeset
5006 s->last_mv[0][1][0]= s->last_mv[0][0][0]= s->mv[0][0][0] = mx;
f5b8b5dd50d7 interlaced b frames cleanup
michaelni
parents: 664
diff changeset
5007 s->last_mv[0][1][1]= s->last_mv[0][0][1]= s->mv[0][0][1] = my;
667
5446a41a00fe 10l (field select readed at the wrong place ...)
michaelni
parents: 666
diff changeset
5008 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
5009
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(USES_LIST(mb_type, 1)){
666
f5b8b5dd50d7 interlaced b frames cleanup
michaelni
parents: 664
diff changeset
5011 s->mv_dir |= MV_DIR_BACKWARD;
f5b8b5dd50d7 interlaced b frames cleanup
michaelni
parents: 664
diff changeset
5012
f5b8b5dd50d7 interlaced b frames cleanup
michaelni
parents: 664
diff changeset
5013 mx = h263_decode_motion(s, s->last_mv[1][0][0], s->b_code);
f5b8b5dd50d7 interlaced b frames cleanup
michaelni
parents: 664
diff changeset
5014 my = h263_decode_motion(s, s->last_mv[1][0][1], s->b_code);
f5b8b5dd50d7 interlaced b frames cleanup
michaelni
parents: 664
diff changeset
5015 s->last_mv[1][1][0]= s->last_mv[1][0][0]= s->mv[1][0][0] = mx;
f5b8b5dd50d7 interlaced b frames cleanup
michaelni
parents: 664
diff changeset
5016 s->last_mv[1][1][1]= s->last_mv[1][0][1]= s->mv[1][0][1] = my;
f5b8b5dd50d7 interlaced b frames cleanup
michaelni
parents: 664
diff changeset
5017 }
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
5018 }else if(!IS_DIRECT(mb_type)){
666
f5b8b5dd50d7 interlaced b frames cleanup
michaelni
parents: 664
diff changeset
5019 s->mv_type= MV_TYPE_FIELD;
667
5446a41a00fe 10l (field select readed at the wrong place ...)
michaelni
parents: 666
diff changeset
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(USES_LIST(mb_type, 0)){
666
f5b8b5dd50d7 interlaced b frames cleanup
michaelni
parents: 664
diff changeset
5022 s->mv_dir = MV_DIR_FORWARD;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
5023
666
f5b8b5dd50d7 interlaced b frames cleanup
michaelni
parents: 664
diff changeset
5024 for(i=0; i<2; i++){
f5b8b5dd50d7 interlaced b frames cleanup
michaelni
parents: 664
diff changeset
5025 mx = h263_decode_motion(s, s->last_mv[0][i][0] , s->f_code);
f5b8b5dd50d7 interlaced b frames cleanup
michaelni
parents: 664
diff changeset
5026 my = h263_decode_motion(s, s->last_mv[0][i][1]/2, s->f_code);
f5b8b5dd50d7 interlaced b frames cleanup
michaelni
parents: 664
diff changeset
5027 s->last_mv[0][i][0]= s->mv[0][i][0] = mx;
f5b8b5dd50d7 interlaced b frames cleanup
michaelni
parents: 664
diff changeset
5028 s->last_mv[0][i][1]= (s->mv[0][i][1] = my)*2;
f5b8b5dd50d7 interlaced b frames cleanup
michaelni
parents: 664
diff changeset
5029 }
667
5446a41a00fe 10l (field select readed at the wrong place ...)
michaelni
parents: 666
diff changeset
5030 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
5031
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
5032 if(USES_LIST(mb_type, 1)){
666
f5b8b5dd50d7 interlaced b frames cleanup
michaelni
parents: 664
diff changeset
5033 s->mv_dir |= MV_DIR_BACKWARD;
f5b8b5dd50d7 interlaced b frames cleanup
michaelni
parents: 664
diff changeset
5034
f5b8b5dd50d7 interlaced b frames cleanup
michaelni
parents: 664
diff changeset
5035 for(i=0; i<2; i++){
f5b8b5dd50d7 interlaced b frames cleanup
michaelni
parents: 664
diff changeset
5036 mx = h263_decode_motion(s, s->last_mv[1][i][0] , s->b_code);
f5b8b5dd50d7 interlaced b frames cleanup
michaelni
parents: 664
diff changeset
5037 my = h263_decode_motion(s, s->last_mv[1][i][1]/2, s->b_code);
f5b8b5dd50d7 interlaced b frames cleanup
michaelni
parents: 664
diff changeset
5038 s->last_mv[1][i][0]= s->mv[1][i][0] = mx;
f5b8b5dd50d7 interlaced b frames cleanup
michaelni
parents: 664
diff changeset
5039 s->last_mv[1][i][1]= (s->mv[1][i][1] = my)*2;
664
00a882f626bd interlaced mpeg4 b frame decoding
michaelni
parents: 662
diff changeset
5040 }
00a882f626bd interlaced mpeg4 b frame decoding
michaelni
parents: 662
diff changeset
5041 }
00a882f626bd interlaced mpeg4 b frame decoding
michaelni
parents: 662
diff changeset
5042 }
00a882f626bd interlaced mpeg4 b frame decoding
michaelni
parents: 662
diff changeset
5043 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
5044
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
5045 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
5046 if(IS_SKIP(mb_type))
666
f5b8b5dd50d7 interlaced b frames cleanup
michaelni
parents: 664
diff changeset
5047 mx=my=0;
f5b8b5dd50d7 interlaced b frames cleanup
michaelni
parents: 664
diff changeset
5048 else{
f5b8b5dd50d7 interlaced b frames cleanup
michaelni
parents: 664
diff changeset
5049 mx = h263_decode_motion(s, 0, 1);
f5b8b5dd50d7 interlaced b frames cleanup
michaelni
parents: 664
diff changeset
5050 my = h263_decode_motion(s, 0, 1);
f5b8b5dd50d7 interlaced b frames cleanup
michaelni
parents: 664
diff changeset
5051 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
5052
262
7d941b8c4e84 mpeg4 b-frames :)
michaelni
parents: 255
diff changeset
5053 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
5054 mb_type |= ff_mpeg4_set_direct_mv(s, mx, my);
664
00a882f626bd interlaced mpeg4 b frame decoding
michaelni
parents: 662
diff changeset
5055 }
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
5056 s->current_picture.mb_type[xy]= mb_type;
262
7d941b8c4e84 mpeg4 b-frames :)
michaelni
parents: 255
diff changeset
5057 } else { /* I-Frame */
1482
b372ecde32a8 h263 stuffing decode fix
michaelni
parents: 1457
diff changeset
5058 do{
b372ecde32a8 h263 stuffing decode fix
michaelni
parents: 1457
diff changeset
5059 cbpc = get_vlc2(&s->gb, intra_MCBPC_vlc.table, INTRA_MCBPC_VLC_BITS, 2);
b372ecde32a8 h263 stuffing decode fix
michaelni
parents: 1457
diff changeset
5060 if (cbpc < 0){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1586
diff changeset
5061 av_log(s->avctx, AV_LOG_ERROR, "I cbpc damaged at %d %d\n", s->mb_x, s->mb_y);
1482
b372ecde32a8 h263 stuffing decode fix
michaelni
parents: 1457
diff changeset
5062 return -1;
b372ecde32a8 h263 stuffing decode fix
michaelni
parents: 1457
diff changeset
5063 }
b372ecde32a8 h263 stuffing decode fix
michaelni
parents: 1457
diff changeset
5064 }while(cbpc == 8);
b372ecde32a8 h263 stuffing decode fix
michaelni
parents: 1457
diff changeset
5065
262
7d941b8c4e84 mpeg4 b-frames :)
michaelni
parents: 255
diff changeset
5066 dquant = cbpc & 4;
7d941b8c4e84 mpeg4 b-frames :)
michaelni
parents: 255
diff changeset
5067 s->mb_intra = 1;
7d941b8c4e84 mpeg4 b-frames :)
michaelni
parents: 255
diff changeset
5068 intra:
1649
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
5069 s->ac_pred = get_bits1(&s->gb);
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
5070 if(s->ac_pred)
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
5071 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
5072 else
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
5073 s->current_picture.mb_type[xy]= MB_TYPE_INTRA;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
5074
544
5264fb104700 optimization (get_vlc -> get_vlc2)
michaelni
parents: 542
diff changeset
5075 cbpy = get_vlc2(&s->gb, cbpy_vlc.table, CBPY_VLC_BITS, 1);
1482
b372ecde32a8 h263 stuffing decode fix
michaelni
parents: 1457
diff changeset
5076 if(cbpy<0){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1586
diff changeset
5077 av_log(s->avctx, AV_LOG_ERROR, "I cbpy damaged at %d %d\n", s->mb_x, s->mb_y);
1482
b372ecde32a8 h263 stuffing decode fix
michaelni
parents: 1457
diff changeset
5078 return -1;
b372ecde32a8 h263 stuffing decode fix
michaelni
parents: 1457
diff changeset
5079 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
5080 cbp = (cbpc & 3) | (cbpy << 2);
3282
ecc93139021c use previous qscale for intra_dc_threshold check
michael
parents: 3256
diff changeset
5081
ecc93139021c use previous qscale for intra_dc_threshold check
michael
parents: 3256
diff changeset
5082 s->use_intra_dc_vlc= s->qscale < s->intra_dc_threshold;
ecc93139021c use previous qscale for intra_dc_threshold check
michael
parents: 3256
diff changeset
5083
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
5084 if (dquant) {
1652
834922115010 cleanup
michael
parents: 1649
diff changeset
5085 ff_set_qscale(s, s->qscale + quant_tab[get_bits(&s->gb, 2)]);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
5086 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
5087
619
2be2cc8fd0a1 mpeg4 interlaced decoding support (not completly implemented/tested due to lack of samples)
michaelni
parents: 617
diff changeset
5088 if(!s->progressive_sequence)
2be2cc8fd0a1 mpeg4 interlaced decoding support (not completly implemented/tested due to lack of samples)
michaelni
parents: 617
diff changeset
5089 s->interlaced_dct= get_bits1(&s->gb);
575
23eee7d73c4b minor optimizations
michaelni
parents: 564
diff changeset
5090
2632
67171616ead6 avoid unneeded clear_blocks()
michael
parents: 2628
diff changeset
5091 s->dsp.clear_blocks(s->block[0]);
575
23eee7d73c4b minor optimizations
michaelni
parents: 564
diff changeset
5092 /* decode each block */
1649
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
5093 for (i = 0; i < 6; i++) {
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
5094 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
5095 return -1;
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
5096 cbp+=cbp;
575
23eee7d73c4b minor optimizations
michaelni
parents: 564
diff changeset
5097 }
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
5098 goto end;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
5099 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
5100
986e461dc072 Initial revision
glantau
parents:
diff changeset
5101 /* decode each block */
1649
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
5102 for (i = 0; i < 6; i++) {
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
5103 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
5104 return -1;
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
5105 cbp+=cbp;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
5106 }
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
5107 end:
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
5108
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
5109 /* per-MB end of slice check */
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
5110 if(s->codec_id==CODEC_ID_MPEG4){
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
5111 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
5112 const int delta= s->mb_x + 1 == s->mb_width ? 2 : 1;
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6211
diff changeset
5113 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
5114 return SLICE_OK;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
5115 return SLICE_END;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
5116 }
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
5117 }
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
5118
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
5119 return SLICE_OK;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
5120 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
5121
986e461dc072 Initial revision
glantau
parents:
diff changeset
5122 /* most is hardcoded. should extend to handle all h263 streams */
986e461dc072 Initial revision
glantau
parents:
diff changeset
5123 int h263_decode_picture_header(MpegEncContext *s)
986e461dc072 Initial revision
glantau
parents:
diff changeset
5124 {
1278
483db104bb7b truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents: 1273
diff changeset
5125 int format, width, height, i;
483db104bb7b truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents: 1273
diff changeset
5126 uint32_t startcode;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
5127
1278
483db104bb7b truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents: 1273
diff changeset
5128 align_get_bits(&s->gb);
483db104bb7b truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents: 1273
diff changeset
5129
483db104bb7b truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents: 1273
diff changeset
5130 startcode= get_bits(&s->gb, 22-8);
483db104bb7b truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents: 1273
diff changeset
5131
10535
95f3daa991a2 Use get_bits_left() instead of size_in_bits - get_bits_count().
rbultje
parents: 9999
diff changeset
5132 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
5133 startcode = ((startcode << 8) | get_bits(&s->gb, 8)) & 0x003FFFFF;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
5134
1278
483db104bb7b truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents: 1273
diff changeset
5135 if(startcode == 0x20)
483db104bb7b truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents: 1273
diff changeset
5136 break;
483db104bb7b truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents: 1273
diff changeset
5137 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
5138
1278
483db104bb7b truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents: 1273
diff changeset
5139 if (startcode != 0x20) {
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1586
diff changeset
5140 av_log(s->avctx, AV_LOG_ERROR, "Bad picture start code\n");
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
5141 return -1;
355
ac6fc4c7aecb - H263 PAR support by Alex Beregszaszi.
pulento
parents: 350
diff changeset
5142 }
ac6fc4c7aecb - H263 PAR support by Alex Beregszaszi.
pulento
parents: 350
diff changeset
5143 /* temporal reference */
1865
92e94c550def h263 framerate & aspect ratio fixes
michael
parents: 1831
diff changeset
5144 i = get_bits(&s->gb, 8); /* picture timestamp */
92e94c550def h263 framerate & aspect ratio fixes
michael
parents: 1831
diff changeset
5145 if( (s->picture_number&~0xFF)+i < s->picture_number)
92e94c550def h263 framerate & aspect ratio fixes
michael
parents: 1831
diff changeset
5146 i+= 256;
2886
5576a9349ab6 set pts for h.263 decoding
michael
parents: 2885
diff changeset
5147 s->current_picture_ptr->pts=
1865
92e94c550def h263 framerate & aspect ratio fixes
michael
parents: 1831
diff changeset
5148 s->picture_number= (s->picture_number&~0xFF) + i;
355
ac6fc4c7aecb - H263 PAR support by Alex Beregszaszi.
pulento
parents: 350
diff changeset
5149
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
5150 /* PTYPE starts here */
355
ac6fc4c7aecb - H263 PAR support by Alex Beregszaszi.
pulento
parents: 350
diff changeset
5151 if (get_bits1(&s->gb) != 1) {
ac6fc4c7aecb - H263 PAR support by Alex Beregszaszi.
pulento
parents: 350
diff changeset
5152 /* marker */
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1586
diff changeset
5153 av_log(s->avctx, AV_LOG_ERROR, "Bad marker\n");
355
ac6fc4c7aecb - H263 PAR support by Alex Beregszaszi.
pulento
parents: 350
diff changeset
5154 return -1;
ac6fc4c7aecb - H263 PAR support by Alex Beregszaszi.
pulento
parents: 350
diff changeset
5155 }
ac6fc4c7aecb - H263 PAR support by Alex Beregszaszi.
pulento
parents: 350
diff changeset
5156 if (get_bits1(&s->gb) != 0) {
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1586
diff changeset
5157 av_log(s->avctx, AV_LOG_ERROR, "Bad H263 id\n");
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
5158 return -1; /* h263 id */
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
5159 }
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
5160 skip_bits1(&s->gb); /* split screen off */
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
5161 skip_bits1(&s->gb); /* camera off */
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
5162 skip_bits1(&s->gb); /* freeze picture release off */
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
5163
986e461dc072 Initial revision
glantau
parents:
diff changeset
5164 format = get_bits(&s->gb, 3);
355
ac6fc4c7aecb - H263 PAR support by Alex Beregszaszi.
pulento
parents: 350
diff changeset
5165 /*
ac6fc4c7aecb - H263 PAR support by Alex Beregszaszi.
pulento
parents: 350
diff changeset
5166 0 forbidden
ac6fc4c7aecb - H263 PAR support by Alex Beregszaszi.
pulento
parents: 350
diff changeset
5167 1 sub-QCIF
ac6fc4c7aecb - H263 PAR support by Alex Beregszaszi.
pulento
parents: 350
diff changeset
5168 10 QCIF
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
5169 7 extended PTYPE (PLUSPTYPE)
355
ac6fc4c7aecb - H263 PAR support by Alex Beregszaszi.
pulento
parents: 350
diff changeset
5170 */
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
5171
161
7ce36cf13055 - Added support to Inter4V+Q MBs to H.263 decoder.
pulento
parents: 155
diff changeset
5172 if (format != 7 && format != 6) {
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
5173 s->h263_plus = 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
5174 /* H.263v1 */
986e461dc072 Initial revision
glantau
parents:
diff changeset
5175 width = h263_format[format][0];
986e461dc072 Initial revision
glantau
parents:
diff changeset
5176 height = h263_format[format][1];
986e461dc072 Initial revision
glantau
parents:
diff changeset
5177 if (!width)
986e461dc072 Initial revision
glantau
parents:
diff changeset
5178 return -1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
5179
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6211
diff changeset
5180 s->pict_type = FF_I_TYPE + get_bits1(&s->gb);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
5181
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
5182 s->h263_long_vectors = get_bits1(&s->gb);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
5183
355
ac6fc4c7aecb - H263 PAR support by Alex Beregszaszi.
pulento
parents: 350
diff changeset
5184 if (get_bits1(&s->gb) != 0) {
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1586
diff changeset
5185 av_log(s->avctx, AV_LOG_ERROR, "H263 SAC not supported\n");
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
5186 return -1; /* SAC: off */
355
ac6fc4c7aecb - H263 PAR support by Alex Beregszaszi.
pulento
parents: 350
diff changeset
5187 }
1633
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
5188 s->obmc= get_bits1(&s->gb); /* Advanced prediction mode */
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
5189 s->unrestricted_mv = s->h263_long_vectors || s->obmc;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
5190
9104
fd301ba2cbba Enable PB-frames decoding for H.263
kostya
parents: 9103
diff changeset
5191 s->pb_frame = get_bits1(&s->gb);
1644
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
5192 s->chroma_qscale= s->qscale = get_bits(&s->gb, 5);
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
5193 skip_bits1(&s->gb); /* Continuous Presence Multipoint mode: off */
1393
ba99a78bcb37 make the h263 decoder more error tolerant
michaelni
parents: 1390
diff changeset
5194
ba99a78bcb37 make the h263 decoder more error tolerant
michaelni
parents: 1390
diff changeset
5195 s->width = width;
ba99a78bcb37 make the h263 decoder more error tolerant
michaelni
parents: 1390
diff changeset
5196 s->height = height;
1865
92e94c550def h263 framerate & aspect ratio fixes
michael
parents: 1831
diff changeset
5197 s->avctx->sample_aspect_ratio= (AVRational){12,11};
2637
ef44d24680d1 switch to native time bases
michael
parents: 2632
diff changeset
5198 s->avctx->time_base= (AVRational){1001, 30000};
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
5199 } else {
161
7ce36cf13055 - Added support to Inter4V+Q MBs to H.263 decoder.
pulento
parents: 155
diff changeset
5200 int ufep;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
5201
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
5202 /* H.263v2 */
161
7ce36cf13055 - Added support to Inter4V+Q MBs to H.263 decoder.
pulento
parents: 155
diff changeset
5203 s->h263_plus = 1;
7ce36cf13055 - Added support to Inter4V+Q MBs to H.263 decoder.
pulento
parents: 155
diff changeset
5204 ufep = get_bits(&s->gb, 3); /* Update Full Extended PTYPE */
355
ac6fc4c7aecb - H263 PAR support by Alex Beregszaszi.
pulento
parents: 350
diff changeset
5205
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
5206 /* ufep other than 0 and 1 are reserved */
161
7ce36cf13055 - Added support to Inter4V+Q MBs to H.263 decoder.
pulento
parents: 155
diff changeset
5207 if (ufep == 1) {
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
5208 /* OPPTYPE */
161
7ce36cf13055 - Added support to Inter4V+Q MBs to H.263 decoder.
pulento
parents: 155
diff changeset
5209 format = get_bits(&s->gb, 3);
4652
6679d37a3338 Give context to dprintf
mbardiaux
parents: 4594
diff changeset
5210 dprintf(s->avctx, "ufep=1, format: %d\n", format);
1872
c13d3543c73a h263+ custom pcf support
michael
parents: 1865
diff changeset
5211 s->custom_pcf= get_bits1(&s->gb);
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5445
diff changeset
5212 s->umvplus = get_bits1(&s->gb); /* Unrestricted Motion Vector */
1644
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
5213 if (get_bits1(&s->gb) != 0) {
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
5214 av_log(s->avctx, AV_LOG_ERROR, "Syntax-based Arithmetic Coding (SAC) not supported\n");
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
5215 }
1633
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
5216 s->obmc= get_bits1(&s->gb); /* Advanced prediction mode */
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
5217 s->h263_aic = get_bits1(&s->gb); /* Advanced Intra Coding (AIC) */
1644
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
5218 s->loop_filter= get_bits1(&s->gb);
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
5219 s->unrestricted_mv = s->umvplus || s->obmc || s->loop_filter;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
5220
1661
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
5221 s->h263_slice_structured= get_bits1(&s->gb);
1278
483db104bb7b truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents: 1273
diff changeset
5222 if (get_bits1(&s->gb) != 0) {
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1586
diff changeset
5223 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
5224 }
483db104bb7b truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents: 1273
diff changeset
5225 if (get_bits1(&s->gb) != 0) {
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1586
diff changeset
5226 av_log(s->avctx, AV_LOG_ERROR, "Independent Segment Decoding not supported\n");
1278
483db104bb7b truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents: 1273
diff changeset
5227 }
1637
7799582dc9b8 h263 alternative inter vlc support
michael
parents: 1633
diff changeset
5228 s->alt_inter_vlc= get_bits1(&s->gb);
1639
3e2b774edce4 rv20 decoder
michael
parents: 1637
diff changeset
5229 s->modified_quant= get_bits1(&s->gb);
1644
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
5230 if(s->modified_quant)
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
5231 s->chroma_qscale_table= ff_h263_chroma_qscale_table;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
5232
1278
483db104bb7b truncated h263 decoding support / H263-ES "demuxer"
michaelni
parents: 1273
diff changeset
5233 skip_bits(&s->gb, 1); /* Prevent start code emulation */
355
ac6fc4c7aecb - H263 PAR support by Alex Beregszaszi.
pulento
parents: 350
diff changeset
5234
161
7ce36cf13055 - Added support to Inter4V+Q MBs to H.263 decoder.
pulento
parents: 155
diff changeset
5235 skip_bits(&s->gb, 3); /* Reserved */
355
ac6fc4c7aecb - H263 PAR support by Alex Beregszaszi.
pulento
parents: 350
diff changeset
5236 } else if (ufep != 0) {
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1586
diff changeset
5237 av_log(s->avctx, AV_LOG_ERROR, "Bad UFEP type (%d)\n", ufep);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
5238 return -1;
355
ac6fc4c7aecb - H263 PAR support by Alex Beregszaszi.
pulento
parents: 350
diff changeset
5239 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
5240
78
92ed1c4f94fa Added support to Unrestricted Motion Vectors (UMV)
pulento
parents: 70
diff changeset
5241 /* MPPTYPE */
1655
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
5242 s->pict_type = get_bits(&s->gb, 3);
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
5243 switch(s->pict_type){
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6211
diff changeset
5244 case 0: s->pict_type= FF_I_TYPE;break;
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6211
diff changeset
5245 case 1: s->pict_type= FF_P_TYPE;break;
9104
fd301ba2cbba Enable PB-frames decoding for H.263
kostya
parents: 9103
diff changeset
5246 case 2: s->pict_type= FF_P_TYPE;s->pb_frame = 3;break;
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6211
diff changeset
5247 case 3: s->pict_type= FF_B_TYPE;break;
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6211
diff changeset
5248 case 7: s->pict_type= FF_I_TYPE;break; //ZYGO
1655
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
5249 default:
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
5250 return -1;
1655
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
5251 }
250
3449316664b5 - Bug fix on RTYPE (rounding type) not being honoured by H.263+ decoder.
pulento
parents: 249
diff changeset
5252 skip_bits(&s->gb, 2);
3449316664b5 - Bug fix on RTYPE (rounding type) not being honoured by H.263+ decoder.
pulento
parents: 249
diff changeset
5253 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
5254 skip_bits(&s->gb, 4);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
5255
78
92ed1c4f94fa Added support to Unrestricted Motion Vectors (UMV)
pulento
parents: 70
diff changeset
5256 /* Get the picture dimensions */
161
7ce36cf13055 - Added support to Inter4V+Q MBs to H.263 decoder.
pulento
parents: 155
diff changeset
5257 if (ufep) {
7ce36cf13055 - Added support to Inter4V+Q MBs to H.263 decoder.
pulento
parents: 155
diff changeset
5258 if (format == 6) {
7ce36cf13055 - Added support to Inter4V+Q MBs to H.263 decoder.
pulento
parents: 155
diff changeset
5259 /* Custom Picture Format (CPFMT) */
355
ac6fc4c7aecb - H263 PAR support by Alex Beregszaszi.
pulento
parents: 350
diff changeset
5260 s->aspect_ratio_info = get_bits(&s->gb, 4);
4652
6679d37a3338 Give context to dprintf
mbardiaux
parents: 4594
diff changeset
5261 dprintf(s->avctx, "aspect: %d\n", s->aspect_ratio_info);
355
ac6fc4c7aecb - H263 PAR support by Alex Beregszaszi.
pulento
parents: 350
diff changeset
5262 /* aspect ratios:
ac6fc4c7aecb - H263 PAR support by Alex Beregszaszi.
pulento
parents: 350
diff changeset
5263 0 - forbidden
ac6fc4c7aecb - H263 PAR support by Alex Beregszaszi.
pulento
parents: 350
diff changeset
5264 1 - 1:1
ac6fc4c7aecb - H263 PAR support by Alex Beregszaszi.
pulento
parents: 350
diff changeset
5265 2 - 12:11 (CIF 4:3)
ac6fc4c7aecb - H263 PAR support by Alex Beregszaszi.
pulento
parents: 350
diff changeset
5266 3 - 10:11 (525-type 4:3)
ac6fc4c7aecb - H263 PAR support by Alex Beregszaszi.
pulento
parents: 350
diff changeset
5267 4 - 16:11 (CIF 16:9)
ac6fc4c7aecb - H263 PAR support by Alex Beregszaszi.
pulento
parents: 350
diff changeset
5268 5 - 40:33 (525-type 16:9)
ac6fc4c7aecb - H263 PAR support by Alex Beregszaszi.
pulento
parents: 350
diff changeset
5269 6-14 - reserved
ac6fc4c7aecb - H263 PAR support by Alex Beregszaszi.
pulento
parents: 350
diff changeset
5270 */
161
7ce36cf13055 - Added support to Inter4V+Q MBs to H.263 decoder.
pulento
parents: 155
diff changeset
5271 width = (get_bits(&s->gb, 9) + 1) * 4;
7ce36cf13055 - Added support to Inter4V+Q MBs to H.263 decoder.
pulento
parents: 155
diff changeset
5272 skip_bits1(&s->gb);
7ce36cf13055 - Added support to Inter4V+Q MBs to H.263 decoder.
pulento
parents: 155
diff changeset
5273 height = get_bits(&s->gb, 9) * 4;
4652
6679d37a3338 Give context to dprintf
mbardiaux
parents: 4594
diff changeset
5274 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
5275 if (s->aspect_ratio_info == FF_ASPECT_EXTENDED) {
355
ac6fc4c7aecb - H263 PAR support by Alex Beregszaszi.
pulento
parents: 350
diff changeset
5276 /* aspected dimensions */
1548
dd544554ed42 AVRational
michael
parents: 1542
diff changeset
5277 s->avctx->sample_aspect_ratio.num= get_bits(&s->gb, 8);
dd544554ed42 AVRational
michael
parents: 1542
diff changeset
5278 s->avctx->sample_aspect_ratio.den= get_bits(&s->gb, 8);
887
19f5b8b7c6d5 fixing aspect
michaelni
parents: 880
diff changeset
5279 }else{
1548
dd544554ed42 AVRational
michael
parents: 1542
diff changeset
5280 s->avctx->sample_aspect_ratio= pixel_aspect[s->aspect_ratio_info];
355
ac6fc4c7aecb - H263 PAR support by Alex Beregszaszi.
pulento
parents: 350
diff changeset
5281 }
ac6fc4c7aecb - H263 PAR support by Alex Beregszaszi.
pulento
parents: 350
diff changeset
5282 } else {
161
7ce36cf13055 - Added support to Inter4V+Q MBs to H.263 decoder.
pulento
parents: 155
diff changeset
5283 width = h263_format[format][0];
7ce36cf13055 - Added support to Inter4V+Q MBs to H.263 decoder.
pulento
parents: 155
diff changeset
5284 height = h263_format[format][1];
1865
92e94c550def h263 framerate & aspect ratio fixes
michael
parents: 1831
diff changeset
5285 s->avctx->sample_aspect_ratio= (AVRational){12,11};
161
7ce36cf13055 - Added support to Inter4V+Q MBs to H.263 decoder.
pulento
parents: 155
diff changeset
5286 }
7ce36cf13055 - Added support to Inter4V+Q MBs to H.263 decoder.
pulento
parents: 155
diff changeset
5287 if ((width == 0) || (height == 0))
7ce36cf13055 - Added support to Inter4V+Q MBs to H.263 decoder.
pulento
parents: 155
diff changeset
5288 return -1;
7ce36cf13055 - Added support to Inter4V+Q MBs to H.263 decoder.
pulento
parents: 155
diff changeset
5289 s->width = width;
7ce36cf13055 - Added support to Inter4V+Q MBs to H.263 decoder.
pulento
parents: 155
diff changeset
5290 s->height = height;
1872
c13d3543c73a h263+ custom pcf support
michael
parents: 1865
diff changeset
5291
c13d3543c73a h263+ custom pcf support
michael
parents: 1865
diff changeset
5292 if(s->custom_pcf){
c13d3543c73a h263+ custom pcf support
michael
parents: 1865
diff changeset
5293 int gcd;
2637
ef44d24680d1 switch to native time bases
michael
parents: 2632
diff changeset
5294 s->avctx->time_base.den= 1800000;
ef44d24680d1 switch to native time bases
michael
parents: 2632
diff changeset
5295 s->avctx->time_base.num= 1000 + get_bits1(&s->gb);
ef44d24680d1 switch to native time bases
michael
parents: 2632
diff changeset
5296 s->avctx->time_base.num*= get_bits(&s->gb, 7);
ef44d24680d1 switch to native time bases
michael
parents: 2632
diff changeset
5297 if(s->avctx->time_base.num == 0){
1872
c13d3543c73a h263+ custom pcf support
michael
parents: 1865
diff changeset
5298 av_log(s, AV_LOG_ERROR, "zero framerate\n");
c13d3543c73a h263+ custom pcf support
michael
parents: 1865
diff changeset
5299 return -1;
c13d3543c73a h263+ custom pcf support
michael
parents: 1865
diff changeset
5300 }
8611
a637db9f59b1 export gcd function as av_gcd()
aurel
parents: 8596
diff changeset
5301 gcd= av_gcd(s->avctx->time_base.den, s->avctx->time_base.num);
2637
ef44d24680d1 switch to native time bases
michael
parents: 2632
diff changeset
5302 s->avctx->time_base.den /= gcd;
ef44d24680d1 switch to native time bases
michael
parents: 2632
diff changeset
5303 s->avctx->time_base.num /= gcd;
1872
c13d3543c73a h263+ custom pcf support
michael
parents: 1865
diff changeset
5304 }else{
2637
ef44d24680d1 switch to native time bases
michael
parents: 2632
diff changeset
5305 s->avctx->time_base= (AVRational){1001, 30000};
1872
c13d3543c73a h263+ custom pcf support
michael
parents: 1865
diff changeset
5306 }
c13d3543c73a h263+ custom pcf support
michael
parents: 1865
diff changeset
5307 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
5308
1872
c13d3543c73a h263+ custom pcf support
michael
parents: 1865
diff changeset
5309 if(s->custom_pcf){
c13d3543c73a h263+ custom pcf support
michael
parents: 1865
diff changeset
5310 skip_bits(&s->gb, 2); //extended Temporal reference
c13d3543c73a h263+ custom pcf support
michael
parents: 1865
diff changeset
5311 }
c13d3543c73a h263+ custom pcf support
michael
parents: 1865
diff changeset
5312
c13d3543c73a h263+ custom pcf support
michael
parents: 1865
diff changeset
5313 if (ufep) {
1089
7e79a58954b1 h263(+) clenaup & bugfixes
michaelni
parents: 1070
diff changeset
5314 if (s->umvplus) {
7e79a58954b1 h263(+) clenaup & bugfixes
michaelni
parents: 1070
diff changeset
5315 if(get_bits1(&s->gb)==0) /* Unlimited Unrestricted Motion Vectors Indicator (UUI) */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
5316 skip_bits1(&s->gb);
161
7ce36cf13055 - Added support to Inter4V+Q MBs to H.263 decoder.
pulento
parents: 155
diff changeset
5317 }
1661
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
5318 if(s->h263_slice_structured){
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
5319 if (get_bits1(&s->gb) != 0) {
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
5320 av_log(s->avctx, AV_LOG_ERROR, "rectangular slices not supported\n");
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
5321 }
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
5322 if (get_bits1(&s->gb) != 0) {
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
5323 av_log(s->avctx, AV_LOG_ERROR, "unordered slices not supported\n");
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
5324 }
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
5325 }
78
92ed1c4f94fa Added support to Unrestricted Motion Vectors (UMV)
pulento
parents: 70
diff changeset
5326 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
5327
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
5328 s->qscale = get_bits(&s->gb, 5);
986e461dc072 Initial revision
glantau
parents:
diff changeset
5329 }
1670
d6f2520c0c43 slice structured fixes
michael
parents: 1668
diff changeset
5330
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
5331 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
5332 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
5333 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
5334
9104
fd301ba2cbba Enable PB-frames decoding for H.263
kostya
parents: 9103
diff changeset
5335 if (s->pb_frame) {
fd301ba2cbba Enable PB-frames decoding for H.263
kostya
parents: 9103
diff changeset
5336 skip_bits(&s->gb, 3); /* Temporal reference for B-pictures */
fd301ba2cbba Enable PB-frames decoding for H.263
kostya
parents: 9103
diff changeset
5337 if (s->custom_pcf)
fd301ba2cbba Enable PB-frames decoding for H.263
kostya
parents: 9103
diff changeset
5338 skip_bits(&s->gb, 2); //extended Temporal reference
fd301ba2cbba Enable PB-frames decoding for H.263
kostya
parents: 9103
diff changeset
5339 skip_bits(&s->gb, 2); /* Quantization information for B-pictures */
fd301ba2cbba Enable PB-frames decoding for H.263
kostya
parents: 9103
diff changeset
5340 }
fd301ba2cbba Enable PB-frames decoding for H.263
kostya
parents: 9103
diff changeset
5341
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
5342 /* PEI */
21
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 7
diff changeset
5343 while (get_bits1(&s->gb) != 0) {
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 7
diff changeset
5344 skip_bits(&s->gb, 8);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
5345 }
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
5346
1670
d6f2520c0c43 slice structured fixes
michael
parents: 1668
diff changeset
5347 if(s->h263_slice_structured){
d6f2520c0c43 slice structured fixes
michael
parents: 1668
diff changeset
5348 if (get_bits1(&s->gb) != 1) {
d6f2520c0c43 slice structured fixes
michael
parents: 1668
diff changeset
5349 av_log(s->avctx, AV_LOG_ERROR, "SEPB1 marker missing\n");
d6f2520c0c43 slice structured fixes
michael
parents: 1668
diff changeset
5350 return -1;
d6f2520c0c43 slice structured fixes
michael
parents: 1668
diff changeset
5351 }
d6f2520c0c43 slice structured fixes
michael
parents: 1668
diff changeset
5352
d6f2520c0c43 slice structured fixes
michael
parents: 1668
diff changeset
5353 ff_h263_decode_mba(s);
d6f2520c0c43 slice structured fixes
michael
parents: 1668
diff changeset
5354
d6f2520c0c43 slice structured fixes
michael
parents: 1668
diff changeset
5355 if (get_bits1(&s->gb) != 1) {
d6f2520c0c43 slice structured fixes
michael
parents: 1668
diff changeset
5356 av_log(s->avctx, AV_LOG_ERROR, "SEPB2 marker missing\n");
d6f2520c0c43 slice structured fixes
michael
parents: 1668
diff changeset
5357 return -1;
d6f2520c0c43 slice structured fixes
michael
parents: 1668
diff changeset
5358 }
d6f2520c0c43 slice structured fixes
michael
parents: 1668
diff changeset
5359 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
5360 s->f_code = 1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
5361
498
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 482
diff changeset
5362 if(s->h263_aic){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
5363 s->y_dc_scale_table=
1639
3e2b774edce4 rv20 decoder
michael
parents: 1637
diff changeset
5364 s->c_dc_scale_table= ff_aic_dc_scale_table;
498
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 482
diff changeset
5365 }else{
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 482
diff changeset
5366 s->y_dc_scale_table=
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 482
diff changeset
5367 s->c_dc_scale_table= ff_mpeg1_dc_scale_table;
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 482
diff changeset
5368 }
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 482
diff changeset
5369
10791
48adb5a1b47b Split out intel H263 decoder.
michael
parents: 10788
diff changeset
5370 ff_h263_show_pict_info(s);
8612
b20c590170cc remove ff_get_fourcc() and use AV_RL32() instead
aurel
parents: 8611
diff changeset
5371 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
5372 int i,j;
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1586
diff changeset
5373 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
5374 av_log(s->avctx, AV_LOG_DEBUG, "\n");
1584
3615999a7284 dumping funny numbers from first zygo i frame header
michael
parents: 1583
diff changeset
5375 for(i=0; i<13; i++){
3615999a7284 dumping funny numbers from first zygo i frame header
michael
parents: 1583
diff changeset
5376 for(j=0; j<3; j++){
3615999a7284 dumping funny numbers from first zygo i frame header
michael
parents: 1583
diff changeset
5377 int v= get_bits(&s->gb, 8);
3615999a7284 dumping funny numbers from first zygo i frame header
michael
parents: 1583
diff changeset
5378 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
5379 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
5380 }
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1586
diff changeset
5381 av_log(s->avctx, AV_LOG_DEBUG, "\n");
1584
3615999a7284 dumping funny numbers from first zygo i frame header
michael
parents: 1583
diff changeset
5382 }
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1586
diff changeset
5383 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
5384 }
3615999a7284 dumping funny numbers from first zygo i frame header
michael
parents: 1583
diff changeset
5385
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
5386 return 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
5387 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
5388
942
c237f5db1c22 correcter mpeg4 headers
michaelni
parents: 936
diff changeset
5389 static int mpeg4_decode_gop_header(MpegEncContext * s, GetBitContext *gb){
c237f5db1c22 correcter mpeg4 headers
michaelni
parents: 936
diff changeset
5390 int hours, minutes, seconds;
c237f5db1c22 correcter mpeg4 headers
michaelni
parents: 936
diff changeset
5391
c237f5db1c22 correcter mpeg4 headers
michaelni
parents: 936
diff changeset
5392 hours= get_bits(gb, 5);
c237f5db1c22 correcter mpeg4 headers
michaelni
parents: 936
diff changeset
5393 minutes= get_bits(gb, 6);
c237f5db1c22 correcter mpeg4 headers
michaelni
parents: 936
diff changeset
5394 skip_bits1(gb);
c237f5db1c22 correcter mpeg4 headers
michaelni
parents: 936
diff changeset
5395 seconds= get_bits(gb, 6);
c237f5db1c22 correcter mpeg4 headers
michaelni
parents: 936
diff changeset
5396
c237f5db1c22 correcter mpeg4 headers
michaelni
parents: 936
diff changeset
5397 s->time_base= seconds + 60*(minutes + 60*hours);
c237f5db1c22 correcter mpeg4 headers
michaelni
parents: 936
diff changeset
5398
c237f5db1c22 correcter mpeg4 headers
michaelni
parents: 936
diff changeset
5399 skip_bits1(gb);
c237f5db1c22 correcter mpeg4 headers
michaelni
parents: 936
diff changeset
5400 skip_bits1(gb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
5401
942
c237f5db1c22 correcter mpeg4 headers
michaelni
parents: 936
diff changeset
5402 return 0;
c237f5db1c22 correcter mpeg4 headers
michaelni
parents: 936
diff changeset
5403 }
c237f5db1c22 correcter mpeg4 headers
michaelni
parents: 936
diff changeset
5404
747
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5405 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
5406 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
5407
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5408 /* vol header */
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5409 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
5410 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
5411 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
5412 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
5413 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
5414 } else {
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5415 vo_ver_id = 1;
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5416 }
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5417 s->aspect_ratio_info= get_bits(gb, 4);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
5418 if(s->aspect_ratio_info == FF_ASPECT_EXTENDED){
1548
dd544554ed42 AVRational
michael
parents: 1542
diff changeset
5419 s->avctx->sample_aspect_ratio.num= get_bits(gb, 8); // par_width
dd544554ed42 AVRational
michael
parents: 1542
diff changeset
5420 s->avctx->sample_aspect_ratio.den= get_bits(gb, 8); // par_height
887
19f5b8b7c6d5 fixing aspect
michaelni
parents: 880
diff changeset
5421 }else{
1548
dd544554ed42 AVRational
michael
parents: 1542
diff changeset
5422 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
5423 }
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5424
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5425 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
5426 int chroma_format= get_bits(gb, 2);
8690
6c220a238087 Use a constant instead of a magic number.
benoit
parents: 8644
diff changeset
5427 if(chroma_format!=CHROMA_420){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1586
diff changeset
5428 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
5429 }
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5430 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
5431 if(get_bits1(gb)){ /* vbv parameters */
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
5432 get_bits(gb, 15); /* first_half_bitrate */
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
5433 skip_bits1(gb); /* marker */
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
5434 get_bits(gb, 15); /* latter_half_bitrate */
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
5435 skip_bits1(gb); /* marker */
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
5436 get_bits(gb, 15); /* first_half_vbv_buffer_size */
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
5437 skip_bits1(gb); /* marker */
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
5438 get_bits(gb, 3); /* latter_half_vbv_buffer_size */
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
5439 get_bits(gb, 11); /* first_half_vbv_occupancy */
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
5440 skip_bits1(gb); /* marker */
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
5441 get_bits(gb, 15); /* latter_half_vbv_occupancy */
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
5442 skip_bits1(gb); /* marker */
747
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5443 }
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5444 }else{
2646
c735e3e60ca7 Even More spelling errors. patch by (Kevin Baragona <kevinmb500 gawab com)
michael
parents: 2639
diff changeset
5445 // 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
5446 if(s->picture_number==0)
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5447 s->low_delay=0;
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5448 }
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5449
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5450 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
5451 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
5452 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
5453 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
5454 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
5455 }
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5456
1411
c2e63cb94d06 custom quant matrix encoding support
michaelni
parents: 1396
diff changeset
5457 check_marker(gb, "before time_increment_resolution");
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
5458
2637
ef44d24680d1 switch to native time bases
michael
parents: 2632
diff changeset
5459 s->avctx->time_base.den = get_bits(gb, 16);
2812
18b231c1cb3d check time_base.den for mpeg4
michael
parents: 2805
diff changeset
5460 if(!s->avctx->time_base.den){
18b231c1cb3d check time_base.den for mpeg4
michael
parents: 2805
diff changeset
5461 av_log(s->avctx, AV_LOG_ERROR, "time_base.den==0\n");
18b231c1cb3d check time_base.den for mpeg4
michael
parents: 2805
diff changeset
5462 return -1;
18b231c1cb3d check time_base.den for mpeg4
michael
parents: 2805
diff changeset
5463 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
5464
2637
ef44d24680d1 switch to native time bases
michael
parents: 2632
diff changeset
5465 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
5466 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
5467 s->time_increment_bits = 1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
5468
1411
c2e63cb94d06 custom quant matrix encoding support
michaelni
parents: 1396
diff changeset
5469 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
5470
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5471 if (get_bits1(gb) != 0) { /* fixed_vop_rate */
2637
ef44d24680d1 switch to native time bases
michael
parents: 2632
diff changeset
5472 s->avctx->time_base.num = get_bits(gb, s->time_increment_bits);
ef44d24680d1 switch to native time bases
michael
parents: 2632
diff changeset
5473 }else
ef44d24680d1 switch to native time bases
michael
parents: 2632
diff changeset
5474 s->avctx->time_base.num = 1;
ef44d24680d1 switch to native time bases
michael
parents: 2632
diff changeset
5475
2034
9629c1180d5f 10l (interlaced b frame decoding fix)
michael
parents: 2017
diff changeset
5476 s->t_frame=0;
747
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5477
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5478 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
5479 if (s->shape == RECT_SHAPE) {
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5480 skip_bits1(gb); /* marker */
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5481 width = get_bits(gb, 13);
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5482 skip_bits1(gb); /* marker */
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5483 height = get_bits(gb, 13);
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5484 skip_bits1(gb); /* marker */
8612
b20c590170cc remove ff_get_fourcc() and use AV_RL32() instead
aurel
parents: 8611
diff changeset
5485 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
5486 s->width = width;
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5487 s->height = height;
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5488 }
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5489 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
5490
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
5491 s->progressive_sequence=
1659
3075fc11a974 AVFrame.interlaced_frame fixes
michael
parents: 1656
diff changeset
5492 s->progressive_frame= get_bits1(gb)^1;
3192
01d00733caee reset interlaced_dct flag
michael
parents: 3182
diff changeset
5493 s->interlaced_dct=0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
5494 if(!get_bits1(gb) && (s->avctx->debug & FF_DEBUG_PICT_INFO))
1644
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
5495 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
5496 if (vo_ver_id == 1) {
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5497 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
5498 } else {
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5499 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
5500 }
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1586
diff changeset
5501 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
5502 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
5503 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
5504 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
5505 skip_bits1(gb); /* marker */
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5506 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
5507 skip_bits1(gb); /* marker */
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5508 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
5509 skip_bits1(gb); /* marker */
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5510 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
5511 skip_bits1(gb); /* marker */
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5512 }
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5513 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
5514 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
5515 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
5516 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
5517 return -1;
655d25351bfc fix possibly exploitable stack overflow with num_sprite_warping_points (found by reimar)
michael
parents: 4672
diff changeset
5518 }
747
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5519 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
5520 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
5521 if(s->vol_sprite_usage==STATIC_SPRITE)
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
5522 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
5523 }
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5524 // FIXME sadct disable bit if verid!=1 && shape not rect
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
5525
747
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5526 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
5527 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
5528 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
5529 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
5530 } else {
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5531 s->quant_precision = 5;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
5532 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
5533
747
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5534 // 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
5535
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5536 if((s->mpeg_quant=get_bits1(gb))){ /* vol_quant_type */
1057
bb5de8a59da8 * static,const,compiler warning cleanup
kabi
parents: 1053
diff changeset
5537 int i, v;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
5538
747
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5539 /* load default matrixes */
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5540 for(i=0; i<64; i++){
1092
f59c3f66363b MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
michaelni
parents: 1090
diff changeset
5541 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
5542 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
5543 s->intra_matrix[j]= v;
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5544 s->chroma_intra_matrix[j]= v;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
5545
747
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5546 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
5547 s->inter_matrix[j]= v;
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5548 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
5549 }
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5550
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5551 /* load custom intra matrix */
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5552 if(get_bits1(gb)){
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5553 int last=0;
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
5554 for(i=0; i<64; i++){
1057
bb5de8a59da8 * static,const,compiler warning cleanup
kabi
parents: 1053
diff changeset
5555 int j;
747
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5556 v= get_bits(gb, 8);
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5557 if(v==0) break;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
5558
747
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5559 last= v;
1092
f59c3f66363b MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
michaelni
parents: 1090
diff changeset
5560 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
5561 s->intra_matrix[j]= v;
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5562 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
5563 }
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5564
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5565 /* replicate last value */
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5566 for(; i<64; i++){
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
5567 int j= s->dsp.idct_permutation[ ff_zigzag_direct[i] ];
1411
c2e63cb94d06 custom quant matrix encoding support
michaelni
parents: 1396
diff changeset
5568 s->intra_matrix[j]= last;
c2e63cb94d06 custom quant matrix encoding support
michaelni
parents: 1396
diff changeset
5569 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
5570 }
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5571 }
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5572
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5573 /* load custom non intra matrix */
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5574 if(get_bits1(gb)){
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5575 int last=0;
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
5576 for(i=0; i<64; i++){
1057
bb5de8a59da8 * static,const,compiler warning cleanup
kabi
parents: 1053
diff changeset
5577 int j;
747
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5578 v= get_bits(gb, 8);
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5579 if(v==0) break;
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5580
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5581 last= v;
1092
f59c3f66363b MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
michaelni
parents: 1090
diff changeset
5582 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
5583 s->inter_matrix[j]= v;
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5584 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
5585 }
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 /* replicate last value */
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5588 for(; i<64; i++){
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
5589 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
5590 s->inter_matrix[j]= last;
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5591 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
5592 }
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5593 }
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5594
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5595 // 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
5596 }
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5597
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5598 if(vo_ver_id != 1)
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5599 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
5600 else s->quarter_sample=0;
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5601
8251
d256dbf74ea6 Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents: 8106
diff changeset
5602 if(!get_bits1(gb)){
d256dbf74ea6 Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents: 8106
diff changeset
5603 int pos= get_bits_count(gb);
d256dbf74ea6 Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents: 8106
diff changeset
5604 int estimation_method= get_bits(gb, 2);
d256dbf74ea6 Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents: 8106
diff changeset
5605 if(estimation_method<2){
d256dbf74ea6 Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents: 8106
diff changeset
5606 if(!get_bits1(gb)){
d256dbf74ea6 Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents: 8106
diff changeset
5607 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
5608 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
5609 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
5610 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
5611 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
5612 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
5613 }
d256dbf74ea6 Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents: 8106
diff changeset
5614 if(!get_bits1(gb)){
d256dbf74ea6 Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents: 8106
diff changeset
5615 s->cplx_estimation_trash_i += 8*get_bits1(gb); //intra_blocks
d256dbf74ea6 Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents: 8106
diff changeset
5616 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
5617 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
5618 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
5619 }
d256dbf74ea6 Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents: 8106
diff changeset
5620 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
5621 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
5622 goto no_cplx_est;
d256dbf74ea6 Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents: 8106
diff changeset
5623 }
d256dbf74ea6 Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents: 8106
diff changeset
5624 if(!get_bits1(gb)){
d256dbf74ea6 Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents: 8106
diff changeset
5625 s->cplx_estimation_trash_i += 8*get_bits1(gb); //dct_coeffs
d256dbf74ea6 Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents: 8106
diff changeset
5626 s->cplx_estimation_trash_i += 8*get_bits1(gb); //dct_lines
d256dbf74ea6 Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents: 8106
diff changeset
5627 s->cplx_estimation_trash_i += 8*get_bits1(gb); //vlc_syms
d256dbf74ea6 Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents: 8106
diff changeset
5628 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
5629 }
d256dbf74ea6 Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents: 8106
diff changeset
5630 if(!get_bits1(gb)){
d256dbf74ea6 Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents: 8106
diff changeset
5631 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
5632 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
5633 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
5634 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
5635 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
5636 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
5637 }
d256dbf74ea6 Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents: 8106
diff changeset
5638 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
5639 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
5640 goto no_cplx_est;
d256dbf74ea6 Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents: 8106
diff changeset
5641 }
d256dbf74ea6 Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents: 8106
diff changeset
5642 if(estimation_method==1){
d256dbf74ea6 Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents: 8106
diff changeset
5643 s->cplx_estimation_trash_i += 8*get_bits1(gb); //sadct
d256dbf74ea6 Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents: 8106
diff changeset
5644 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
5645 }
d256dbf74ea6 Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents: 8106
diff changeset
5646 }else
d256dbf74ea6 Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents: 8106
diff changeset
5647 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
5648 }else{
d256dbf74ea6 Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents: 8106
diff changeset
5649 no_cplx_est:
d256dbf74ea6 Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents: 8106
diff changeset
5650 s->cplx_estimation_trash_i=
d256dbf74ea6 Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents: 8106
diff changeset
5651 s->cplx_estimation_trash_p=
d256dbf74ea6 Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents: 8106
diff changeset
5652 s->cplx_estimation_trash_b= 0;
d256dbf74ea6 Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents: 8106
diff changeset
5653 }
747
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5654
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5655 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
5656
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5657 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
5658 if(s->data_partitioning){
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5659 s->rvlc= get_bits1(gb);
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5660 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
5661
747
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5662 if(vo_ver_id != 1) {
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5663 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
5664 if(s->new_pred){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1586
diff changeset
5665 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
5666 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
5667 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
5668 }
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5669 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
5670 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
5671 }
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5672 else{
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5673 s->new_pred=0;
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5674 s->reduced_res_vop= 0;
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5675 }
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5676
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5677 s->scalability= get_bits1(gb);
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5678
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5679 if (s->scalability) {
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5680 GetBitContext bak= *gb;
751
cbe316f082bc warning fixes
michaelni
parents: 747
diff changeset
5681 int ref_layer_id;
cbe316f082bc warning fixes
michaelni
parents: 747
diff changeset
5682 int ref_layer_sampling_dir;
cbe316f082bc warning fixes
michaelni
parents: 747
diff changeset
5683 int h_sampling_factor_n;
cbe316f082bc warning fixes
michaelni
parents: 747
diff changeset
5684 int h_sampling_factor_m;
cbe316f082bc warning fixes
michaelni
parents: 747
diff changeset
5685 int v_sampling_factor_n;
cbe316f082bc warning fixes
michaelni
parents: 747
diff changeset
5686 int v_sampling_factor_m;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
5687
751
cbe316f082bc warning fixes
michaelni
parents: 747
diff changeset
5688 s->hierachy_type= get_bits1(gb);
cbe316f082bc warning fixes
michaelni
parents: 747
diff changeset
5689 ref_layer_id= get_bits(gb, 4);
cbe316f082bc warning fixes
michaelni
parents: 747
diff changeset
5690 ref_layer_sampling_dir= get_bits1(gb);
cbe316f082bc warning fixes
michaelni
parents: 747
diff changeset
5691 h_sampling_factor_n= get_bits(gb, 5);
cbe316f082bc warning fixes
michaelni
parents: 747
diff changeset
5692 h_sampling_factor_m= get_bits(gb, 5);
cbe316f082bc warning fixes
michaelni
parents: 747
diff changeset
5693 v_sampling_factor_n= get_bits(gb, 5);
cbe316f082bc warning fixes
michaelni
parents: 747
diff changeset
5694 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
5695 s->enhancement_type= get_bits1(gb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
5696
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
5697 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
5698 || v_sampling_factor_n==0 || v_sampling_factor_m==0){
10775
35e175942ee2 Add a few explanatory comments to cornercase workarounds.
diego
parents: 10759
diff changeset
5699 /* illegal scalability header (VERY broken encoder),
35e175942ee2 Add a few explanatory comments to cornercase workarounds.
diego
parents: 10759
diff changeset
5700 * trying to workaround */
747
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5701 s->scalability=0;
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5702 *gb= bak;
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5703 }else
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1586
diff changeset
5704 av_log(s->avctx, AV_LOG_ERROR, "scalability not supported\n");
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
5705
747
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5706 // bin shape stuff FIXME
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 }
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5709 return 0;
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5710 }
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5711
1034
af7ba8d8b43a feeding doxygen
michaelni
parents: 1025
diff changeset
5712 /**
af7ba8d8b43a feeding doxygen
michaelni
parents: 1025
diff changeset
5713 * decodes the user data stuff in the header.
6918
c1b722b79649 cosmetics: spelling typo fixes
diego
parents: 6908
diff changeset
5714 * Also initializes divx/xvid/lavc_version/build.
1034
af7ba8d8b43a feeding doxygen
michaelni
parents: 1025
diff changeset
5715 */
747
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5716 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
5717 char buf[256];
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5718 int i;
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5719 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
5720 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
5721 char last;
747
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5722
3615
7963ceb93083 fix non ALT bitstream reader
michael
parents: 3295
diff changeset
5723 for(i=0; i<255 && get_bits_count(gb) < gb->size_in_bits; i++){
2804
dc616c8ef3e6 minor user data reading bugfix
michael
parents: 2764
diff changeset
5724 if(show_bits(gb, 23) == 0) break;
dc616c8ef3e6 minor user data reading bugfix
michael
parents: 2764
diff changeset
5725 buf[i]= get_bits(gb, 8);
dc616c8ef3e6 minor user data reading bugfix
michael
parents: 2764
diff changeset
5726 }
dc616c8ef3e6 minor user data reading bugfix
michael
parents: 2764
diff changeset
5727 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
5728
761
7f4cc2f6d642 xvid qpel bug autodetect
michaelni
parents: 757
diff changeset
5729 /* 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
5730 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
5731 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
5732 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
5733 if(e>=2){
747
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5734 s->divx_version= ver;
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5735 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
5736 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
5737 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
5738 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
5739 s->showed_packed_warning=1;
2f5101a67500 Only warn about "Invalid and inefficient vfw-avi packed B frames" once.
andoma
parents: 8042
diff changeset
5740 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
5741 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
5742
761
7f4cc2f6d642 xvid qpel bug autodetect
michaelni
parents: 757
diff changeset
5743 /* ffmpeg detection */
2805
55a6659fc2ee fix user data parsing code so it suppors pre1 and cvs
michael
parents: 2804
diff changeset
5744 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
5745 if(e!=4)
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
5746 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
5747 if(e!=4){
2814
48fb350b0ec9 A.B.C versions
michael
parents: 2813
diff changeset
5748 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
5749 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
5750 build= (ver<<16) + (ver2<<8) + ver3;
2814
48fb350b0ec9 A.B.C versions
michael
parents: 2813
diff changeset
5751 }
48fb350b0ec9 A.B.C versions
michael
parents: 2813
diff changeset
5752 if(e!=4){
747
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5753 if(strcmp(buf, "ffmpeg")==0){
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5754 s->lavc_build= 4600;
63
8e2d8dbf89a5 better vol header parsing for mpeg4
glantau
parents: 21
diff changeset
5755 }
747
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5756 }
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5757 if(e==4){
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5758 s->lavc_build= build;
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5759 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
5760
6908
25dcd46b8160 cosmetics: XviD is now called Xvid.
diego
parents: 6893
diff changeset
5761 /* Xvid detection */
761
7f4cc2f6d642 xvid qpel bug autodetect
michaelni
parents: 757
diff changeset
5762 e=sscanf(buf, "XviD%d", &build);
7f4cc2f6d642 xvid qpel bug autodetect
michaelni
parents: 757
diff changeset
5763 if(e==1){
7f4cc2f6d642 xvid qpel bug autodetect
michaelni
parents: 757
diff changeset
5764 s->xvid_build= build;
7f4cc2f6d642 xvid qpel bug autodetect
michaelni
parents: 757
diff changeset
5765 }
7f4cc2f6d642 xvid qpel bug autodetect
michaelni
parents: 757
diff changeset
5766
747
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5767 return 0;
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5768 }
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5769
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5770 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
5771 int time_incr, time_increment;
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5772
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6211
diff changeset
5773 s->pict_type = get_bits(gb, 2) + FF_I_TYPE; /* pict type: I = 0 , P = 1 */
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6211
diff changeset
5774 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
5775 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
5776 s->low_delay=0;
fdeec2834c79 there are divx5? encoded files without a userdata section but with b-frames :(
michaelni
parents: 364
diff changeset
5777 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
5778
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6211
diff changeset
5779 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
5780 if(s->partitioned_frame)
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
5781 s->decode_mb= mpeg4_decode_partitioned_mb;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
5782 else
1649
e6a474a5b929 split ff_h263_decode_mb() into h263 and mpeg4 versions
michael
parents: 1646
diff changeset
5783 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
5784
262
7d941b8c4e84 mpeg4 b-frames :)
michaelni
parents: 255
diff changeset
5785 time_incr=0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
5786 while (get_bits1(gb) != 0)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
5787 time_incr++;
986e461dc072 Initial revision
glantau
parents:
diff changeset
5788
747
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5789 check_marker(gb, "before time_increment");
2666
06f0744ffc18 fixing decoding of AlanKay-245.asf
michael
parents: 2658
diff changeset
5790
06f0744ffc18 fixing decoding of AlanKay-245.asf
michael
parents: 2658
diff changeset
5791 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
5792 av_log(s->avctx, AV_LOG_ERROR, "hmm, seems the headers are not complete, trying to guess time_increment_bits\n");
1068
a5be963709d1 improving parsing of incomplete headers
michaelni
parents: 1064
diff changeset
5793
a5be963709d1 improving parsing of incomplete headers
michaelni
parents: 1064
diff changeset
5794 for(s->time_increment_bits=1 ;s->time_increment_bits<16; s->time_increment_bits++){
10664
f56b8a9be9e1 Improve time_increment_bits guessing code.
michael
parents: 10636
diff changeset
5795 if ( s->pict_type == FF_P_TYPE
f56b8a9be9e1 Improve time_increment_bits guessing code.
michael
parents: 10636
diff changeset
5796 || (s->pict_type == FF_S_TYPE && s->vol_sprite_usage==GMC_SPRITE)) {
f56b8a9be9e1 Improve time_increment_bits guessing code.
michael
parents: 10636
diff changeset
5797 if((show_bits(gb, s->time_increment_bits+6)&0x37) == 0x30) break;
f56b8a9be9e1 Improve time_increment_bits guessing code.
michael
parents: 10636
diff changeset
5798 }else
f56b8a9be9e1 Improve time_increment_bits guessing code.
michael
parents: 10636
diff changeset
5799 if((show_bits(gb, s->time_increment_bits+5)&0x1F) == 0x18) break;
1068
a5be963709d1 improving parsing of incomplete headers
michaelni
parents: 1064
diff changeset
5800 }
1396
e380ac39024a cleanup / fixes
michaelni
parents: 1393
diff changeset
5801
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1586
diff changeset
5802 av_log(s->avctx, AV_LOG_ERROR, "my guess is %d bits ;)\n",s->time_increment_bits);
1068
a5be963709d1 improving parsing of incomplete headers
michaelni
parents: 1064
diff changeset
5803 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
5804
1411
c2e63cb94d06 custom quant matrix encoding support
michaelni
parents: 1396
diff changeset
5805 if(IS_3IV1) time_increment= get_bits1(gb); //FIXME investigate further
c2e63cb94d06 custom quant matrix encoding support
michaelni
parents: 1396
diff changeset
5806 else time_increment= get_bits(gb, s->time_increment_bits);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
5807
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6211
diff changeset
5808 if(s->pict_type!=FF_B_TYPE){
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 322
diff changeset
5809 s->last_time_base= s->time_base;
262
7d941b8c4e84 mpeg4 b-frames :)
michaelni
parents: 255
diff changeset
5810 s->time_base+= time_incr;
2637
ef44d24680d1 switch to native time bases
michael
parents: 2632
diff changeset
5811 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
5812 if(s->workaround_bugs&FF_BUG_UMP4){
700
0fb4c66527e1 autodetect UMP4 (by adding a fourcc field to AVCodecContext)
michaelni
parents: 699
diff changeset
5813 if(s->time < s->last_non_b_time){
10775
35e175942ee2 Add a few explanatory comments to cornercase workarounds.
diego
parents: 10759
diff changeset
5814 /* header is not mpeg-4-compatible, broken encoder,
35e175942ee2 Add a few explanatory comments to cornercase workarounds.
diego
parents: 10759
diff changeset
5815 * trying to workaround */
700
0fb4c66527e1 autodetect UMP4 (by adding a fourcc field to AVCodecContext)
michaelni
parents: 699
diff changeset
5816 s->time_base++;
2637
ef44d24680d1 switch to native time bases
michael
parents: 2632
diff changeset
5817 s->time+= s->avctx->time_base.den;
700
0fb4c66527e1 autodetect UMP4 (by adding a fourcc field to AVCodecContext)
michaelni
parents: 699
diff changeset
5818 }
664
00a882f626bd interlaced mpeg4 b frame decoding
michaelni
parents: 662
diff changeset
5819 }
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 322
diff changeset
5820 s->pp_time= s->time - s->last_non_b_time;
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 322
diff changeset
5821 s->last_non_b_time= s->time;
262
7d941b8c4e84 mpeg4 b-frames :)
michaelni
parents: 255
diff changeset
5822 }else{
2637
ef44d24680d1 switch to native time bases
michael
parents: 2632
diff changeset
5823 s->time= (s->last_time_base + time_incr)*s->avctx->time_base.den + time_increment;
664
00a882f626bd interlaced mpeg4 b frame decoding
michaelni
parents: 662
diff changeset
5824 s->pb_time= s->pp_time - (s->last_non_b_time - s->time);
00a882f626bd interlaced mpeg4 b frame decoding
michaelni
parents: 662
diff changeset
5825 if(s->pp_time <=s->pb_time || s->pp_time <= s->pp_time - s->pb_time || s->pp_time<=0){
10775
35e175942ee2 Add a few explanatory comments to cornercase workarounds.
diego
parents: 10759
diff changeset
5826 /* messed up order, maybe after seeking? skipping current b-frame */
2628
511e3afc43e1 Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents: 2615
diff changeset
5827 return FRAME_SKIPPED;
335
e7e9d9901523 b-frame mpeg4 fix when seeking
michaelni
parents: 333
diff changeset
5828 }
3247
ac7bfc9bf1a4 2x faster ff_mpeg4_set_direct_mv
lorenm
parents: 3205
diff changeset
5829 ff_mpeg4_init_direct_mv(s);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
5830
2034
9629c1180d5f 10l (interlaced b frame decoding fix)
michael
parents: 2017
diff changeset
5831 if(s->t_frame==0) s->t_frame= s->pb_time;
664
00a882f626bd interlaced mpeg4 b frame decoding
michaelni
parents: 662
diff changeset
5832 if(s->t_frame==0) s->t_frame=1; // 1/0 protection
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
5833 s->pp_field_time= ( ROUNDED_DIV(s->last_non_b_time, s->t_frame)
664
00a882f626bd interlaced mpeg4 b frame decoding
michaelni
parents: 662
diff changeset
5834 - ROUNDED_DIV(s->last_non_b_time - s->pp_time, s->t_frame))*2;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
5835 s->pb_field_time= ( ROUNDED_DIV(s->time, s->t_frame)
664
00a882f626bd interlaced mpeg4 b frame decoding
michaelni
parents: 662
diff changeset
5836 - ROUNDED_DIV(s->last_non_b_time - s->pp_time, s->t_frame))*2;
4346
855350bd0daf some interlaced direct sanity checks
michael
parents: 4316
diff changeset
5837 if(!s->progressive_sequence){
855350bd0daf some interlaced direct sanity checks
michael
parents: 4316
diff changeset
5838 if(s->pp_field_time <= s->pb_field_time || s->pb_field_time <= 1)
855350bd0daf some interlaced direct sanity checks
michael
parents: 4316
diff changeset
5839 return FRAME_SKIPPED;
855350bd0daf some interlaced direct sanity checks
michael
parents: 4316
diff changeset
5840 }
262
7d941b8c4e84 mpeg4 b-frames :)
michaelni
parents: 255
diff changeset
5841 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
5842
2813
6fd9dbb8c385 try to check for nonsense time_base instead of setting fake one
michael
parents: 2812
diff changeset
5843 if(s->avctx->time_base.num)
6fd9dbb8c385 try to check for nonsense time_base instead of setting fake one
michael
parents: 2812
diff changeset
5844 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
5845 else
6fd9dbb8c385 try to check for nonsense time_base instead of setting fake one
michael
parents: 2812
diff changeset
5846 s->current_picture_ptr->pts= AV_NOPTS_VALUE;
942
c237f5db1c22 correcter mpeg4 headers
michaelni
parents: 936
diff changeset
5847 if(s->avctx->debug&FF_DEBUG_PTS)
2962
fde28cb7e3d5 use PRIxN, %zd, %td formats where needed
mru
parents: 2886
diff changeset
5848 av_log(s->avctx, AV_LOG_DEBUG, "MPEG4 PTS: %"PRId64"\n", s->current_picture_ptr->pts);
2034
9629c1180d5f 10l (interlaced b frame decoding fix)
michael
parents: 2017
diff changeset
5849
1068
a5be963709d1 improving parsing of incomplete headers
michaelni
parents: 1064
diff changeset
5850 check_marker(gb, "before vop_coded");
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
5851
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
5852 /* vop coded */
747
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5853 if (get_bits1(gb) != 1){
2271
859535b5eb57 dont print "vop not coded" by default
michael
parents: 2253
diff changeset
5854 if(s->avctx->debug&FF_DEBUG_PICT_INFO)
859535b5eb57 dont print "vop not coded" by default
michael
parents: 2253
diff changeset
5855 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
5856 return FRAME_SKIPPED;
747
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5857 }
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6211
diff changeset
5858 if (s->shape != BIN_ONLY_SHAPE && ( s->pict_type == FF_P_TYPE
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6211
diff changeset
5859 || (s->pict_type == FF_S_TYPE && s->vol_sprite_usage==GMC_SPRITE))) {
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
5860 /* rounding type for motion estimation */
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
5861 s->no_rounding = get_bits1(gb);
63
8e2d8dbf89a5 better vol header parsing for mpeg4
glantau
parents: 21
diff changeset
5862 } else {
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
5863 s->no_rounding = 0;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
5864 }
253
4448dd55d415 parsing more of the mpeg4 header & print some "not supported" stuff
michaelni
parents: 250
diff changeset
5865 //FIXME reduced res stuff
4448dd55d415 parsing more of the mpeg4 header & print some "not supported" stuff
michaelni
parents: 250
diff changeset
5866
4448dd55d415 parsing more of the mpeg4 header & print some "not supported" stuff
michaelni
parents: 250
diff changeset
5867 if (s->shape != RECT_SHAPE) {
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6211
diff changeset
5868 if (s->vol_sprite_usage != 1 || s->pict_type != FF_I_TYPE) {
63
8e2d8dbf89a5 better vol header parsing for mpeg4
glantau
parents: 21
diff changeset
5869 int width, height, hor_spat_ref, ver_spat_ref;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
5870
747
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5871 width = get_bits(gb, 13);
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5872 skip_bits1(gb); /* marker */
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5873 height = get_bits(gb, 13);
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5874 skip_bits1(gb); /* marker */
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5875 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
5876 skip_bits1(gb); /* marker */
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5877 ver_spat_ref = get_bits(gb, 13); /* ver_spat_ref */
63
8e2d8dbf89a5 better vol header parsing for mpeg4
glantau
parents: 21
diff changeset
5878 }
747
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5879 skip_bits1(gb); /* change_CR_disable */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
5880
747
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5881 if (get_bits1(gb) != 0) {
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5882 skip_bits(gb, 8); /* constant_alpha_value */
63
8e2d8dbf89a5 better vol header parsing for mpeg4
glantau
parents: 21
diff changeset
5883 }
8e2d8dbf89a5 better vol header parsing for mpeg4
glantau
parents: 21
diff changeset
5884 }
253
4448dd55d415 parsing more of the mpeg4 header & print some "not supported" stuff
michaelni
parents: 250
diff changeset
5885 //FIXME complexity estimation stuff
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
5886
253
4448dd55d415 parsing more of the mpeg4 header & print some "not supported" stuff
michaelni
parents: 250
diff changeset
5887 if (s->shape != BIN_ONLY_SHAPE) {
8251
d256dbf74ea6 Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents: 8106
diff changeset
5888 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
5889 if(s->pict_type != FF_I_TYPE)
d256dbf74ea6 Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents: 8106
diff changeset
5890 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
5891 if(s->pict_type == FF_B_TYPE)
d256dbf74ea6 Implement complexity estimation parsing and try to detect an incorrectly set
michael
parents: 8106
diff changeset
5892 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
5893
1520
ad5461bad820 intra dc treshold != 0 decoding fixed
michael
parents: 1512
diff changeset
5894 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
5895 if(!s->progressive_sequence){
747
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5896 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
5897 s->alternate_scan= get_bits1(gb);
661
a0901e38c564 fixing interlaced mpeg4 decoding
michaelni
parents: 660
diff changeset
5898 }else
a0901e38c564 fixing interlaced mpeg4 decoding
michaelni
parents: 660
diff changeset
5899 s->alternate_scan= 0;
253
4448dd55d415 parsing more of the mpeg4 header & print some "not supported" stuff
michaelni
parents: 250
diff changeset
5900 }
254
b4fed8b24e3a gmc bitstream decoding support (the real motion compensation isnt implemnted yet)
michaelni
parents: 253
diff changeset
5901
718
16dab8296293 fixing custom quantizer matrix decoding
michaelni
parents: 706
diff changeset
5902 if(s->alternate_scan){
1273
a979fab41ed8 ASV1 codec
michaelni
parents: 1271
diff changeset
5903 ff_init_scantable(s->dsp.idct_permutation, &s->inter_scantable , ff_alternate_vertical_scan);
a979fab41ed8 ASV1 codec
michaelni
parents: 1271
diff changeset
5904 ff_init_scantable(s->dsp.idct_permutation, &s->intra_scantable , ff_alternate_vertical_scan);
a979fab41ed8 ASV1 codec
michaelni
parents: 1271
diff changeset
5905 ff_init_scantable(s->dsp.idct_permutation, &s->intra_h_scantable, ff_alternate_vertical_scan);
a979fab41ed8 ASV1 codec
michaelni
parents: 1271
diff changeset
5906 ff_init_scantable(s->dsp.idct_permutation, &s->intra_v_scantable, ff_alternate_vertical_scan);
718
16dab8296293 fixing custom quantizer matrix decoding
michaelni
parents: 706
diff changeset
5907 } else{
1273
a979fab41ed8 ASV1 codec
michaelni
parents: 1271
diff changeset
5908 ff_init_scantable(s->dsp.idct_permutation, &s->inter_scantable , ff_zigzag_direct);
a979fab41ed8 ASV1 codec
michaelni
parents: 1271
diff changeset
5909 ff_init_scantable(s->dsp.idct_permutation, &s->intra_scantable , ff_zigzag_direct);
a979fab41ed8 ASV1 codec
michaelni
parents: 1271
diff changeset
5910 ff_init_scantable(s->dsp.idct_permutation, &s->intra_h_scantable, ff_alternate_horizontal_scan);
a979fab41ed8 ASV1 codec
michaelni
parents: 1271
diff changeset
5911 ff_init_scantable(s->dsp.idct_permutation, &s->intra_v_scantable, ff_alternate_vertical_scan);
718
16dab8296293 fixing custom quantizer matrix decoding
michaelni
parents: 706
diff changeset
5912 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
5913
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6211
diff changeset
5914 if(s->pict_type == FF_S_TYPE && (s->vol_sprite_usage==STATIC_SPRITE || s->vol_sprite_usage==GMC_SPRITE)){
1914
8337c46a5abe gmc segfault fix
michael
parents: 1912
diff changeset
5915 mpeg4_decode_sprite_trajectory(s, gb);
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1586
diff changeset
5916 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
5917 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
5918 }
254
b4fed8b24e3a gmc bitstream decoding support (the real motion compensation isnt implemnted yet)
michaelni
parents: 253
diff changeset
5919
253
4448dd55d415 parsing more of the mpeg4 header & print some "not supported" stuff
michaelni
parents: 250
diff changeset
5920 if (s->shape != BIN_ONLY_SHAPE) {
1644
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
5921 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
5922 if(s->qscale==0){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1586
diff changeset
5923 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
5924 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
5925 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
5926
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6211
diff changeset
5927 if (s->pict_type != FF_I_TYPE) {
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
5928 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
5929 if(s->f_code==0){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1586
diff changeset
5930 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
5931 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
5932 }
582
5132a4ee50cd different edge positions fixed with edge emu / dr1
michaelni
parents: 575
diff changeset
5933 }else
5132a4ee50cd different edge positions fixed with edge emu / dr1
michaelni
parents: 575
diff changeset
5934 s->f_code=1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
5935
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6211
diff changeset
5936 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
5937 s->b_code = get_bits(gb, 3);
582
5132a4ee50cd different edge positions fixed with edge emu / dr1
michaelni
parents: 575
diff changeset
5938 }else
5132a4ee50cd different edge positions fixed with edge emu / dr1
michaelni
parents: 575
diff changeset
5939 s->b_code=1;
906
bbe0c99231a7 specific debug output support
michaelni
parents: 905
diff changeset
5940
bbe0c99231a7 specific debug output support
michaelni
parents: 905
diff changeset
5941 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
5942 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
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
5943 s->qscale, s->f_code, s->b_code,
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6211
diff changeset
5944 s->pict_type == FF_I_TYPE ? "I" : (s->pict_type == FF_P_TYPE ? "P" : (s->pict_type == FF_B_TYPE ? "B" : "S")),
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
5945 gb->size_in_bits,s->progressive_sequence, s->alternate_scan, s->top_field_first,
930
6bcb214d6a17 more debug output
michaelni
parents: 923
diff changeset
5946 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
5947 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
bbe0c99231a7 specific debug output support
michaelni
parents: 905
diff changeset
5948 }
bbe0c99231a7 specific debug output support
michaelni
parents: 905
diff changeset
5949
253
4448dd55d415 parsing more of the mpeg4 header & print some "not supported" stuff
michaelni
parents: 250
diff changeset
5950 if(!s->scalability){
6481
493dc59d469a add FF_ prefix to all (frame)_TYPE usage
aurel
parents: 6211
diff changeset
5951 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
5952 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
5953 }
575
23eee7d73c4b minor optimizations
michaelni
parents: 564
diff changeset
5954 }else{
23eee7d73c4b minor optimizations
michaelni
parents: 564
diff changeset
5955 if(s->enhancement_type){
747
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5956 int load_backward_shape= get_bits1(gb);
575
23eee7d73c4b minor optimizations
michaelni
parents: 564
diff changeset
5957 if(load_backward_shape){
2646
c735e3e60ca7 Even More spelling errors. patch by (Kevin Baragona <kevinmb500 gawab com)
michael
parents: 2639
diff changeset
5958 av_log(s->avctx, AV_LOG_ERROR, "load backward shape isn't supported\n");
575
23eee7d73c4b minor optimizations
michaelni
parents: 564
diff changeset
5959 }
23eee7d73c4b minor optimizations
michaelni
parents: 564
diff changeset
5960 }
747
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5961 skip_bits(gb, 2); //ref_select_code
63
8e2d8dbf89a5 better vol header parsing for mpeg4
glantau
parents: 21
diff changeset
5962 }
8e2d8dbf89a5 better vol header parsing for mpeg4
glantau
parents: 21
diff changeset
5963 }
2646
c735e3e60ca7 Even More spelling errors. patch by (Kevin Baragona <kevinmb500 gawab com)
michael
parents: 2639
diff changeset
5964 /* 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
5965 // 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
5966 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
5967 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
5968 s->low_delay=1;
c2f789fe4945 detecting xvid/divx4/opendivx and set low_delay flag
michaelni
parents: 344
diff changeset
5969 }
c2f789fe4945 detecting xvid/divx4/opendivx and set low_delay flag
michaelni
parents: 344
diff changeset
5970
2646
c735e3e60ca7 Even More spelling errors. patch by (Kevin Baragona <kevinmb500 gawab com)
michael
parents: 2639
diff changeset
5971 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
5972
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
5973 s->y_dc_scale_table= ff_mpeg4_y_dc_scale_table; //FIXME add short header support
498
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 482
diff changeset
5974 s->c_dc_scale_table= ff_mpeg4_c_dc_scale_table;
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 482
diff changeset
5975
1366
80067f8d6770 fix edge repeating bug for %16!=0 files, this fixes Quicktime mpeg4 (they arent buggy)
michaelni
parents: 1364
diff changeset
5976 if(s->workaround_bugs&FF_BUG_EDGE){
582
5132a4ee50cd different edge positions fixed with edge emu / dr1
michaelni
parents: 575
diff changeset
5977 s->h_edge_pos= s->width;
5132a4ee50cd different edge positions fixed with edge emu / dr1
michaelni
parents: 575
diff changeset
5978 s->v_edge_pos= s->height;
5132a4ee50cd different edge positions fixed with edge emu / dr1
michaelni
parents: 575
diff changeset
5979 }
63
8e2d8dbf89a5 better vol header parsing for mpeg4
glantau
parents: 21
diff changeset
5980 return 0;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
5981 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
5982
747
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5983 /**
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5984 * decode mpeg4 headers
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5985 * @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
5986 * 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
5987 * 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
5988 */
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5989 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
5990 {
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5991 int startcode, v;
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5992
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5993 /* search next start code */
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
5994 align_get_bits(gb);
2406
25a24139f296 WV1F support
michael
parents: 2370
diff changeset
5995
8612
b20c590170cc remove ff_get_fourcc() and use AV_RL32() instead
aurel
parents: 8611
diff changeset
5996 if(s->codec_tag == AV_RL32("WV1F") && show_bits(gb, 24) == 0x575630){
2406
25a24139f296 WV1F support
michael
parents: 2370
diff changeset
5997 skip_bits(gb, 24);
25a24139f296 WV1F support
michael
parents: 2370
diff changeset
5998 if(get_bits(gb, 8) == 0xF0)
8417
ad4f10287633 Move CODEC_FLAG_LOW_DELAY into ff_mpeg4_decode_picture_header().
michael
parents: 8297
diff changeset
5999 goto end;
2406
25a24139f296 WV1F support
michael
parents: 2370
diff changeset
6000 }
25a24139f296 WV1F support
michael
parents: 2370
diff changeset
6001
747
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
6002 startcode = 0xff;
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
6003 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
6004 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
6005 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
6006 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
6007 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
6008 }else
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
6009 return -1; //end of stream
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
6010 }
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
6011
2966
564788471dd4 bitstream related fixes from [PATCH] from DivX, Part 9: bitstream crashes by (Steve Lhomme | slhomme divxcorp com)
michael
parents: 2962
diff changeset
6012 /* 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
6013 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
6014 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
6015
747
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
6016 if((startcode&0xFFFFFF00) != 0x100)
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
6017 continue; //no startcode
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
6018
942
c237f5db1c22 correcter mpeg4 headers
michaelni
parents: 936
diff changeset
6019 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
6020 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
6021 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
6022 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
6023 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
6024 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
6025 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
6026 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
6027 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
6028 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
6029 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
6030 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
6031 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
6032 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
6033 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
6034 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
6035 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
6036 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
6037 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
6038 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
6039 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
6040 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
6041 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
6042 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
6043 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
6044 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
6045 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
6046 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
6047 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
6048 av_log(s->avctx, AV_LOG_DEBUG, " at %d\n", get_bits_count(gb));
942
c237f5db1c22 correcter mpeg4 headers
michaelni
parents: 936
diff changeset
6049 }
c237f5db1c22 correcter mpeg4 headers
michaelni
parents: 936
diff changeset
6050
1512
e9f83c2323bf recommit of
michael
parents: 1505
diff changeset
6051 if(startcode >= 0x120 && startcode <= 0x12F){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2966
diff changeset
6052 if(decode_vol_header(s, gb) < 0)
1396
e380ac39024a cleanup / fixes
michaelni
parents: 1393
diff changeset
6053 return -1;
1512
e9f83c2323bf recommit of
michael
parents: 1505
diff changeset
6054 }
e9f83c2323bf recommit of
michael
parents: 1505
diff changeset
6055 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
6056 decode_user_data(s, gb);
1512
e9f83c2323bf recommit of
michael
parents: 1505
diff changeset
6057 }
e9f83c2323bf recommit of
michael
parents: 1505
diff changeset
6058 else if(startcode == GOP_STARTCODE){
942
c237f5db1c22 correcter mpeg4 headers
michaelni
parents: 936
diff changeset
6059 mpeg4_decode_gop_header(s, gb);
1512
e9f83c2323bf recommit of
michael
parents: 1505
diff changeset
6060 }
e9f83c2323bf recommit of
michael
parents: 1505
diff changeset
6061 else if(startcode == VOP_STARTCODE){
8417
ad4f10287633 Move CODEC_FLAG_LOW_DELAY into ff_mpeg4_decode_picture_header().
michael
parents: 8297
diff changeset
6062 break;
747
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
6063 }
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
6064
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
6065 align_get_bits(gb);
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
6066 startcode = 0xff;
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
6067 }
8417
ad4f10287633 Move CODEC_FLAG_LOW_DELAY into ff_mpeg4_decode_picture_header().
michael
parents: 8297
diff changeset
6068 end:
ad4f10287633 Move CODEC_FLAG_LOW_DELAY into ff_mpeg4_decode_picture_header().
michael
parents: 8297
diff changeset
6069 if(s->flags& CODEC_FLAG_LOW_DELAY)
ad4f10287633 Move CODEC_FLAG_LOW_DELAY into ff_mpeg4_decode_picture_header().
michael
parents: 8297
diff changeset
6070 s->low_delay=1;
8418
f75be04312dc Fix PTS returned by the demuxers for mpeg4 without a decoder.
michael
parents: 8417
diff changeset
6071 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
6072 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
6073 }