annotate msmpeg4.c @ 3908:045c650f0951 libavcodec

Original Commit: r109 | ods15 | 2006-10-01 19:14:52 +0200 (Sun, 01 Oct 2006) | 2 lines 5% speed improovement by changing put_vector
author ods15
date Mon, 02 Oct 2006 06:09:41 +0000
parents 8e79b099d354
children c8c591fe26f8
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 * MSMPEG4 backend for ffmpeg encoder and decoder
429
718a22dc121f license/copyright change
glantau
parents: 411
diff changeset
3 * Copyright (c) 2001 Fabrice Bellard.
1739
07a484280a82 copyright year update of the files i touched and remembered, things look annoyingly unmaintained otherwise
michael
parents: 1651
diff changeset
4 * Copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at>
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
5 *
429
718a22dc121f license/copyright change
glantau
parents: 411
diff changeset
6 * This library is free software; you can redistribute it and/or
718a22dc121f license/copyright change
glantau
parents: 411
diff changeset
7 * modify it under the terms of the GNU Lesser General Public
718a22dc121f license/copyright change
glantau
parents: 411
diff changeset
8 * License as published by the Free Software Foundation; either
718a22dc121f license/copyright change
glantau
parents: 411
diff changeset
9 * version 2 of the License, or (at your option) any later version.
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
10 *
429
718a22dc121f license/copyright change
glantau
parents: 411
diff changeset
11 * This library is distributed in the hope that it will be useful,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
429
718a22dc121f license/copyright change
glantau
parents: 411
diff changeset
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
718a22dc121f license/copyright change
glantau
parents: 411
diff changeset
14 * Lesser General Public License for more details.
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
15 *
429
718a22dc121f license/copyright change
glantau
parents: 411
diff changeset
16 * You should have received a copy of the GNU Lesser General Public
718a22dc121f license/copyright change
glantau
parents: 411
diff changeset
17 * License along with this library; if not, write to the Free Software
3036
0b546eab515d Update licensing information: The FSF changed postal address.
diego
parents: 2979
diff changeset
18 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
411
5c8b3a717929 workaround dc_scale bug in old ffmpeg msmpeg4v3 encoder (set workaround_bugs=1 for this)
michaelni
parents: 396
diff changeset
19 *
457
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
20 * msmpeg4v1 & v2 stuff by Michael Niedermayer <michaelni@gmx.at>
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
21 */
1106
1e39f273ecd6 per file doxy
michaelni
parents: 1070
diff changeset
22
1e39f273ecd6 per file doxy
michaelni
parents: 1070
diff changeset
23 /**
1e39f273ecd6 per file doxy
michaelni
parents: 1070
diff changeset
24 * @file msmpeg4.c
1e39f273ecd6 per file doxy
michaelni
parents: 1070
diff changeset
25 * MSMPEG4 backend for ffmpeg encoder and decoder.
1e39f273ecd6 per file doxy
michaelni
parents: 1070
diff changeset
26 */
1e39f273ecd6 per file doxy
michaelni
parents: 1070
diff changeset
27
396
fce0a2520551 removed useless header includes - use av memory functions
glantau
parents: 347
diff changeset
28 #include "avcodec.h"
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
29 #include "dsputil.h"
986e461dc072 Initial revision
glantau
parents:
diff changeset
30 #include "mpegvideo.h"
411
5c8b3a717929 workaround dc_scale bug in old ffmpeg msmpeg4v3 encoder (set workaround_bugs=1 for this)
michaelni
parents: 396
diff changeset
31
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
32 /*
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
33 * You can also call this codec : MPEG4 with a twist !
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
34 *
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
35 * TODO:
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
36 * - (encoding) select best mv table (two choices)
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
37 * - (encoding) select best vlc/dc table
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
38 */
986e461dc072 Initial revision
glantau
parents:
diff changeset
39 //#define DEBUG
986e461dc072 Initial revision
glantau
parents:
diff changeset
40
531
f5d7fcc81787 get_vlc() optimizations
michaelni
parents: 519
diff changeset
41 #define DC_VLC_BITS 9
f5d7fcc81787 get_vlc() optimizations
michaelni
parents: 519
diff changeset
42 #define CBPY_VLC_BITS 6
f5d7fcc81787 get_vlc() optimizations
michaelni
parents: 519
diff changeset
43 #define INTER_INTRA_VLC_BITS 3
f5d7fcc81787 get_vlc() optimizations
michaelni
parents: 519
diff changeset
44 #define V1_INTRA_CBPC_VLC_BITS 6
f5d7fcc81787 get_vlc() optimizations
michaelni
parents: 519
diff changeset
45 #define V1_INTER_CBPC_VLC_BITS 6
f5d7fcc81787 get_vlc() optimizations
michaelni
parents: 519
diff changeset
46 #define V2_INTRA_CBPC_VLC_BITS 3
f5d7fcc81787 get_vlc() optimizations
michaelni
parents: 519
diff changeset
47 #define V2_MB_TYPE_VLC_BITS 7
f5d7fcc81787 get_vlc() optimizations
michaelni
parents: 519
diff changeset
48 #define MV_VLC_BITS 9
f5d7fcc81787 get_vlc() optimizations
michaelni
parents: 519
diff changeset
49 #define V2_MV_VLC_BITS 9
f5d7fcc81787 get_vlc() optimizations
michaelni
parents: 519
diff changeset
50 #define TEX_VLC_BITS 9
f5d7fcc81787 get_vlc() optimizations
michaelni
parents: 519
diff changeset
51 #define MB_NON_INTRA_VLC_BITS 9
f5d7fcc81787 get_vlc() optimizations
michaelni
parents: 519
diff changeset
52 #define MB_INTRA_VLC_BITS 9
f5d7fcc81787 get_vlc() optimizations
michaelni
parents: 519
diff changeset
53
578
32c142b10263 fixing bitrate vs. kbitrate in header
michaelni
parents: 563
diff changeset
54 #define II_BITRATE 128*1024
32c142b10263 fixing bitrate vs. kbitrate in header
michaelni
parents: 563
diff changeset
55 #define MBAC_BITRATE 50*1024
32c142b10263 fixing bitrate vs. kbitrate in header
michaelni
parents: 563
diff changeset
56
936
caa77cd960c0 qpel encoding
michaelni
parents: 903
diff changeset
57 #define DEFAULT_INTER_INDEX 3
caa77cd960c0 qpel encoding
michaelni
parents: 903
diff changeset
58
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1063
diff changeset
59 static uint32_t v2_dc_lum_table[512][2];
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1063
diff changeset
60 static uint32_t v2_dc_chroma_table[512][2];
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
61
499
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
62 static inline void msmpeg4_encode_block(MpegEncContext * s, DCTELEM * block, int n);
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
63 static inline int msmpeg4_decode_block(MpegEncContext * s, DCTELEM * block,
936
caa77cd960c0 qpel encoding
michaelni
parents: 903
diff changeset
64 int n, int coded, const uint8_t *scantable);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
65 static int msmpeg4_decode_dc(MpegEncContext * s, int n, int *dir_ptr);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
66 static int msmpeg4_decode_motion(MpegEncContext * s,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
67 int *mx_ptr, int *my_ptr);
468
1e23eae32087 Minor warning cleanup.
mellum
parents: 457
diff changeset
68 static void init_h263_dc_for_msmpeg4(void);
519
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
69 static inline void msmpeg4_memsetw(short *tab, int val, int n);
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: 1064
diff changeset
70 #ifdef CONFIG_ENCODERS
3777
20545fbb6f7c add some #ifdef CONFIG_ENCODERS/DECODERS
mru
parents: 3776
diff changeset
71 static void msmpeg4v2_encode_motion(MpegEncContext * s, int val);
601
76e9b51cccda faster vlc table selection
michaelni
parents: 596
diff changeset
72 static int get_size_of_code(MpegEncContext * s, RLTable *rl, int last, int run, int level, int intra);
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: 1064
diff changeset
73 #endif //CONFIG_ENCODERS
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 743
diff changeset
74 static int msmpeg4v12_decode_mb(MpegEncContext *s, DCTELEM block[6][64]);
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 743
diff changeset
75 static int msmpeg4v34_decode_mb(MpegEncContext *s, DCTELEM block[6][64]);
936
caa77cd960c0 qpel encoding
michaelni
parents: 903
diff changeset
76 static int wmv2_decode_mb(MpegEncContext *s, DCTELEM block[6][64]);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
77
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents: 3177
diff changeset
78 /* vc1 externs */
2474
81a9f883a17a In that patch:
michael
parents: 2465
diff changeset
79 extern uint8_t wmv3_dc_scale_table[32];
601
76e9b51cccda faster vlc table selection
michaelni
parents: 596
diff changeset
80
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
81 #ifdef DEBUG
986e461dc072 Initial revision
glantau
parents:
diff changeset
82 int intra_count = 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
83 int frame_count = 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
84 #endif
986e461dc072 Initial revision
glantau
parents:
diff changeset
85
986e461dc072 Initial revision
glantau
parents:
diff changeset
86 #include "msmpeg4data.h"
986e461dc072 Initial revision
glantau
parents:
diff changeset
87
1325
1cbc2380d172 CONFIG_ENCODERS cleanup
michaelni
parents: 1273
diff changeset
88 #ifdef CONFIG_ENCODERS //strangely gcc includes this even if its not references
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1063
diff changeset
89 static uint8_t rl_length[NB_RL_TABLES][MAX_LEVEL+1][MAX_RUN+1][2];
1325
1cbc2380d172 CONFIG_ENCODERS cleanup
michaelni
parents: 1273
diff changeset
90 #endif //CONFIG_ENCODERS
601
76e9b51cccda faster vlc table selection
michaelni
parents: 596
diff changeset
91
499
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
92 static void common_init(MpegEncContext * s)
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
93 {
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
94 static int inited=0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
95
499
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
96 switch(s->msmpeg4_version){
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
97 case 1:
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
98 case 2:
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
99 s->y_dc_scale_table=
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
100 s->c_dc_scale_table= ff_mpeg1_dc_scale_table;
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
101 break;
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
102 case 3:
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
103 if(s->workaround_bugs){
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
104 s->y_dc_scale_table= old_ff_y_dc_scale_table;
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
105 s->c_dc_scale_table= old_ff_c_dc_scale_table;
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
106 } else{
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
107 s->y_dc_scale_table= ff_mpeg4_y_dc_scale_table;
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
108 s->c_dc_scale_table= ff_mpeg4_c_dc_scale_table;
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
109 }
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
110 break;
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
111 case 4:
936
caa77cd960c0 qpel encoding
michaelni
parents: 903
diff changeset
112 case 5:
499
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
113 s->y_dc_scale_table= wmv1_y_dc_scale_table;
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
114 s->c_dc_scale_table= wmv1_c_dc_scale_table;
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
115 break;
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents: 3177
diff changeset
116 #if defined(CONFIG_WMV3_DECODER)||defined(CONFIG_VC1_DECODER)
2474
81a9f883a17a In that patch:
michael
parents: 2465
diff changeset
117 case 6:
81a9f883a17a In that patch:
michael
parents: 2465
diff changeset
118 s->y_dc_scale_table= wmv3_dc_scale_table;
81a9f883a17a In that patch:
michael
parents: 2465
diff changeset
119 s->c_dc_scale_table= wmv3_dc_scale_table;
81a9f883a17a In that patch:
michael
parents: 2465
diff changeset
120 break;
2639
e2780f828440 put most codecs under ifdefs
michael
parents: 2637
diff changeset
121 #endif
2474
81a9f883a17a In that patch:
michael
parents: 2465
diff changeset
122
499
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
123 }
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
124
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
125
936
caa77cd960c0 qpel encoding
michaelni
parents: 903
diff changeset
126 if(s->msmpeg4_version>=4){
1273
a979fab41ed8 ASV1 codec
michaelni
parents: 1261
diff changeset
127 ff_init_scantable(s->dsp.idct_permutation, &s->intra_scantable , wmv1_scantable[1]);
a979fab41ed8 ASV1 codec
michaelni
parents: 1261
diff changeset
128 ff_init_scantable(s->dsp.idct_permutation, &s->intra_h_scantable, wmv1_scantable[2]);
a979fab41ed8 ASV1 codec
michaelni
parents: 1261
diff changeset
129 ff_init_scantable(s->dsp.idct_permutation, &s->intra_v_scantable, wmv1_scantable[3]);
a979fab41ed8 ASV1 codec
michaelni
parents: 1261
diff changeset
130 ff_init_scantable(s->dsp.idct_permutation, &s->inter_scantable , wmv1_scantable[0]);
499
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
131 }
706
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 601
diff changeset
132 //Note the default tables are set in common_init in mpegvideo.c
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
133
499
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
134 if(!inited){
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
135 inited=1;
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
136
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
137 init_h263_dc_for_msmpeg4();
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
138 }
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
139 }
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
140
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: 1064
diff changeset
141 #ifdef 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: 1064
diff changeset
142
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
143 /* build the table which associate a (x,y) motion vector to a vlc */
986e461dc072 Initial revision
glantau
parents:
diff changeset
144 static void init_mv_table(MVTable *tab)
986e461dc072 Initial revision
glantau
parents:
diff changeset
145 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
146 int i, x, y;
986e461dc072 Initial revision
glantau
parents:
diff changeset
147
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1063
diff changeset
148 tab->table_mv_index = av_malloc(sizeof(uint16_t) * 4096);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
149 /* mark all entries as not used */
986e461dc072 Initial revision
glantau
parents:
diff changeset
150 for(i=0;i<4096;i++)
986e461dc072 Initial revision
glantau
parents:
diff changeset
151 tab->table_mv_index[i] = tab->n;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
152
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
153 for(i=0;i<tab->n;i++) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
154 x = tab->table_mvx[i];
986e461dc072 Initial revision
glantau
parents:
diff changeset
155 y = tab->table_mvy[i];
986e461dc072 Initial revision
glantau
parents:
diff changeset
156 tab->table_mv_index[(x << 6) | y] = i;
986e461dc072 Initial revision
glantau
parents:
diff changeset
157 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
158 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
159
986e461dc072 Initial revision
glantau
parents:
diff changeset
160 static void code012(PutBitContext *pb, int n)
986e461dc072 Initial revision
glantau
parents:
diff changeset
161 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
162 if (n == 0) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
163 put_bits(pb, 1, 0);
986e461dc072 Initial revision
glantau
parents:
diff changeset
164 } else {
986e461dc072 Initial revision
glantau
parents:
diff changeset
165 put_bits(pb, 1, 1);
986e461dc072 Initial revision
glantau
parents:
diff changeset
166 put_bits(pb, 1, (n >= 2));
986e461dc072 Initial revision
glantau
parents:
diff changeset
167 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
168 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
169
499
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
170 void ff_msmpeg4_encode_init(MpegEncContext *s)
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
171 {
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
172 static int init_done=0;
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
173 int i;
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
174
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
175 common_init(s);
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
176 if(s->msmpeg4_version>=4){
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
177 s->min_qcoeff= -255;
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
178 s->max_qcoeff= 255;
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
179 }
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
180
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
181 if (!init_done) {
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
182 /* init various encoding tables */
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
183 init_done = 1;
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
184 init_mv_table(&mv_tables[0]);
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
185 init_mv_table(&mv_tables[1]);
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
186 for(i=0;i<NB_RL_TABLES;i++)
2370
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2293
diff changeset
187 init_rl(&rl_table[i], 1);
601
76e9b51cccda faster vlc table selection
michaelni
parents: 596
diff changeset
188
76e9b51cccda faster vlc table selection
michaelni
parents: 596
diff changeset
189 for(i=0; i<NB_RL_TABLES; i++){
76e9b51cccda faster vlc table selection
michaelni
parents: 596
diff changeset
190 int level;
76e9b51cccda faster vlc table selection
michaelni
parents: 596
diff changeset
191 for(level=0; level<=MAX_LEVEL; level++){
76e9b51cccda faster vlc table selection
michaelni
parents: 596
diff changeset
192 int run;
76e9b51cccda faster vlc table selection
michaelni
parents: 596
diff changeset
193 for(run=0; run<=MAX_RUN; run++){
76e9b51cccda faster vlc table selection
michaelni
parents: 596
diff changeset
194 int last;
76e9b51cccda faster vlc table selection
michaelni
parents: 596
diff changeset
195 for(last=0; last<2; last++){
774
baa66649df35 mergeing inter & intra rl_length tables (50% smaller & no meassureable difference in filesize/quality)
michaelni
parents: 773
diff changeset
196 rl_length[i][level][run][last]= get_size_of_code(s, &rl_table[ i], last, run, level, 0);
601
76e9b51cccda faster vlc table selection
michaelni
parents: 596
diff changeset
197 }
76e9b51cccda faster vlc table selection
michaelni
parents: 596
diff changeset
198 }
76e9b51cccda faster vlc table selection
michaelni
parents: 596
diff changeset
199 }
76e9b51cccda faster vlc table selection
michaelni
parents: 596
diff changeset
200 }
499
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
201 }
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
202 }
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
203
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
204 static int get_size_of_code(MpegEncContext * s, RLTable *rl, int last, int run, int level, int intra){
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
205 int size=0;
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
206 int code;
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
207 int run_diff= intra ? 0 : 1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
208
499
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
209 code = get_rl_index(rl, last, run, level);
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
210 size+= rl->table_vlc[code][1];
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
211 if (code == rl->n) {
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
212 int level1, run1;
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
213
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
214 level1 = level - rl->max_level[last][run];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
215 if (level1 < 1)
499
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
216 goto esc2;
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
217 code = get_rl_index(rl, last, run, level1);
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
218 if (code == rl->n) {
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
219 esc2:
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
220 size++;
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
221 if (level > MAX_LEVEL)
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
222 goto esc3;
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
223 run1 = run - rl->max_run[last][level] - run_diff;
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
224 if (run1 < 0)
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
225 goto esc3;
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
226 code = get_rl_index(rl, last, run1, level);
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
227 if (code == rl->n) {
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
228 esc3:
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
229 /* third escape */
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
230 size+=1+1+6+8;
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
231 } else {
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
232 /* second escape */
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
233 size+= 1+1+ rl->table_vlc[code][1];
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
234 }
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
235 } else {
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
236 /* first escape */
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
237 size+= 1+1+ rl->table_vlc[code][1];
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
238 }
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
239 } else {
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
240 size++;
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
241 }
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
242 return size;
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
243 }
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
244
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
245 static void find_best_tables(MpegEncContext * s)
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
246 {
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
247 int i;
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
248 int best =-1, best_size =9999999;
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
249 int chroma_best=-1, best_chroma_size=9999999;
601
76e9b51cccda faster vlc table selection
michaelni
parents: 596
diff changeset
250
499
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
251 for(i=0; i<3; i++){
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
252 int level;
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
253 int chroma_size=0;
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
254 int size=0;
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
255
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
256 if(i>0){// ;)
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
257 size++;
499
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
258 chroma_size++;
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
259 }
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
260 for(level=0; level<=MAX_LEVEL; level++){
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
261 int run;
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
262 for(run=0; run<=MAX_RUN; run++){
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
263 int last;
601
76e9b51cccda faster vlc table selection
michaelni
parents: 596
diff changeset
264 const int last_size= size + chroma_size;
499
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
265 for(last=0; last<2; last++){
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
266 int inter_count = s->ac_stats[0][0][level][run][last] + s->ac_stats[0][1][level][run][last];
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
267 int intra_luma_count = s->ac_stats[1][0][level][run][last];
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
268 int intra_chroma_count= s->ac_stats[1][1][level][run][last];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
269
499
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
270 if(s->pict_type==I_TYPE){
774
baa66649df35 mergeing inter & intra rl_length tables (50% smaller & no meassureable difference in filesize/quality)
michaelni
parents: 773
diff changeset
271 size += intra_luma_count *rl_length[i ][level][run][last];
baa66649df35 mergeing inter & intra rl_length tables (50% smaller & no meassureable difference in filesize/quality)
michaelni
parents: 773
diff changeset
272 chroma_size+= intra_chroma_count*rl_length[i+3][level][run][last];
499
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
273 }else{
774
baa66649df35 mergeing inter & intra rl_length tables (50% smaller & no meassureable difference in filesize/quality)
michaelni
parents: 773
diff changeset
274 size+= intra_luma_count *rl_length[i ][level][run][last]
baa66649df35 mergeing inter & intra rl_length tables (50% smaller & no meassureable difference in filesize/quality)
michaelni
parents: 773
diff changeset
275 +intra_chroma_count*rl_length[i+3][level][run][last]
baa66649df35 mergeing inter & intra rl_length tables (50% smaller & no meassureable difference in filesize/quality)
michaelni
parents: 773
diff changeset
276 +inter_count *rl_length[i+3][level][run][last];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
277 }
499
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
278 }
601
76e9b51cccda faster vlc table selection
michaelni
parents: 596
diff changeset
279 if(last_size == size+chroma_size) break;
499
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
280 }
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
281 }
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
282 if(size<best_size){
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
283 best_size= size;
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
284 best= i;
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
285 }
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
286 if(chroma_size<best_chroma_size){
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
287 best_chroma_size= chroma_size;
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
288 chroma_best= i;
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
289 }
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
290 }
601
76e9b51cccda faster vlc table selection
michaelni
parents: 596
diff changeset
291
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
292 // printf("type:%d, best:%d, qp:%d, var:%d, mcvar:%d, size:%d //\n",
499
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
293 // s->pict_type, best, s->qscale, s->mb_var_sum, s->mc_mb_var_sum, best_size);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
294
499
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
295 if(s->pict_type==P_TYPE) chroma_best= best;
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
296
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
297 memset(s->ac_stats, 0, sizeof(int)*(MAX_LEVEL+1)*(MAX_RUN+1)*2*2*2);
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
298
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
299 s->rl_table_index = best;
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
300 s->rl_chroma_table_index= chroma_best;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
301
499
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
302 if(s->pict_type != s->last_non_b_pict_type){
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
303 s->rl_table_index= 2;
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
304 if(s->pict_type==I_TYPE)
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
305 s->rl_chroma_table_index= 1;
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
306 else
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
307 s->rl_chroma_table_index= 2;
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
308 }
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
309
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
310 }
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
311
457
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
312 /* write MSMPEG4 compatible frame header */
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
313 void msmpeg4_encode_picture_header(MpegEncContext * s, int picture_number)
986e461dc072 Initial revision
glantau
parents:
diff changeset
314 {
499
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
315 find_best_tables(s);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
316
986e461dc072 Initial revision
glantau
parents:
diff changeset
317 align_put_bits(&s->pb);
986e461dc072 Initial revision
glantau
parents:
diff changeset
318 put_bits(&s->pb, 2, s->pict_type - 1);
986e461dc072 Initial revision
glantau
parents:
diff changeset
319
986e461dc072 Initial revision
glantau
parents:
diff changeset
320 put_bits(&s->pb, 5, s->qscale);
499
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
321 if(s->msmpeg4_version<=2){
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
322 s->rl_table_index = 2;
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
323 s->rl_chroma_table_index = 2;
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
324 }
310
49e73229a5e6 msmpeg4v2 encoding
michaelni
parents: 309
diff changeset
325
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
326 s->dc_table_index = 1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
327 s->mv_table_index = 1; /* only if P frame */
986e461dc072 Initial revision
glantau
parents:
diff changeset
328 s->use_skip_mb_code = 1; /* only if P frame */
499
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
329 s->per_mb_rl_table = 0;
759
21b506d700cc fixing msmpeg4v3 encoding at bitrates <128k
michaelni
parents: 746
diff changeset
330 if(s->msmpeg4_version==4)
21b506d700cc fixing msmpeg4v3 encoding at bitrates <128k
michaelni
parents: 746
diff changeset
331 s->inter_intra_pred= (s->width*s->height < 320*240 && s->bit_rate<=II_BITRATE && s->pict_type==P_TYPE);
936
caa77cd960c0 qpel encoding
michaelni
parents: 903
diff changeset
332 //printf("%d %d %d %d %d\n", s->pict_type, s->bit_rate, s->inter_intra_pred, s->width, s->height);
499
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
333
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
334 if (s->pict_type == I_TYPE) {
519
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
335 s->slice_height= s->mb_height/1;
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
336 put_bits(&s->pb, 5, 0x16 + s->mb_height/s->slice_height);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
337
499
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
338 if(s->msmpeg4_version==4){
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
339 msmpeg4_encode_ext_header(s);
578
32c142b10263 fixing bitrate vs. kbitrate in header
michaelni
parents: 563
diff changeset
340 if(s->bit_rate>MBAC_BITRATE)
519
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
341 put_bits(&s->pb, 1, s->per_mb_rl_table);
499
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
342 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
343
457
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
344 if(s->msmpeg4_version>2){
499
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
345 if(!s->per_mb_rl_table){
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
346 code012(&s->pb, s->rl_chroma_table_index);
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
347 code012(&s->pb, s->rl_table_index);
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
348 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
349
310
49e73229a5e6 msmpeg4v2 encoding
michaelni
parents: 309
diff changeset
350 put_bits(&s->pb, 1, s->dc_table_index);
49e73229a5e6 msmpeg4v2 encoding
michaelni
parents: 309
diff changeset
351 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
352 } else {
986e461dc072 Initial revision
glantau
parents:
diff changeset
353 put_bits(&s->pb, 1, s->use_skip_mb_code);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
354
578
32c142b10263 fixing bitrate vs. kbitrate in header
michaelni
parents: 563
diff changeset
355 if(s->msmpeg4_version==4 && s->bit_rate>MBAC_BITRATE)
499
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
356 put_bits(&s->pb, 1, s->per_mb_rl_table);
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
357
457
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
358 if(s->msmpeg4_version>2){
499
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
359 if(!s->per_mb_rl_table)
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
360 code012(&s->pb, s->rl_table_index);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
361
310
49e73229a5e6 msmpeg4v2 encoding
michaelni
parents: 309
diff changeset
362 put_bits(&s->pb, 1, s->dc_table_index);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
363
310
49e73229a5e6 msmpeg4v2 encoding
michaelni
parents: 309
diff changeset
364 put_bits(&s->pb, 1, s->mv_table_index);
49e73229a5e6 msmpeg4v2 encoding
michaelni
parents: 309
diff changeset
365 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
366 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
367
499
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
368 s->esc3_level_length= 0;
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
369 s->esc3_run_length= 0;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
370
986e461dc072 Initial revision
glantau
parents:
diff changeset
371 #ifdef DEBUG
986e461dc072 Initial revision
glantau
parents:
diff changeset
372 intra_count = 0;
3177
8d1b2cc2a75b (f)printf --> av_log conversion
diego
parents: 3036
diff changeset
373 av_log(s->avctx, AV_LOG_DEBUG, "*****frame %d:\n", frame_count++);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
374 #endif
986e461dc072 Initial revision
glantau
parents:
diff changeset
375 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
376
208
2eb04d6be309 (commit by michael)
arpi_esp
parents: 204
diff changeset
377 void msmpeg4_encode_ext_header(MpegEncContext * s)
2eb04d6be309 (commit by michael)
arpi_esp
parents: 204
diff changeset
378 {
2637
ef44d24680d1 switch to native time bases
michael
parents: 2632
diff changeset
379 put_bits(&s->pb, 5, s->avctx->time_base.den / s->avctx->time_base.num); //yes 29.97 -> 29
208
2eb04d6be309 (commit by michael)
arpi_esp
parents: 204
diff changeset
380
847
f3c369b8ddca reversing header game
michaelni
parents: 774
diff changeset
381 put_bits(&s->pb, 11, FFMIN(s->bit_rate/1024, 2047));
208
2eb04d6be309 (commit by michael)
arpi_esp
parents: 204
diff changeset
382
1163
0951691c4225 fixing msmpeg4v2 encoding
michaelni
parents: 1144
diff changeset
383 if(s->msmpeg4_version>=3)
457
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
384 put_bits(&s->pb, 1, s->flipflop_rounding);
1163
0951691c4225 fixing msmpeg4v2 encoding
michaelni
parents: 1144
diff changeset
385 else
0951691c4225 fixing msmpeg4v2 encoding
michaelni
parents: 1144
diff changeset
386 assert(s->flipflop_rounding==0);
208
2eb04d6be309 (commit by michael)
arpi_esp
parents: 204
diff changeset
387 }
2eb04d6be309 (commit by michael)
arpi_esp
parents: 204
diff changeset
388
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: 1064
diff changeset
389 #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: 1064
diff changeset
390
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
391 /* predict coded block */
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1063
diff changeset
392 static inline int coded_block_pred(MpegEncContext * s, int n, uint8_t **coded_block_ptr)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
393 {
299
fb9e77674bd4 minor optimizations / simplifications
michaelni
parents: 251
diff changeset
394 int xy, wrap, pred, a, b, c;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
395
299
fb9e77674bd4 minor optimizations / simplifications
michaelni
parents: 251
diff changeset
396 xy = s->block_index[n];
1938
e2501e6e7ff7 unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents: 1739
diff changeset
397 wrap = s->b8_stride;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
398
986e461dc072 Initial revision
glantau
parents:
diff changeset
399 /* B C
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
400 * A X
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
401 */
299
fb9e77674bd4 minor optimizations / simplifications
michaelni
parents: 251
diff changeset
402 a = s->coded_block[xy - 1 ];
fb9e77674bd4 minor optimizations / simplifications
michaelni
parents: 251
diff changeset
403 b = s->coded_block[xy - 1 - wrap];
fb9e77674bd4 minor optimizations / simplifications
michaelni
parents: 251
diff changeset
404 c = s->coded_block[xy - wrap];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
405
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
406 if (b == c) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
407 pred = a;
986e461dc072 Initial revision
glantau
parents:
diff changeset
408 } else {
986e461dc072 Initial revision
glantau
parents:
diff changeset
409 pred = c;
986e461dc072 Initial revision
glantau
parents:
diff changeset
410 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
411
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
412 /* store value */
299
fb9e77674bd4 minor optimizations / simplifications
michaelni
parents: 251
diff changeset
413 *coded_block_ptr = &s->coded_block[xy];
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
414
986e461dc072 Initial revision
glantau
parents:
diff changeset
415 return pred;
986e461dc072 Initial revision
glantau
parents:
diff changeset
416 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
417
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: 1064
diff changeset
418 #ifdef 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: 1064
diff changeset
419
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
420 static void msmpeg4_encode_motion(MpegEncContext * s,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
421 int mx, int my)
986e461dc072 Initial revision
glantau
parents:
diff changeset
422 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
423 int code;
986e461dc072 Initial revision
glantau
parents:
diff changeset
424 MVTable *mv;
986e461dc072 Initial revision
glantau
parents:
diff changeset
425
986e461dc072 Initial revision
glantau
parents:
diff changeset
426 /* modulo encoding */
986e461dc072 Initial revision
glantau
parents:
diff changeset
427 /* WARNING : you cannot reach all the MVs even with the modulo
986e461dc072 Initial revision
glantau
parents:
diff changeset
428 encoding. This is a somewhat strange compromise they took !!! */
986e461dc072 Initial revision
glantau
parents:
diff changeset
429 if (mx <= -64)
986e461dc072 Initial revision
glantau
parents:
diff changeset
430 mx += 64;
986e461dc072 Initial revision
glantau
parents:
diff changeset
431 else if (mx >= 64)
986e461dc072 Initial revision
glantau
parents:
diff changeset
432 mx -= 64;
986e461dc072 Initial revision
glantau
parents:
diff changeset
433 if (my <= -64)
986e461dc072 Initial revision
glantau
parents:
diff changeset
434 my += 64;
986e461dc072 Initial revision
glantau
parents:
diff changeset
435 else if (my >= 64)
986e461dc072 Initial revision
glantau
parents:
diff changeset
436 my -= 64;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
437
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
438 mx += 32;
986e461dc072 Initial revision
glantau
parents:
diff changeset
439 my += 32;
986e461dc072 Initial revision
glantau
parents:
diff changeset
440 #if 0
986e461dc072 Initial revision
glantau
parents:
diff changeset
441 if ((unsigned)mx >= 64 ||
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
442 (unsigned)my >= 64)
3177
8d1b2cc2a75b (f)printf --> av_log conversion
diego
parents: 3036
diff changeset
443 av_log(s->avctx, AV_LOG_ERROR, "error mx=%d my=%d\n", mx, my);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
444 #endif
986e461dc072 Initial revision
glantau
parents:
diff changeset
445 mv = &mv_tables[s->mv_table_index];
986e461dc072 Initial revision
glantau
parents:
diff changeset
446
986e461dc072 Initial revision
glantau
parents:
diff changeset
447 code = mv->table_mv_index[(mx << 6) | my];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
448 put_bits(&s->pb,
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
449 mv->table_mv_bits[code],
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
450 mv->table_mv_code[code]);
986e461dc072 Initial revision
glantau
parents:
diff changeset
451 if (code == mv->n) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
452 /* escape : code litterally */
986e461dc072 Initial revision
glantau
parents:
diff changeset
453 put_bits(&s->pb, 6, mx);
986e461dc072 Initial revision
glantau
parents:
diff changeset
454 put_bits(&s->pb, 6, my);
986e461dc072 Initial revision
glantau
parents:
diff changeset
455 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
456 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
457
519
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
458 static inline void handle_slices(MpegEncContext *s){
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
459 if (s->mb_x == 0) {
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
460 if (s->slice_height && (s->mb_y % s->slice_height) == 0) {
983
ca2a303ea039 fixed wmv2 slices
michaelni
parents: 936
diff changeset
461 if(s->msmpeg4_version < 4){
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 743
diff changeset
462 ff_mpeg4_clean_buffers(s);
519
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
463 }
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
464 s->first_slice_line = 1;
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
465 } else {
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
466 s->first_slice_line = 0;
519
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
467 }
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
468 }
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
469 }
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
470
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
471 void msmpeg4_encode_mb(MpegEncContext * s,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
472 DCTELEM block[6][64],
986e461dc072 Initial revision
glantau
parents:
diff changeset
473 int motion_x, int motion_y)
986e461dc072 Initial revision
glantau
parents:
diff changeset
474 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
475 int cbp, coded_cbp, i;
986e461dc072 Initial revision
glantau
parents:
diff changeset
476 int pred_x, pred_y;
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1063
diff changeset
477 uint8_t *coded_block;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
478
519
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
479 handle_slices(s);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
480
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
481 if (!s->mb_intra) {
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
482 /* compute cbp */
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
483 cbp = 0;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
484 for (i = 0; i < 6; i++) {
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
485 if (s->block_last_index[i] >= 0)
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
486 cbp |= 1 << (5 - i);
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
487 }
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
488 if (s->use_skip_mb_code && (cbp | motion_x | motion_y) == 0) {
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
489 /* skip macroblock */
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
490 put_bits(&s->pb, 1, 1);
1164
0e3c0c4a7b3d msmpeg4 2pass support & some related cleanup
michaelni
parents: 1163
diff changeset
491 s->last_bits++;
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
492 s->misc_bits++;
1216
b874217f906b 2pass stats fix (by ffdshow cvslog)
michaelni
parents: 1177
diff changeset
493 s->skip_count++;
1164
0e3c0c4a7b3d msmpeg4 2pass support & some related cleanup
michaelni
parents: 1163
diff changeset
494
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
495 return;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
496 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
497 if (s->use_skip_mb_code)
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
498 put_bits(&s->pb, 1, 0); /* mb coded */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
499
457
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
500 if(s->msmpeg4_version<=2){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
501 put_bits(&s->pb,
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
502 v2_mb_type[cbp&3][1],
310
49e73229a5e6 msmpeg4v2 encoding
michaelni
parents: 309
diff changeset
503 v2_mb_type[cbp&3][0]);
49e73229a5e6 msmpeg4v2 encoding
michaelni
parents: 309
diff changeset
504 if((cbp&3) != 3) coded_cbp= cbp ^ 0x3C;
49e73229a5e6 msmpeg4v2 encoding
michaelni
parents: 309
diff changeset
505 else coded_cbp= cbp;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
506
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
507 put_bits(&s->pb,
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
508 cbpy_tab[coded_cbp>>2][1],
310
49e73229a5e6 msmpeg4v2 encoding
michaelni
parents: 309
diff changeset
509 cbpy_tab[coded_cbp>>2][0]);
1164
0e3c0c4a7b3d msmpeg4 2pass support & some related cleanup
michaelni
parents: 1163
diff changeset
510
0e3c0c4a7b3d msmpeg4 2pass support & some related cleanup
michaelni
parents: 1163
diff changeset
511 s->misc_bits += get_bits_diff(s);
0e3c0c4a7b3d msmpeg4 2pass support & some related cleanup
michaelni
parents: 1163
diff changeset
512
1938
e2501e6e7ff7 unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents: 1739
diff changeset
513 h263_pred_motion(s, 0, 0, &pred_x, &pred_y);
310
49e73229a5e6 msmpeg4v2 encoding
michaelni
parents: 309
diff changeset
514 msmpeg4v2_encode_motion(s, motion_x - pred_x);
49e73229a5e6 msmpeg4v2 encoding
michaelni
parents: 309
diff changeset
515 msmpeg4v2_encode_motion(s, motion_y - pred_y);
49e73229a5e6 msmpeg4v2 encoding
michaelni
parents: 309
diff changeset
516 }else{
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
517 put_bits(&s->pb,
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
518 table_mb_non_intra[cbp + 64][1],
310
49e73229a5e6 msmpeg4v2 encoding
michaelni
parents: 309
diff changeset
519 table_mb_non_intra[cbp + 64][0]);
49e73229a5e6 msmpeg4v2 encoding
michaelni
parents: 309
diff changeset
520
1164
0e3c0c4a7b3d msmpeg4 2pass support & some related cleanup
michaelni
parents: 1163
diff changeset
521 s->misc_bits += get_bits_diff(s);
0e3c0c4a7b3d msmpeg4 2pass support & some related cleanup
michaelni
parents: 1163
diff changeset
522
310
49e73229a5e6 msmpeg4v2 encoding
michaelni
parents: 309
diff changeset
523 /* motion vector */
1938
e2501e6e7ff7 unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents: 1739
diff changeset
524 h263_pred_motion(s, 0, 0, &pred_x, &pred_y);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
525 msmpeg4_encode_motion(s, motion_x - pred_x,
310
49e73229a5e6 msmpeg4v2 encoding
michaelni
parents: 309
diff changeset
526 motion_y - pred_y);
49e73229a5e6 msmpeg4v2 encoding
michaelni
parents: 309
diff changeset
527 }
1164
0e3c0c4a7b3d msmpeg4 2pass support & some related cleanup
michaelni
parents: 1163
diff changeset
528
0e3c0c4a7b3d msmpeg4 2pass support & some related cleanup
michaelni
parents: 1163
diff changeset
529 s->mv_bits += get_bits_diff(s);
0e3c0c4a7b3d msmpeg4 2pass support & some related cleanup
michaelni
parents: 1163
diff changeset
530
0e3c0c4a7b3d msmpeg4 2pass support & some related cleanup
michaelni
parents: 1163
diff changeset
531 for (i = 0; i < 6; i++) {
0e3c0c4a7b3d msmpeg4 2pass support & some related cleanup
michaelni
parents: 1163
diff changeset
532 msmpeg4_encode_block(s, block[i], i);
0e3c0c4a7b3d msmpeg4 2pass support & some related cleanup
michaelni
parents: 1163
diff changeset
533 }
0e3c0c4a7b3d msmpeg4 2pass support & some related cleanup
michaelni
parents: 1163
diff changeset
534 s->p_tex_bits += get_bits_diff(s);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
535 } else {
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
536 /* compute cbp */
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
537 cbp = 0;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
538 coded_cbp = 0;
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
539 for (i = 0; i < 6; i++) {
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
540 int val, pred;
986e461dc072 Initial revision
glantau
parents:
diff changeset
541 val = (s->block_last_index[i] >= 1);
986e461dc072 Initial revision
glantau
parents:
diff changeset
542 cbp |= val << (5 - i);
986e461dc072 Initial revision
glantau
parents:
diff changeset
543 if (i < 4) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
544 /* predict value for close blocks only for luma */
986e461dc072 Initial revision
glantau
parents:
diff changeset
545 pred = coded_block_pred(s, i, &coded_block);
986e461dc072 Initial revision
glantau
parents:
diff changeset
546 *coded_block = val;
986e461dc072 Initial revision
glantau
parents:
diff changeset
547 val = val ^ pred;
986e461dc072 Initial revision
glantau
parents:
diff changeset
548 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
549 coded_cbp |= val << (5 - i);
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
550 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
551 #if 0
986e461dc072 Initial revision
glantau
parents:
diff changeset
552 if (coded_cbp)
986e461dc072 Initial revision
glantau
parents:
diff changeset
553 printf("cbp=%x %x\n", cbp, coded_cbp);
986e461dc072 Initial revision
glantau
parents:
diff changeset
554 #endif
986e461dc072 Initial revision
glantau
parents:
diff changeset
555
457
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
556 if(s->msmpeg4_version<=2){
310
49e73229a5e6 msmpeg4v2 encoding
michaelni
parents: 309
diff changeset
557 if (s->pict_type == I_TYPE) {
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
558 put_bits(&s->pb,
310
49e73229a5e6 msmpeg4v2 encoding
michaelni
parents: 309
diff changeset
559 v2_intra_cbpc[cbp&3][1], v2_intra_cbpc[cbp&3][0]);
49e73229a5e6 msmpeg4v2 encoding
michaelni
parents: 309
diff changeset
560 } else {
49e73229a5e6 msmpeg4v2 encoding
michaelni
parents: 309
diff changeset
561 if (s->use_skip_mb_code)
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
562 put_bits(&s->pb, 1, 0); /* mb coded */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
563 put_bits(&s->pb,
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
564 v2_mb_type[(cbp&3) + 4][1],
310
49e73229a5e6 msmpeg4v2 encoding
michaelni
parents: 309
diff changeset
565 v2_mb_type[(cbp&3) + 4][0]);
49e73229a5e6 msmpeg4v2 encoding
michaelni
parents: 309
diff changeset
566 }
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
567 put_bits(&s->pb, 1, 0); /* no AC prediction yet */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
568 put_bits(&s->pb,
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
569 cbpy_tab[cbp>>2][1],
310
49e73229a5e6 msmpeg4v2 encoding
michaelni
parents: 309
diff changeset
570 cbpy_tab[cbp>>2][0]);
49e73229a5e6 msmpeg4v2 encoding
michaelni
parents: 309
diff changeset
571 }else{
49e73229a5e6 msmpeg4v2 encoding
michaelni
parents: 309
diff changeset
572 if (s->pict_type == I_TYPE) {
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
573 put_bits(&s->pb,
2474
81a9f883a17a In that patch:
michael
parents: 2465
diff changeset
574 ff_msmp4_mb_i_table[coded_cbp][1], ff_msmp4_mb_i_table[coded_cbp][0]);
310
49e73229a5e6 msmpeg4v2 encoding
michaelni
parents: 309
diff changeset
575 } else {
49e73229a5e6 msmpeg4v2 encoding
michaelni
parents: 309
diff changeset
576 if (s->use_skip_mb_code)
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
577 put_bits(&s->pb, 1, 0); /* mb coded */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
578 put_bits(&s->pb,
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
579 table_mb_non_intra[cbp][1],
310
49e73229a5e6 msmpeg4v2 encoding
michaelni
parents: 309
diff changeset
580 table_mb_non_intra[cbp][0]);
49e73229a5e6 msmpeg4v2 encoding
michaelni
parents: 309
diff changeset
581 }
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
582 put_bits(&s->pb, 1, 0); /* no AC prediction yet */
578
32c142b10263 fixing bitrate vs. kbitrate in header
michaelni
parents: 563
diff changeset
583 if(s->inter_intra_pred){
32c142b10263 fixing bitrate vs. kbitrate in header
michaelni
parents: 563
diff changeset
584 s->h263_aic_dir=0;
32c142b10263 fixing bitrate vs. kbitrate in header
michaelni
parents: 563
diff changeset
585 put_bits(&s->pb, table_inter_intra[s->h263_aic_dir][1], table_inter_intra[s->h263_aic_dir][0]);
32c142b10263 fixing bitrate vs. kbitrate in header
michaelni
parents: 563
diff changeset
586 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
587 }
1164
0e3c0c4a7b3d msmpeg4 2pass support & some related cleanup
michaelni
parents: 1163
diff changeset
588 s->misc_bits += get_bits_diff(s);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
589
1164
0e3c0c4a7b3d msmpeg4 2pass support & some related cleanup
michaelni
parents: 1163
diff changeset
590 for (i = 0; i < 6; i++) {
0e3c0c4a7b3d msmpeg4 2pass support & some related cleanup
michaelni
parents: 1163
diff changeset
591 msmpeg4_encode_block(s, block[i], i);
0e3c0c4a7b3d msmpeg4 2pass support & some related cleanup
michaelni
parents: 1163
diff changeset
592 }
0e3c0c4a7b3d msmpeg4 2pass support & some related cleanup
michaelni
parents: 1163
diff changeset
593 s->i_tex_bits += get_bits_diff(s);
1216
b874217f906b 2pass stats fix (by ffdshow cvslog)
michaelni
parents: 1177
diff changeset
594 s->i_count++;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
595 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
596 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
597
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: 1064
diff changeset
598 #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: 1064
diff changeset
599
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
600 static inline int msmpeg4v1_pred_dc(MpegEncContext * s, int n,
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1063
diff changeset
601 int32_t **dc_val_ptr)
457
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
602 {
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
603 int i;
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
604
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
605 if (n < 4) {
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
606 i= 0;
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
607 } else {
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
608 i= n-3;
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
609 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
610
457
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
611 *dc_val_ptr= &s->last_dc[i];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
612 return s->last_dc[i];
457
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
613 }
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
614
519
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
615 static int get_dc(uint8_t *src, int stride, int scale)
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
616 {
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
617 int y;
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
618 int sum=0;
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
619 for(y=0; y<8; y++){
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
620 int x;
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
621 for(x=0; x<8; x++){
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
622 sum+=src[x + y*stride];
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
623 }
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
624 }
1261
362947395f5c fastdiv patch by (BERO <bero at geocities dot co dot jp>) with fixes & cleanup by me
michaelni
parents: 1255
diff changeset
625 return FASTDIV((sum + (scale>>1)), scale);
519
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
626 }
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
627
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
628 /* dir = 0: left, dir = 1: top prediction */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
629 static inline int msmpeg4_pred_dc(MpegEncContext * s, int n,
3781
8e79b099d354 dc_val should be signed
mru
parents: 3777
diff changeset
630 int16_t **dc_val_ptr, int *dir_ptr)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
631 {
299
fb9e77674bd4 minor optimizations / simplifications
michaelni
parents: 251
diff changeset
632 int a, b, c, wrap, pred, scale;
3781
8e79b099d354 dc_val should be signed
mru
parents: 3777
diff changeset
633 int16_t *dc_val;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
634
986e461dc072 Initial revision
glantau
parents:
diff changeset
635 /* find prediction */
986e461dc072 Initial revision
glantau
parents:
diff changeset
636 if (n < 4) {
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
637 scale = s->y_dc_scale;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
638 } else {
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
639 scale = s->c_dc_scale;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
640 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
641
299
fb9e77674bd4 minor optimizations / simplifications
michaelni
parents: 251
diff changeset
642 wrap = s->block_wrap[n];
fb9e77674bd4 minor optimizations / simplifications
michaelni
parents: 251
diff changeset
643 dc_val= s->dc_val[0] + s->block_index[n];
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
644
986e461dc072 Initial revision
glantau
parents:
diff changeset
645 /* B C
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
646 * A X
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
647 */
299
fb9e77674bd4 minor optimizations / simplifications
michaelni
parents: 251
diff changeset
648 a = dc_val[ - 1];
fb9e77674bd4 minor optimizations / simplifications
michaelni
parents: 251
diff changeset
649 b = dc_val[ - 1 - wrap];
fb9e77674bd4 minor optimizations / simplifications
michaelni
parents: 251
diff changeset
650 c = dc_val[ - wrap];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
651
983
ca2a303ea039 fixed wmv2 slices
michaelni
parents: 936
diff changeset
652 if(s->first_slice_line && (n&2)==0 && s->msmpeg4_version<4){
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 743
diff changeset
653 b=c=1024;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 743
diff changeset
654 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
655
986e461dc072 Initial revision
glantau
parents:
diff changeset
656 /* XXX: the following solution consumes divisions, but it does not
986e461dc072 Initial revision
glantau
parents:
diff changeset
657 necessitate to modify mpegvideo.c. The problem comes from the
986e461dc072 Initial revision
glantau
parents:
diff changeset
658 fact they decided to store the quantized DC (which would lead
986e461dc072 Initial revision
glantau
parents:
diff changeset
659 to problems if Q could vary !) */
2293
15cfba1b97b5 adapting existing mmx/mmx2/sse/3dnow optimizations so they work on x86_64 patch by (Aurelien Jacobs <aurel at gnuage dot org>)
michael
parents: 2031
diff changeset
660 #if (defined(ARCH_X86) || defined(ARCH_X86_64)) && !defined PIC
204
fceb435fae6b (commit by michael)
arpi_esp
parents: 201
diff changeset
661 asm volatile(
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
662 "movl %3, %%eax \n\t"
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
663 "shrl $1, %%eax \n\t"
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
664 "addl %%eax, %2 \n\t"
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
665 "addl %%eax, %1 \n\t"
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
666 "addl %0, %%eax \n\t"
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
667 "mull %4 \n\t"
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
668 "movl %%edx, %0 \n\t"
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
669 "movl %1, %%eax \n\t"
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
670 "mull %4 \n\t"
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
671 "movl %%edx, %1 \n\t"
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
672 "movl %2, %%eax \n\t"
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
673 "mull %4 \n\t"
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
674 "movl %%edx, %2 \n\t"
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
675 : "+b" (a), "+c" (b), "+D" (c)
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
676 : "g" (scale), "S" (inverse[scale])
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
677 : "%eax", "%edx"
204
fceb435fae6b (commit by michael)
arpi_esp
parents: 201
diff changeset
678 );
221
fe243b4aec02 * temporal solution for shared lib compilation
kabi
parents: 214
diff changeset
679 #else
fe243b4aec02 * temporal solution for shared lib compilation
kabi
parents: 214
diff changeset
680 /* #elif defined (ARCH_ALPHA) */
214
73df666cacc7 Alpha optimizations by Falk Hueffner <falk.hueffner@student.uni-tuebingen.de>
nickols_k
parents: 208
diff changeset
681 /* Divisions are extremely costly on Alpha; optimize the most
221
fe243b4aec02 * temporal solution for shared lib compilation
kabi
parents: 214
diff changeset
682 common case. But they are costly everywhere...
fe243b4aec02 * temporal solution for shared lib compilation
kabi
parents: 214
diff changeset
683 */
214
73df666cacc7 Alpha optimizations by Falk Hueffner <falk.hueffner@student.uni-tuebingen.de>
nickols_k
parents: 208
diff changeset
684 if (scale == 8) {
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
685 a = (a + (8 >> 1)) / 8;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
686 b = (b + (8 >> 1)) / 8;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
687 c = (c + (8 >> 1)) / 8;
214
73df666cacc7 Alpha optimizations by Falk Hueffner <falk.hueffner@student.uni-tuebingen.de>
nickols_k
parents: 208
diff changeset
688 } else {
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
689 a = FASTDIV((a + (scale >> 1)), scale);
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
690 b = FASTDIV((b + (scale >> 1)), scale);
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
691 c = FASTDIV((c + (scale >> 1)), scale);
214
73df666cacc7 Alpha optimizations by Falk Hueffner <falk.hueffner@student.uni-tuebingen.de>
nickols_k
parents: 208
diff changeset
692 }
204
fceb435fae6b (commit by michael)
arpi_esp
parents: 201
diff changeset
693 #endif
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
694 /* XXX: WARNING: they did not choose the same test as MPEG4. This
986e461dc072 Initial revision
glantau
parents:
diff changeset
695 is very important ! */
501
2241bce35bb9 fixing wmv1 bugs, it was foolish to belive that m$ would use the same dc prediction as mpeg4 just cuz they changed it a bit from msmpeg4v3
michaelni
parents: 499
diff changeset
696 if(s->msmpeg4_version>3){
519
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
697 if(s->inter_intra_pred){
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
698 uint8_t *dest;
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
699 int wrap;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
700
519
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
701 if(n==1){
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
702 pred=a;
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
703 *dir_ptr = 0;
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
704 }else if(n==2){
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
705 pred=c;
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
706 *dir_ptr = 1;
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
707 }else if(n==3){
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
708 if (abs(a - b) < abs(b - c)) {
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
709 pred = c;
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
710 *dir_ptr = 1;
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
711 } else {
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
712 pred = a;
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
713 *dir_ptr = 0;
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
714 }
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
715 }else{
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
716 if(n<4){
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
717 wrap= s->linesize;
903
22ee74da2cd3 cleanup
michaelni
parents: 847
diff changeset
718 dest= s->current_picture.data[0] + (((n>>1) + 2*s->mb_y) * 8* wrap ) + ((n&1) + 2*s->mb_x) * 8;
519
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
719 }else{
556
762c67fd4078 uvlinesize
michaelni
parents: 542
diff changeset
720 wrap= s->uvlinesize;
903
22ee74da2cd3 cleanup
michaelni
parents: 847
diff changeset
721 dest= s->current_picture.data[n-3] + (s->mb_y * 8 * wrap) + s->mb_x * 8;
519
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
722 }
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
723 if(s->mb_x==0) a= (1024 + (scale>>1))/scale;
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
724 else a= get_dc(dest-8, wrap, scale*8);
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
725 if(s->mb_y==0) c= (1024 + (scale>>1))/scale;
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
726 else c= get_dc(dest-8*wrap, wrap, scale*8);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
727
519
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
728 if (s->h263_aic_dir==0) {
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
729 pred= a;
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
730 *dir_ptr = 0;
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
731 }else if (s->h263_aic_dir==1) {
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
732 if(n==0){
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
733 pred= c;
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
734 *dir_ptr = 1;
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
735 }else{
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
736 pred= a;
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
737 *dir_ptr = 0;
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
738 }
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
739 }else if (s->h263_aic_dir==2) {
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
740 if(n==0){
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
741 pred= a;
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
742 *dir_ptr = 0;
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
743 }else{
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
744 pred= c;
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
745 *dir_ptr = 1;
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
746 }
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
747 } else {
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
748 pred= c;
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
749 *dir_ptr = 1;
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
750 }
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
751 }
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
752 }else{
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
753 if (abs(a - b) < abs(b - c)) {
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
754 pred = c;
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
755 *dir_ptr = 1;
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
756 } else {
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
757 pred = a;
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
758 *dir_ptr = 0;
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
759 }
501
2241bce35bb9 fixing wmv1 bugs, it was foolish to belive that m$ would use the same dc prediction as mpeg4 just cuz they changed it a bit from msmpeg4v3
michaelni
parents: 499
diff changeset
760 }
2241bce35bb9 fixing wmv1 bugs, it was foolish to belive that m$ would use the same dc prediction as mpeg4 just cuz they changed it a bit from msmpeg4v3
michaelni
parents: 499
diff changeset
761 }else{
2241bce35bb9 fixing wmv1 bugs, it was foolish to belive that m$ would use the same dc prediction as mpeg4 just cuz they changed it a bit from msmpeg4v3
michaelni
parents: 499
diff changeset
762 if (abs(a - b) <= abs(b - c)) {
2241bce35bb9 fixing wmv1 bugs, it was foolish to belive that m$ would use the same dc prediction as mpeg4 just cuz they changed it a bit from msmpeg4v3
michaelni
parents: 499
diff changeset
763 pred = c;
2241bce35bb9 fixing wmv1 bugs, it was foolish to belive that m$ would use the same dc prediction as mpeg4 just cuz they changed it a bit from msmpeg4v3
michaelni
parents: 499
diff changeset
764 *dir_ptr = 1;
2241bce35bb9 fixing wmv1 bugs, it was foolish to belive that m$ would use the same dc prediction as mpeg4 just cuz they changed it a bit from msmpeg4v3
michaelni
parents: 499
diff changeset
765 } else {
2241bce35bb9 fixing wmv1 bugs, it was foolish to belive that m$ would use the same dc prediction as mpeg4 just cuz they changed it a bit from msmpeg4v3
michaelni
parents: 499
diff changeset
766 pred = a;
2241bce35bb9 fixing wmv1 bugs, it was foolish to belive that m$ would use the same dc prediction as mpeg4 just cuz they changed it a bit from msmpeg4v3
michaelni
parents: 499
diff changeset
767 *dir_ptr = 0;
2241bce35bb9 fixing wmv1 bugs, it was foolish to belive that m$ would use the same dc prediction as mpeg4 just cuz they changed it a bit from msmpeg4v3
michaelni
parents: 499
diff changeset
768 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
769 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
770
986e461dc072 Initial revision
glantau
parents:
diff changeset
771 /* update predictor */
299
fb9e77674bd4 minor optimizations / simplifications
michaelni
parents: 251
diff changeset
772 *dc_val_ptr = &dc_val[0];
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
773 return pred;
986e461dc072 Initial revision
glantau
parents:
diff changeset
774 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
775
986e461dc072 Initial revision
glantau
parents:
diff changeset
776 #define DC_MAX 119
986e461dc072 Initial revision
glantau
parents:
diff changeset
777
986e461dc072 Initial revision
glantau
parents:
diff changeset
778 static void msmpeg4_encode_dc(MpegEncContext * s, int level, int n, int *dir_ptr)
986e461dc072 Initial revision
glantau
parents:
diff changeset
779 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
780 int sign, code;
986e461dc072 Initial revision
glantau
parents:
diff changeset
781 int pred;
986e461dc072 Initial revision
glantau
parents:
diff changeset
782
457
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
783 if(s->msmpeg4_version==1){
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1063
diff changeset
784 int32_t *dc_val;
457
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
785 pred = msmpeg4v1_pred_dc(s, n, &dc_val);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
786
457
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
787 /* update predictor */
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
788 *dc_val= level;
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
789 }else{
3781
8e79b099d354 dc_val should be signed
mru
parents: 3777
diff changeset
790 int16_t *dc_val;
501
2241bce35bb9 fixing wmv1 bugs, it was foolish to belive that m$ would use the same dc prediction as mpeg4 just cuz they changed it a bit from msmpeg4v3
michaelni
parents: 499
diff changeset
791 pred = msmpeg4_pred_dc(s, n, &dc_val, dir_ptr);
457
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
792
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
793 /* update predictor */
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
794 if (n < 4) {
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
795 *dc_val = level * s->y_dc_scale;
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
796 } else {
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
797 *dc_val = level * s->c_dc_scale;
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
798 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
799 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
800
986e461dc072 Initial revision
glantau
parents:
diff changeset
801 /* do the prediction */
986e461dc072 Initial revision
glantau
parents:
diff changeset
802 level -= pred;
986e461dc072 Initial revision
glantau
parents:
diff changeset
803
457
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
804 if(s->msmpeg4_version<=2){
310
49e73229a5e6 msmpeg4v2 encoding
michaelni
parents: 309
diff changeset
805 if (n < 4) {
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
806 put_bits(&s->pb,
310
49e73229a5e6 msmpeg4v2 encoding
michaelni
parents: 309
diff changeset
807 v2_dc_lum_table[level+256][1],
49e73229a5e6 msmpeg4v2 encoding
michaelni
parents: 309
diff changeset
808 v2_dc_lum_table[level+256][0]);
49e73229a5e6 msmpeg4v2 encoding
michaelni
parents: 309
diff changeset
809 }else{
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
810 put_bits(&s->pb,
310
49e73229a5e6 msmpeg4v2 encoding
michaelni
parents: 309
diff changeset
811 v2_dc_chroma_table[level+256][1],
49e73229a5e6 msmpeg4v2 encoding
michaelni
parents: 309
diff changeset
812 v2_dc_chroma_table[level+256][0]);
49e73229a5e6 msmpeg4v2 encoding
michaelni
parents: 309
diff changeset
813 }
49e73229a5e6 msmpeg4v2 encoding
michaelni
parents: 309
diff changeset
814 }else{
49e73229a5e6 msmpeg4v2 encoding
michaelni
parents: 309
diff changeset
815 sign = 0;
49e73229a5e6 msmpeg4v2 encoding
michaelni
parents: 309
diff changeset
816 if (level < 0) {
49e73229a5e6 msmpeg4v2 encoding
michaelni
parents: 309
diff changeset
817 level = -level;
49e73229a5e6 msmpeg4v2 encoding
michaelni
parents: 309
diff changeset
818 sign = 1;
49e73229a5e6 msmpeg4v2 encoding
michaelni
parents: 309
diff changeset
819 }
49e73229a5e6 msmpeg4v2 encoding
michaelni
parents: 309
diff changeset
820 code = level;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
821 if (code > DC_MAX)
310
49e73229a5e6 msmpeg4v2 encoding
michaelni
parents: 309
diff changeset
822 code = DC_MAX;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
823
310
49e73229a5e6 msmpeg4v2 encoding
michaelni
parents: 309
diff changeset
824 if (s->dc_table_index == 0) {
49e73229a5e6 msmpeg4v2 encoding
michaelni
parents: 309
diff changeset
825 if (n < 4) {
2465
5565203c95ee use dc tables from msmpeg4 instead of duplicating them patch by anonymous
michael
parents: 2464
diff changeset
826 put_bits(&s->pb, ff_table0_dc_lum[code][1], ff_table0_dc_lum[code][0]);
310
49e73229a5e6 msmpeg4v2 encoding
michaelni
parents: 309
diff changeset
827 } else {
2465
5565203c95ee use dc tables from msmpeg4 instead of duplicating them patch by anonymous
michael
parents: 2464
diff changeset
828 put_bits(&s->pb, ff_table0_dc_chroma[code][1], ff_table0_dc_chroma[code][0]);
310
49e73229a5e6 msmpeg4v2 encoding
michaelni
parents: 309
diff changeset
829 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
830 } else {
310
49e73229a5e6 msmpeg4v2 encoding
michaelni
parents: 309
diff changeset
831 if (n < 4) {
2465
5565203c95ee use dc tables from msmpeg4 instead of duplicating them patch by anonymous
michael
parents: 2464
diff changeset
832 put_bits(&s->pb, ff_table1_dc_lum[code][1], ff_table1_dc_lum[code][0]);
310
49e73229a5e6 msmpeg4v2 encoding
michaelni
parents: 309
diff changeset
833 } else {
2465
5565203c95ee use dc tables from msmpeg4 instead of duplicating them patch by anonymous
michael
parents: 2464
diff changeset
834 put_bits(&s->pb, ff_table1_dc_chroma[code][1], ff_table1_dc_chroma[code][0]);
310
49e73229a5e6 msmpeg4v2 encoding
michaelni
parents: 309
diff changeset
835 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
836 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
837
310
49e73229a5e6 msmpeg4v2 encoding
michaelni
parents: 309
diff changeset
838 if (code == DC_MAX)
49e73229a5e6 msmpeg4v2 encoding
michaelni
parents: 309
diff changeset
839 put_bits(&s->pb, 8, level);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
840
310
49e73229a5e6 msmpeg4v2 encoding
michaelni
parents: 309
diff changeset
841 if (level != 0) {
49e73229a5e6 msmpeg4v2 encoding
michaelni
parents: 309
diff changeset
842 put_bits(&s->pb, 1, sign);
49e73229a5e6 msmpeg4v2 encoding
michaelni
parents: 309
diff changeset
843 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
844 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
845 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
846
986e461dc072 Initial revision
glantau
parents:
diff changeset
847 /* Encoding of a block. Very similar to MPEG4 except for a different
986e461dc072 Initial revision
glantau
parents:
diff changeset
848 escape coding (same as H263) and more vlc tables.
986e461dc072 Initial revision
glantau
parents:
diff changeset
849 */
499
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
850 static inline void msmpeg4_encode_block(MpegEncContext * s, DCTELEM * block, int n)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
851 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
852 int level, run, last, i, j, last_index;
986e461dc072 Initial revision
glantau
parents:
diff changeset
853 int last_non_zero, sign, slevel;
986e461dc072 Initial revision
glantau
parents:
diff changeset
854 int code, run_diff, dc_pred_dir;
986e461dc072 Initial revision
glantau
parents:
diff changeset
855 const RLTable *rl;
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1063
diff changeset
856 const uint8_t *scantable;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
857
986e461dc072 Initial revision
glantau
parents:
diff changeset
858 if (s->mb_intra) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
859 msmpeg4_encode_dc(s, block[0], n, &dc_pred_dir);
986e461dc072 Initial revision
glantau
parents:
diff changeset
860 i = 1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
861 if (n < 4) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
862 rl = &rl_table[s->rl_table_index];
986e461dc072 Initial revision
glantau
parents:
diff changeset
863 } else {
986e461dc072 Initial revision
glantau
parents:
diff changeset
864 rl = &rl_table[3 + s->rl_chroma_table_index];
986e461dc072 Initial revision
glantau
parents:
diff changeset
865 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
866 run_diff = 0;
706
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 601
diff changeset
867 scantable= s->intra_scantable.permutated;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
868 } else {
986e461dc072 Initial revision
glantau
parents:
diff changeset
869 i = 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
870 rl = &rl_table[3 + s->rl_table_index];
457
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
871 if(s->msmpeg4_version<=2)
310
49e73229a5e6 msmpeg4v2 encoding
michaelni
parents: 309
diff changeset
872 run_diff = 0;
49e73229a5e6 msmpeg4v2 encoding
michaelni
parents: 309
diff changeset
873 else
49e73229a5e6 msmpeg4v2 encoding
michaelni
parents: 309
diff changeset
874 run_diff = 1;
706
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 601
diff changeset
875 scantable= s->inter_scantable.permutated;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
876 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
877
499
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
878 /* recalculate block_last_index for M$ wmv1 */
936
caa77cd960c0 qpel encoding
michaelni
parents: 903
diff changeset
879 if(s->msmpeg4_version>=4 && s->block_last_index[n]>0){
499
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
880 for(last_index=63; last_index>=0; last_index--){
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
881 if(block[scantable[last_index]]) break;
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
882 }
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 743
diff changeset
883 s->block_last_index[n]= last_index;
499
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
884 }else
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
885 last_index = s->block_last_index[n];
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
886 /* AC coefs */
986e461dc072 Initial revision
glantau
parents:
diff changeset
887 last_non_zero = i - 1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
888 for (; i <= last_index; i++) {
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
889 j = scantable[i];
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
890 level = block[j];
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
891 if (level) {
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
892 run = i - last_non_zero - 1;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
893 last = (i == last_index);
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
894 sign = 0;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
895 slevel = level;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
896 if (level < 0) {
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
897 sign = 1;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
898 level = -level;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
899 }
601
76e9b51cccda faster vlc table selection
michaelni
parents: 596
diff changeset
900
499
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
901 if(level<=MAX_LEVEL && run<=MAX_RUN){
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
902 s->ac_stats[s->mb_intra][n>3][level][run][last]++;
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
903 }
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
904 #if 0
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
905 else
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
906 s->ac_stats[s->mb_intra][n>3][40][63][0]++; //esc3 like
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
907 #endif
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
908 code = get_rl_index(rl, last, run, level);
986e461dc072 Initial revision
glantau
parents:
diff changeset
909 put_bits(&s->pb, rl->table_vlc[code][1], rl->table_vlc[code][0]);
986e461dc072 Initial revision
glantau
parents:
diff changeset
910 if (code == rl->n) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
911 int level1, run1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
912
986e461dc072 Initial revision
glantau
parents:
diff changeset
913 level1 = level - rl->max_level[last][run];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
914 if (level1 < 1)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
915 goto esc2;
986e461dc072 Initial revision
glantau
parents:
diff changeset
916 code = get_rl_index(rl, last, run, level1);
986e461dc072 Initial revision
glantau
parents:
diff changeset
917 if (code == rl->n) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
918 esc2:
986e461dc072 Initial revision
glantau
parents:
diff changeset
919 put_bits(&s->pb, 1, 0);
986e461dc072 Initial revision
glantau
parents:
diff changeset
920 if (level > MAX_LEVEL)
986e461dc072 Initial revision
glantau
parents:
diff changeset
921 goto esc3;
986e461dc072 Initial revision
glantau
parents:
diff changeset
922 run1 = run - rl->max_run[last][level] - run_diff;
986e461dc072 Initial revision
glantau
parents:
diff changeset
923 if (run1 < 0)
986e461dc072 Initial revision
glantau
parents:
diff changeset
924 goto esc3;
986e461dc072 Initial revision
glantau
parents:
diff changeset
925 code = get_rl_index(rl, last, run1, level);
986e461dc072 Initial revision
glantau
parents:
diff changeset
926 if (code == rl->n) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
927 esc3:
986e461dc072 Initial revision
glantau
parents:
diff changeset
928 /* third escape */
986e461dc072 Initial revision
glantau
parents:
diff changeset
929 put_bits(&s->pb, 1, 0);
986e461dc072 Initial revision
glantau
parents:
diff changeset
930 put_bits(&s->pb, 1, last);
936
caa77cd960c0 qpel encoding
michaelni
parents: 903
diff changeset
931 if(s->msmpeg4_version>=4){
499
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
932 if(s->esc3_level_length==0){
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
933 s->esc3_level_length=8;
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
934 s->esc3_run_length= 6;
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
935 if(s->qscale<8)
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
936 put_bits(&s->pb, 6, 3);
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
937 else
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
938 put_bits(&s->pb, 8, 3);
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
939 }
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
940 put_bits(&s->pb, s->esc3_run_length, run);
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
941 put_bits(&s->pb, 1, sign);
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
942 put_bits(&s->pb, s->esc3_level_length, level);
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
943 }else{
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
944 put_bits(&s->pb, 6, run);
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
945 put_bits(&s->pb, 8, slevel & 0xff);
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
946 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
947 } else {
986e461dc072 Initial revision
glantau
parents:
diff changeset
948 /* second escape */
986e461dc072 Initial revision
glantau
parents:
diff changeset
949 put_bits(&s->pb, 1, 1);
986e461dc072 Initial revision
glantau
parents:
diff changeset
950 put_bits(&s->pb, rl->table_vlc[code][1], rl->table_vlc[code][0]);
986e461dc072 Initial revision
glantau
parents:
diff changeset
951 put_bits(&s->pb, 1, sign);
986e461dc072 Initial revision
glantau
parents:
diff changeset
952 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
953 } else {
986e461dc072 Initial revision
glantau
parents:
diff changeset
954 /* first escape */
986e461dc072 Initial revision
glantau
parents:
diff changeset
955 put_bits(&s->pb, 1, 1);
986e461dc072 Initial revision
glantau
parents:
diff changeset
956 put_bits(&s->pb, rl->table_vlc[code][1], rl->table_vlc[code][0]);
986e461dc072 Initial revision
glantau
parents:
diff changeset
957 put_bits(&s->pb, 1, sign);
986e461dc072 Initial revision
glantau
parents:
diff changeset
958 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
959 } else {
986e461dc072 Initial revision
glantau
parents:
diff changeset
960 put_bits(&s->pb, 1, sign);
986e461dc072 Initial revision
glantau
parents:
diff changeset
961 }
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
962 last_non_zero = i;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
963 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
964 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
965 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
966
986e461dc072 Initial revision
glantau
parents:
diff changeset
967 /****************************************/
986e461dc072 Initial revision
glantau
parents:
diff changeset
968 /* decoding stuff */
986e461dc072 Initial revision
glantau
parents:
diff changeset
969
936
caa77cd960c0 qpel encoding
michaelni
parents: 903
diff changeset
970 static VLC mb_non_intra_vlc[4];
2474
81a9f883a17a In that patch:
michael
parents: 2465
diff changeset
971 VLC ff_msmp4_mb_i_vlc;
81a9f883a17a In that patch:
michael
parents: 2465
diff changeset
972 VLC ff_msmp4_dc_luma_vlc[2];
81a9f883a17a In that patch:
michael
parents: 2465
diff changeset
973 VLC ff_msmp4_dc_chroma_vlc[2];
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
974 static VLC v2_dc_lum_vlc;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
975 static VLC v2_dc_chroma_vlc;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
976 static VLC cbpy_vlc;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
977 static VLC v2_intra_cbpc_vlc;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
978 static VLC v2_mb_type_vlc;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
979 static VLC v2_mv_vlc;
457
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
980 static VLC v1_intra_cbpc_vlc;
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
981 static VLC v1_inter_cbpc_vlc;
519
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
982 static VLC inter_intra_vlc;
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
983
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
984 /* this table is practically identical to the one from h263 except that its inverted */
468
1e23eae32087 Minor warning cleanup.
mellum
parents: 457
diff changeset
985 static void init_h263_dc_for_msmpeg4(void)
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
986 {
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
987 int level, uni_code, uni_len;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
988
309
32485ad4cc4e fixing msmpeg4v2 bugs (is bugfree now afaik)
michaelni
parents: 307
diff changeset
989 for(level=-256; level<256; level++){
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
990 int size, v, l;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
991 /* find number of bits */
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
992 size = 0;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
993 v = abs(level);
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
994 while (v) {
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
995 v >>= 1;
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
996 size++;
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
997 }
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
998
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
999 if (level < 0)
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1000 l= (-level) ^ ((1 << size) - 1);
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1001 else
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1002 l= level;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1003
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1004 /* luminance h263 */
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1005 uni_code= DCtab_lum[size][0];
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1006 uni_len = DCtab_lum[size][1];
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1007 uni_code ^= (1<<uni_len)-1; //M$ doesnt like compatibility
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1008
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1009 if (size > 0) {
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1010 uni_code<<=size; uni_code|=l;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1011 uni_len+=size;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1012 if (size > 8){
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1013 uni_code<<=1; uni_code|=1;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1014 uni_len++;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1015 }
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1016 }
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1017 v2_dc_lum_table[level+256][0]= uni_code;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1018 v2_dc_lum_table[level+256][1]= uni_len;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1019
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1020 /* chrominance h263 */
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1021 uni_code= DCtab_chrom[size][0];
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1022 uni_len = DCtab_chrom[size][1];
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1023 uni_code ^= (1<<uni_len)-1; //M$ doesnt like compatibility
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
1024
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1025 if (size > 0) {
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1026 uni_code<<=size; uni_code|=l;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1027 uni_len+=size;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1028 if (size > 8){
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1029 uni_code<<=1; uni_code|=1;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1030 uni_len++;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1031 }
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1032 }
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1033 v2_dc_chroma_table[level+256][0]= uni_code;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1034 v2_dc_chroma_table[level+256][1]= uni_len;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1035
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1036 }
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1037 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1038
986e461dc072 Initial revision
glantau
parents:
diff changeset
1039 /* init all vlc decoding tables */
499
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
1040 int ff_msmpeg4_decode_init(MpegEncContext *s)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1041 {
483
97da217aed7f fixed multiple allocation bug
bellard
parents: 468
diff changeset
1042 static int done = 0;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1043 int i;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1044 MVTable *mv;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1045
499
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
1046 common_init(s);
483
97da217aed7f fixed multiple allocation bug
bellard
parents: 468
diff changeset
1047
97da217aed7f fixed multiple allocation bug
bellard
parents: 468
diff changeset
1048 if (!done) {
97da217aed7f fixed multiple allocation bug
bellard
parents: 468
diff changeset
1049 done = 1;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1050
483
97da217aed7f fixed multiple allocation bug
bellard
parents: 468
diff changeset
1051 for(i=0;i<NB_RL_TABLES;i++) {
2370
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2293
diff changeset
1052 init_rl(&rl_table[i], 1);
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2293
diff changeset
1053 init_vlc_rl(&rl_table[i], 1);
483
97da217aed7f fixed multiple allocation bug
bellard
parents: 468
diff changeset
1054 }
97da217aed7f fixed multiple allocation bug
bellard
parents: 468
diff changeset
1055 for(i=0;i<2;i++) {
97da217aed7f fixed multiple allocation bug
bellard
parents: 468
diff changeset
1056 mv = &mv_tables[i];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
1057 init_vlc(&mv->vlc, MV_VLC_BITS, mv->n + 1,
483
97da217aed7f fixed multiple allocation bug
bellard
parents: 468
diff changeset
1058 mv->table_mv_bits, 1, 1,
2370
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2293
diff changeset
1059 mv->table_mv_code, 2, 2, 1);
483
97da217aed7f fixed multiple allocation bug
bellard
parents: 468
diff changeset
1060 }
97da217aed7f fixed multiple allocation bug
bellard
parents: 468
diff changeset
1061
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
1062 init_vlc(&ff_msmp4_dc_luma_vlc[0], DC_VLC_BITS, 120,
2465
5565203c95ee use dc tables from msmpeg4 instead of duplicating them patch by anonymous
michael
parents: 2464
diff changeset
1063 &ff_table0_dc_lum[0][1], 8, 4,
5565203c95ee use dc tables from msmpeg4 instead of duplicating them patch by anonymous
michael
parents: 2464
diff changeset
1064 &ff_table0_dc_lum[0][0], 8, 4, 1);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
1065 init_vlc(&ff_msmp4_dc_chroma_vlc[0], DC_VLC_BITS, 120,
2465
5565203c95ee use dc tables from msmpeg4 instead of duplicating them patch by anonymous
michael
parents: 2464
diff changeset
1066 &ff_table0_dc_chroma[0][1], 8, 4,
5565203c95ee use dc tables from msmpeg4 instead of duplicating them patch by anonymous
michael
parents: 2464
diff changeset
1067 &ff_table0_dc_chroma[0][0], 8, 4, 1);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
1068 init_vlc(&ff_msmp4_dc_luma_vlc[1], DC_VLC_BITS, 120,
2465
5565203c95ee use dc tables from msmpeg4 instead of duplicating them patch by anonymous
michael
parents: 2464
diff changeset
1069 &ff_table1_dc_lum[0][1], 8, 4,
5565203c95ee use dc tables from msmpeg4 instead of duplicating them patch by anonymous
michael
parents: 2464
diff changeset
1070 &ff_table1_dc_lum[0][0], 8, 4, 1);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
1071 init_vlc(&ff_msmp4_dc_chroma_vlc[1], DC_VLC_BITS, 120,
2465
5565203c95ee use dc tables from msmpeg4 instead of duplicating them patch by anonymous
michael
parents: 2464
diff changeset
1072 &ff_table1_dc_chroma[0][1], 8, 4,
5565203c95ee use dc tables from msmpeg4 instead of duplicating them patch by anonymous
michael
parents: 2464
diff changeset
1073 &ff_table1_dc_chroma[0][0], 8, 4, 1);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
1074
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
1075 init_vlc(&v2_dc_lum_vlc, DC_VLC_BITS, 512,
483
97da217aed7f fixed multiple allocation bug
bellard
parents: 468
diff changeset
1076 &v2_dc_lum_table[0][1], 8, 4,
2370
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2293
diff changeset
1077 &v2_dc_lum_table[0][0], 8, 4, 1);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
1078 init_vlc(&v2_dc_chroma_vlc, DC_VLC_BITS, 512,
483
97da217aed7f fixed multiple allocation bug
bellard
parents: 468
diff changeset
1079 &v2_dc_chroma_table[0][1], 8, 4,
2370
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2293
diff changeset
1080 &v2_dc_chroma_table[0][0], 8, 4, 1);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
1081
531
f5d7fcc81787 get_vlc() optimizations
michaelni
parents: 519
diff changeset
1082 init_vlc(&cbpy_vlc, CBPY_VLC_BITS, 16,
483
97da217aed7f fixed multiple allocation bug
bellard
parents: 468
diff changeset
1083 &cbpy_tab[0][1], 2, 1,
2370
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2293
diff changeset
1084 &cbpy_tab[0][0], 2, 1, 1);
531
f5d7fcc81787 get_vlc() optimizations
michaelni
parents: 519
diff changeset
1085 init_vlc(&v2_intra_cbpc_vlc, V2_INTRA_CBPC_VLC_BITS, 4,
483
97da217aed7f fixed multiple allocation bug
bellard
parents: 468
diff changeset
1086 &v2_intra_cbpc[0][1], 2, 1,
2370
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2293
diff changeset
1087 &v2_intra_cbpc[0][0], 2, 1, 1);
531
f5d7fcc81787 get_vlc() optimizations
michaelni
parents: 519
diff changeset
1088 init_vlc(&v2_mb_type_vlc, V2_MB_TYPE_VLC_BITS, 8,
483
97da217aed7f fixed multiple allocation bug
bellard
parents: 468
diff changeset
1089 &v2_mb_type[0][1], 2, 1,
2370
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2293
diff changeset
1090 &v2_mb_type[0][0], 2, 1, 1);
531
f5d7fcc81787 get_vlc() optimizations
michaelni
parents: 519
diff changeset
1091 init_vlc(&v2_mv_vlc, V2_MV_VLC_BITS, 33,
483
97da217aed7f fixed multiple allocation bug
bellard
parents: 468
diff changeset
1092 &mvtab[0][1], 2, 1,
2370
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2293
diff changeset
1093 &mvtab[0][0], 2, 1, 1);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1094
936
caa77cd960c0 qpel encoding
michaelni
parents: 903
diff changeset
1095 for(i=0; i<4; i++){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
1096 init_vlc(&mb_non_intra_vlc[i], MB_NON_INTRA_VLC_BITS, 128,
936
caa77cd960c0 qpel encoding
michaelni
parents: 903
diff changeset
1097 &wmv2_inter_table[i][0][1], 8, 4,
2370
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2293
diff changeset
1098 &wmv2_inter_table[i][0][0], 8, 4, 1); //FIXME name?
936
caa77cd960c0 qpel encoding
michaelni
parents: 903
diff changeset
1099 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
1100
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
1101 init_vlc(&ff_msmp4_mb_i_vlc, MB_INTRA_VLC_BITS, 64,
2474
81a9f883a17a In that patch:
michael
parents: 2465
diff changeset
1102 &ff_msmp4_mb_i_table[0][1], 4, 2,
81a9f883a17a In that patch:
michael
parents: 2465
diff changeset
1103 &ff_msmp4_mb_i_table[0][0], 4, 2, 1);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
1104
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
1105 init_vlc(&v1_intra_cbpc_vlc, V1_INTRA_CBPC_VLC_BITS, 8,
483
97da217aed7f fixed multiple allocation bug
bellard
parents: 468
diff changeset
1106 intra_MCBPC_bits, 1, 1,
2370
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2293
diff changeset
1107 intra_MCBPC_code, 1, 1, 1);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
1108 init_vlc(&v1_inter_cbpc_vlc, V1_INTER_CBPC_VLC_BITS, 25,
483
97da217aed7f fixed multiple allocation bug
bellard
parents: 468
diff changeset
1109 inter_MCBPC_bits, 1, 1,
2370
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2293
diff changeset
1110 inter_MCBPC_code, 1, 1, 1);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
1111
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
1112 init_vlc(&inter_intra_vlc, INTER_INTRA_VLC_BITS, 4,
519
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
1113 &table_inter_intra[0][1], 2, 1,
2370
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2293
diff changeset
1114 &table_inter_intra[0][0], 2, 1, 1);
483
97da217aed7f fixed multiple allocation bug
bellard
parents: 468
diff changeset
1115 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
1116
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 743
diff changeset
1117 switch(s->msmpeg4_version){
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 743
diff changeset
1118 case 1:
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 743
diff changeset
1119 case 2:
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 743
diff changeset
1120 s->decode_mb= msmpeg4v12_decode_mb;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 743
diff changeset
1121 break;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 743
diff changeset
1122 case 3:
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 743
diff changeset
1123 case 4:
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 743
diff changeset
1124 s->decode_mb= msmpeg4v34_decode_mb;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 743
diff changeset
1125 break;
936
caa77cd960c0 qpel encoding
michaelni
parents: 903
diff changeset
1126 case 5:
caa77cd960c0 qpel encoding
michaelni
parents: 903
diff changeset
1127 s->decode_mb= wmv2_decode_mb;
2474
81a9f883a17a In that patch:
michael
parents: 2465
diff changeset
1128 case 6:
3359
87187ebe2c28 Rename VC9 to VC1 as there is no such thing as VC9
kostya
parents: 3177
diff changeset
1129 //FIXME + TODO VC1 decode mb
936
caa77cd960c0 qpel encoding
michaelni
parents: 903
diff changeset
1130 break;
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 743
diff changeset
1131 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
1132
769
9f8c4905928b fixing decoding of streams with no keyframe at the start
michaelni
parents: 759
diff changeset
1133 s->slice_height= s->mb_height; //to avoid 1/0 if the first frame isnt a keyframe
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
1134
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1135 return 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1136 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1137
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1138 int msmpeg4_decode_picture_header(MpegEncContext * s)
300
d874359e58f1 msmpeg4v2 header parser & some dump bits code behind #if 0
michaelni
parents: 299
diff changeset
1139 {
499
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
1140 int code;
300
d874359e58f1 msmpeg4v2 header parser & some dump bits code behind #if 0
michaelni
parents: 299
diff changeset
1141
311
ac677a84d5df wmv1 header parser (unfinished)
michaelni
parents: 310
diff changeset
1142 #if 0
ac677a84d5df wmv1 header parser (unfinished)
michaelni
parents: 310
diff changeset
1143 {
ac677a84d5df wmv1 header parser (unfinished)
michaelni
parents: 310
diff changeset
1144 int i;
1025
1f9afd8b9131 GetBitContext.size is allways multiplied by 8 -> use size_in_bits to avoid useless *8 in a few inner loops
michaelni
parents: 983
diff changeset
1145 for(i=0; i<s->gb.size_in_bits; i++)
3177
8d1b2cc2a75b (f)printf --> av_log conversion
diego
parents: 3036
diff changeset
1146 av_log(s->avctx, AV_LOG_DEBUG, "%d", get_bits1(&s->gb));
311
ac677a84d5df wmv1 header parser (unfinished)
michaelni
parents: 310
diff changeset
1147 // get_bits1(&s->gb);
3177
8d1b2cc2a75b (f)printf --> av_log conversion
diego
parents: 3036
diff changeset
1148 av_log(s->avctx, AV_LOG_DEBUG, "END\n");
311
ac677a84d5df wmv1 header parser (unfinished)
michaelni
parents: 310
diff changeset
1149 return -1;
ac677a84d5df wmv1 header parser (unfinished)
michaelni
parents: 310
diff changeset
1150 }
ac677a84d5df wmv1 header parser (unfinished)
michaelni
parents: 310
diff changeset
1151 #endif
457
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1152
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1153 if(s->msmpeg4_version==1){
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1154 int start_code, num;
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1155 start_code = (get_bits(&s->gb, 16)<<16) | get_bits(&s->gb, 16);
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1156 if(start_code!=0x00000100){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1399
diff changeset
1157 av_log(s->avctx, AV_LOG_ERROR, "invalid startcode\n");
457
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1158 return -1;
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1159 }
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1160
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1161 num= get_bits(&s->gb, 5); // frame number */
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1162 }
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1163
300
d874359e58f1 msmpeg4v2 header parser & some dump bits code behind #if 0
michaelni
parents: 299
diff changeset
1164 s->pict_type = get_bits(&s->gb, 2) + 1;
d874359e58f1 msmpeg4v2 header parser & some dump bits code behind #if 0
michaelni
parents: 299
diff changeset
1165 if (s->pict_type != I_TYPE &&
457
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1166 s->pict_type != P_TYPE){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1399
diff changeset
1167 av_log(s->avctx, AV_LOG_ERROR, "invalid picture type\n");
300
d874359e58f1 msmpeg4v2 header parser & some dump bits code behind #if 0
michaelni
parents: 299
diff changeset
1168 return -1;
457
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1169 }
519
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
1170 #if 0
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
1171 {
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
1172 static int had_i=0;
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
1173 if(s->pict_type == I_TYPE) had_i=1;
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
1174 if(!had_i) return -1;
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
1175 }
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
1176 #endif
1651
ccf7c96a630f h263 modified quantization fix
michael
parents: 1598
diff changeset
1177 s->chroma_qscale= s->qscale = get_bits(&s->gb, 5);
1063
fdeac9642346 check for qscale==0 (fixes 1/0 on one corrupted stream)
michaelni
parents: 1057
diff changeset
1178 if(s->qscale==0){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1399
diff changeset
1179 av_log(s->avctx, AV_LOG_ERROR, "invalid qscale\n");
1063
fdeac9642346 check for qscale==0 (fixes 1/0 on one corrupted stream)
michaelni
parents: 1057
diff changeset
1180 return -1;
fdeac9642346 check for qscale==0 (fixes 1/0 on one corrupted stream)
michaelni
parents: 1057
diff changeset
1181 }
300
d874359e58f1 msmpeg4v2 header parser & some dump bits code behind #if 0
michaelni
parents: 299
diff changeset
1182
d874359e58f1 msmpeg4v2 header parser & some dump bits code behind #if 0
michaelni
parents: 299
diff changeset
1183 if (s->pict_type == I_TYPE) {
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
1184 code = get_bits(&s->gb, 5);
457
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1185 if(s->msmpeg4_version==1){
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1186 if(code==0 || code>s->mb_height){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1399
diff changeset
1187 av_log(s->avctx, AV_LOG_ERROR, "invalid slice height %d\n", code);
457
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1188 return -1;
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1189 }
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1190
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1191 s->slice_height = code;
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1192 }else{
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1193 /* 0x17: one slice, 0x18: two slices, ... */
519
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
1194 if (code < 0x17){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1399
diff changeset
1195 av_log(s->avctx, AV_LOG_ERROR, "error, slice code was %X\n", code);
457
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1196 return -1;
519
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
1197 }
457
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1198
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1199 s->slice_height = s->mb_height / (code - 0x16);
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1200 }
311
ac677a84d5df wmv1 header parser (unfinished)
michaelni
parents: 310
diff changeset
1201
ac677a84d5df wmv1 header parser (unfinished)
michaelni
parents: 310
diff changeset
1202 switch(s->msmpeg4_version){
457
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1203 case 1:
311
ac677a84d5df wmv1 header parser (unfinished)
michaelni
parents: 310
diff changeset
1204 case 2:
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1205 s->rl_chroma_table_index = 2;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1206 s->rl_table_index = 2;
300
d874359e58f1 msmpeg4v2 header parser & some dump bits code behind #if 0
michaelni
parents: 299
diff changeset
1207
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1208 s->dc_table_index = 0; //not used
311
ac677a84d5df wmv1 header parser (unfinished)
michaelni
parents: 310
diff changeset
1209 break;
ac677a84d5df wmv1 header parser (unfinished)
michaelni
parents: 310
diff changeset
1210 case 3:
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1211 s->rl_chroma_table_index = decode012(&s->gb);
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1212 s->rl_table_index = decode012(&s->gb);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1213
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1214 s->dc_table_index = get_bits1(&s->gb);
311
ac677a84d5df wmv1 header parser (unfinished)
michaelni
parents: 310
diff changeset
1215 break;
ac677a84d5df wmv1 header parser (unfinished)
michaelni
parents: 310
diff changeset
1216 case 4:
499
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
1217 msmpeg4_decode_ext_header(s, (2+5+5+17+7)/8);
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
1218
578
32c142b10263 fixing bitrate vs. kbitrate in header
michaelni
parents: 563
diff changeset
1219 if(s->bit_rate > MBAC_BITRATE) s->per_mb_rl_table= get_bits1(&s->gb);
32c142b10263 fixing bitrate vs. kbitrate in header
michaelni
parents: 563
diff changeset
1220 else s->per_mb_rl_table= 0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
1221
499
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
1222 if(!s->per_mb_rl_table){
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
1223 s->rl_chroma_table_index = decode012(&s->gb);
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
1224 s->rl_table_index = decode012(&s->gb);
311
ac677a84d5df wmv1 header parser (unfinished)
michaelni
parents: 310
diff changeset
1225 }
ac677a84d5df wmv1 header parser (unfinished)
michaelni
parents: 310
diff changeset
1226
499
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
1227 s->dc_table_index = get_bits1(&s->gb);
519
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
1228 s->inter_intra_pred= 0;
311
ac677a84d5df wmv1 header parser (unfinished)
michaelni
parents: 310
diff changeset
1229 break;
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1230 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1231 s->no_rounding = 1;
1388
b5c65adac96a debug stuff
michaelni
parents: 1325
diff changeset
1232 if(s->avctx->debug&FF_DEBUG_PICT_INFO)
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
1233 av_log(s->avctx, AV_LOG_DEBUG, "qscale:%d rlc:%d rl:%d dc:%d mbrl:%d slice:%d \n",
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
1234 s->qscale,
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
1235 s->rl_chroma_table_index,
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
1236 s->rl_table_index,
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
1237 s->dc_table_index,
519
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
1238 s->per_mb_rl_table,
1388
b5c65adac96a debug stuff
michaelni
parents: 1325
diff changeset
1239 s->slice_height);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1240 } else {
457
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1241 switch(s->msmpeg4_version){
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1242 case 1:
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1243 case 2:
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1244 if(s->msmpeg4_version==1)
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1245 s->use_skip_mb_code = 1;
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1246 else
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1247 s->use_skip_mb_code = get_bits1(&s->gb);
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1248 s->rl_table_index = 2;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1249 s->rl_chroma_table_index = s->rl_table_index;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1250 s->dc_table_index = 0; //not used
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1251 s->mv_table_index = 0;
457
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1252 break;
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1253 case 3:
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1254 s->use_skip_mb_code = get_bits1(&s->gb);
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1255 s->rl_table_index = decode012(&s->gb);
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1256 s->rl_chroma_table_index = s->rl_table_index;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1257
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1258 s->dc_table_index = get_bits1(&s->gb);
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1259
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1260 s->mv_table_index = get_bits1(&s->gb);
457
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1261 break;
499
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
1262 case 4:
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
1263 s->use_skip_mb_code = get_bits1(&s->gb);
519
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
1264
578
32c142b10263 fixing bitrate vs. kbitrate in header
michaelni
parents: 563
diff changeset
1265 if(s->bit_rate > MBAC_BITRATE) s->per_mb_rl_table= get_bits1(&s->gb);
32c142b10263 fixing bitrate vs. kbitrate in header
michaelni
parents: 563
diff changeset
1266 else s->per_mb_rl_table= 0;
519
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
1267
499
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
1268 if(!s->per_mb_rl_table){
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
1269 s->rl_table_index = decode012(&s->gb);
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
1270 s->rl_chroma_table_index = s->rl_table_index;
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
1271 }
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
1272
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
1273 s->dc_table_index = get_bits1(&s->gb);
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
1274
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
1275 s->mv_table_index = get_bits1(&s->gb);
578
32c142b10263 fixing bitrate vs. kbitrate in header
michaelni
parents: 563
diff changeset
1276 s->inter_intra_pred= (s->width*s->height < 320*240 && s->bit_rate<=II_BITRATE);
499
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
1277 break;
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1278 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
1279
1388
b5c65adac96a debug stuff
michaelni
parents: 1325
diff changeset
1280 if(s->avctx->debug&FF_DEBUG_PICT_INFO)
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
1281 av_log(s->avctx, AV_LOG_DEBUG, "skip:%d rl:%d rlc:%d dc:%d mv:%d mbrl:%d qp:%d \n",
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
1282 s->use_skip_mb_code,
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
1283 s->rl_table_index,
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
1284 s->rl_chroma_table_index,
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
1285 s->dc_table_index,
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
1286 s->mv_table_index,
519
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
1287 s->per_mb_rl_table,
1388
b5c65adac96a debug stuff
michaelni
parents: 1325
diff changeset
1288 s->qscale);
b5c65adac96a debug stuff
michaelni
parents: 1325
diff changeset
1289
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
1290 if(s->flipflop_rounding){
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
1291 s->no_rounding ^= 1;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
1292 }else{
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
1293 s->no_rounding = 0;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
1294 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1295 }
936
caa77cd960c0 qpel encoding
michaelni
parents: 903
diff changeset
1296 //printf("%d %d %d %d %d\n", s->pict_type, s->bit_rate, s->inter_intra_pred, s->width, s->height);
499
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
1297
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
1298 s->esc3_level_length= 0;
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
1299 s->esc3_run_length= 0;
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1300
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1301 #ifdef DEBUG
3177
8d1b2cc2a75b (f)printf --> av_log conversion
diego
parents: 3036
diff changeset
1302 av_log(s->avctx, AV_LOG_DEBUG, "*****frame %d:\n", frame_count++);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1303 #endif
986e461dc072 Initial revision
glantau
parents:
diff changeset
1304 return 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1305 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1306
208
2eb04d6be309 (commit by michael)
arpi_esp
parents: 204
diff changeset
1307 int msmpeg4_decode_ext_header(MpegEncContext * s, int buf_size)
2eb04d6be309 (commit by michael)
arpi_esp
parents: 204
diff changeset
1308 {
457
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1309 int left= buf_size*8 - get_bits_count(&s->gb);
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1310 int length= s->msmpeg4_version>=3 ? 17 : 16;
208
2eb04d6be309 (commit by michael)
arpi_esp
parents: 204
diff changeset
1311 /* the alt_bitstream reader could read over the end so we need to check it */
457
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1312 if(left>=length && left<length+8)
208
2eb04d6be309 (commit by michael)
arpi_esp
parents: 204
diff changeset
1313 {
251
75091bfc577b fixing msmpeg4 decoding if fps < 16 (i thought it was a indicator for the ext header, its the fps indeed)
michaelni
parents: 246
diff changeset
1314 int fps;
75091bfc577b fixing msmpeg4 decoding if fps < 16 (i thought it was a indicator for the ext header, its the fps indeed)
michaelni
parents: 246
diff changeset
1315
75091bfc577b fixing msmpeg4 decoding if fps < 16 (i thought it was a indicator for the ext header, its the fps indeed)
michaelni
parents: 246
diff changeset
1316 fps= get_bits(&s->gb, 5);
578
32c142b10263 fixing bitrate vs. kbitrate in header
michaelni
parents: 563
diff changeset
1317 s->bit_rate= get_bits(&s->gb, 11)*1024;
457
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1318 if(s->msmpeg4_version>=3)
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1319 s->flipflop_rounding= get_bits1(&s->gb);
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1320 else
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1321 s->flipflop_rounding= 0;
251
75091bfc577b fixing msmpeg4 decoding if fps < 16 (i thought it was a indicator for the ext header, its the fps indeed)
michaelni
parents: 246
diff changeset
1322
578
32c142b10263 fixing bitrate vs. kbitrate in header
michaelni
parents: 563
diff changeset
1323 // printf("fps:%2d bps:%2d roundingType:%1d\n", fps, s->bit_rate/1024, s->flipflop_rounding);
457
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1324 }
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1325 else if(left<length+8)
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1326 {
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1327 s->flipflop_rounding= 0;
1399
08f82699fc71 skip ext header missing message for msmpeg4v2
michaelni
parents: 1388
diff changeset
1328 if(s->msmpeg4_version != 2)
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1399
diff changeset
1329 av_log(s->avctx, AV_LOG_ERROR, "ext header missing, %d left\n", left);
208
2eb04d6be309 (commit by michael)
arpi_esp
parents: 204
diff changeset
1330 }
2eb04d6be309 (commit by michael)
arpi_esp
parents: 204
diff changeset
1331 else
2eb04d6be309 (commit by michael)
arpi_esp
parents: 204
diff changeset
1332 {
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1399
diff changeset
1333 av_log(s->avctx, AV_LOG_ERROR, "I frame too long, ignoring ext header\n");
208
2eb04d6be309 (commit by michael)
arpi_esp
parents: 204
diff changeset
1334 }
251
75091bfc577b fixing msmpeg4 decoding if fps < 16 (i thought it was a indicator for the ext header, its the fps indeed)
michaelni
parents: 246
diff changeset
1335
208
2eb04d6be309 (commit by michael)
arpi_esp
parents: 204
diff changeset
1336 return 0;
2eb04d6be309 (commit by michael)
arpi_esp
parents: 204
diff changeset
1337 }
2eb04d6be309 (commit by michael)
arpi_esp
parents: 204
diff changeset
1338
440
000aeeac27a2 * started to cleanup name clashes for onetime compilation
kabi
parents: 429
diff changeset
1339 static inline void msmpeg4_memsetw(short *tab, int val, int n)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1340 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
1341 int i;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1342 for(i=0;i<n;i++)
986e461dc072 Initial revision
glantau
parents:
diff changeset
1343 tab[i] = val;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1344 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1345
3777
20545fbb6f7c add some #ifdef CONFIG_ENCODERS/DECODERS
mru
parents: 3776
diff changeset
1346 #ifdef CONFIG_ENCODERS
310
49e73229a5e6 msmpeg4v2 encoding
michaelni
parents: 309
diff changeset
1347 static void msmpeg4v2_encode_motion(MpegEncContext * s, int val)
49e73229a5e6 msmpeg4v2 encoding
michaelni
parents: 309
diff changeset
1348 {
49e73229a5e6 msmpeg4v2 encoding
michaelni
parents: 309
diff changeset
1349 int range, bit_size, sign, code, bits;
49e73229a5e6 msmpeg4v2 encoding
michaelni
parents: 309
diff changeset
1350
49e73229a5e6 msmpeg4v2 encoding
michaelni
parents: 309
diff changeset
1351 if (val == 0) {
49e73229a5e6 msmpeg4v2 encoding
michaelni
parents: 309
diff changeset
1352 /* zero vector */
49e73229a5e6 msmpeg4v2 encoding
michaelni
parents: 309
diff changeset
1353 code = 0;
49e73229a5e6 msmpeg4v2 encoding
michaelni
parents: 309
diff changeset
1354 put_bits(&s->pb, mvtab[code][1], mvtab[code][0]);
49e73229a5e6 msmpeg4v2 encoding
michaelni
parents: 309
diff changeset
1355 } else {
49e73229a5e6 msmpeg4v2 encoding
michaelni
parents: 309
diff changeset
1356 bit_size = s->f_code - 1;
49e73229a5e6 msmpeg4v2 encoding
michaelni
parents: 309
diff changeset
1357 range = 1 << bit_size;
49e73229a5e6 msmpeg4v2 encoding
michaelni
parents: 309
diff changeset
1358 if (val <= -64)
49e73229a5e6 msmpeg4v2 encoding
michaelni
parents: 309
diff changeset
1359 val += 64;
49e73229a5e6 msmpeg4v2 encoding
michaelni
parents: 309
diff changeset
1360 else if (val >= 64)
49e73229a5e6 msmpeg4v2 encoding
michaelni
parents: 309
diff changeset
1361 val -= 64;
49e73229a5e6 msmpeg4v2 encoding
michaelni
parents: 309
diff changeset
1362
49e73229a5e6 msmpeg4v2 encoding
michaelni
parents: 309
diff changeset
1363 if (val >= 0) {
49e73229a5e6 msmpeg4v2 encoding
michaelni
parents: 309
diff changeset
1364 sign = 0;
49e73229a5e6 msmpeg4v2 encoding
michaelni
parents: 309
diff changeset
1365 } else {
49e73229a5e6 msmpeg4v2 encoding
michaelni
parents: 309
diff changeset
1366 val = -val;
49e73229a5e6 msmpeg4v2 encoding
michaelni
parents: 309
diff changeset
1367 sign = 1;
49e73229a5e6 msmpeg4v2 encoding
michaelni
parents: 309
diff changeset
1368 }
49e73229a5e6 msmpeg4v2 encoding
michaelni
parents: 309
diff changeset
1369 val--;
49e73229a5e6 msmpeg4v2 encoding
michaelni
parents: 309
diff changeset
1370 code = (val >> bit_size) + 1;
49e73229a5e6 msmpeg4v2 encoding
michaelni
parents: 309
diff changeset
1371 bits = val & (range - 1);
49e73229a5e6 msmpeg4v2 encoding
michaelni
parents: 309
diff changeset
1372
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
1373 put_bits(&s->pb, mvtab[code][1] + 1, (mvtab[code][0] << 1) | sign);
310
49e73229a5e6 msmpeg4v2 encoding
michaelni
parents: 309
diff changeset
1374 if (bit_size > 0) {
49e73229a5e6 msmpeg4v2 encoding
michaelni
parents: 309
diff changeset
1375 put_bits(&s->pb, bit_size, bits);
49e73229a5e6 msmpeg4v2 encoding
michaelni
parents: 309
diff changeset
1376 }
49e73229a5e6 msmpeg4v2 encoding
michaelni
parents: 309
diff changeset
1377 }
49e73229a5e6 msmpeg4v2 encoding
michaelni
parents: 309
diff changeset
1378 }
3777
20545fbb6f7c add some #ifdef CONFIG_ENCODERS/DECODERS
mru
parents: 3776
diff changeset
1379 #endif
310
49e73229a5e6 msmpeg4v2 encoding
michaelni
parents: 309
diff changeset
1380
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1381 /* this is identical to h263 except that its range is multiplied by 2 */
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1382 static int msmpeg4v2_decode_motion(MpegEncContext * s, int pred, int f_code)
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1383 {
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1384 int code, val, sign, shift;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1385
531
f5d7fcc81787 get_vlc() optimizations
michaelni
parents: 519
diff changeset
1386 code = get_vlc2(&s->gb, v2_mv_vlc.table, V2_MV_VLC_BITS, 2);
457
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1387 // printf("MV code %d at %d %d pred: %d\n", code, s->mb_x,s->mb_y, pred);
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1388 if (code < 0)
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1389 return 0xffff;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1390
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1391 if (code == 0)
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1392 return pred;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1393 sign = get_bits1(&s->gb);
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1394 shift = f_code - 1;
1255
625ccacd1113 decode motion & modulo optimize patch by (BERO <bero at geocities dot co dot jp>)
michaelni
parents: 1216
diff changeset
1395 val = code;
625ccacd1113 decode motion & modulo optimize patch by (BERO <bero at geocities dot co dot jp>)
michaelni
parents: 1216
diff changeset
1396 if (shift) {
625ccacd1113 decode motion & modulo optimize patch by (BERO <bero at geocities dot co dot jp>)
michaelni
parents: 1216
diff changeset
1397 val = (val - 1) << shift;
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1398 val |= get_bits(&s->gb, shift);
1255
625ccacd1113 decode motion & modulo optimize patch by (BERO <bero at geocities dot co dot jp>)
michaelni
parents: 1216
diff changeset
1399 val++;
625ccacd1113 decode motion & modulo optimize patch by (BERO <bero at geocities dot co dot jp>)
michaelni
parents: 1216
diff changeset
1400 }
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1401 if (sign)
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1402 val = -val;
457
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1403
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1404 val += pred;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1405 if (val <= -64)
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1406 val += 64;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1407 else if (val >= 64)
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1408 val -= 64;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1409
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1410 return val;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1411 }
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1412
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 743
diff changeset
1413 static int msmpeg4v12_decode_mb(MpegEncContext *s, DCTELEM block[6][64])
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1414 {
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1415 int cbp, code, i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
1416
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1417 if (s->pict_type == P_TYPE) {
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1418 if (s->use_skip_mb_code) {
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1419 if (get_bits1(&s->gb)) {
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1420 /* skip mb */
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1421 s->mb_intra = 0;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1422 for(i=0;i<6;i++)
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1423 s->block_last_index[i] = -1;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1424 s->mv_dir = MV_DIR_FORWARD;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1425 s->mv_type = MV_TYPE_16X16;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1426 s->mv[0][0][0] = 0;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1427 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
1428 s->mb_skipped = 1;
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1429 return 0;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1430 }
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1431 }
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1432
457
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1433 if(s->msmpeg4_version==2)
531
f5d7fcc81787 get_vlc() optimizations
michaelni
parents: 519
diff changeset
1434 code = get_vlc2(&s->gb, v2_mb_type_vlc.table, V2_MB_TYPE_VLC_BITS, 1);
457
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1435 else
531
f5d7fcc81787 get_vlc() optimizations
michaelni
parents: 519
diff changeset
1436 code = get_vlc2(&s->gb, v1_inter_cbpc_vlc.table, V1_INTER_CBPC_VLC_BITS, 3);
457
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1437 if(code<0 || code>7){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1399
diff changeset
1438 av_log(s->avctx, AV_LOG_ERROR, "cbpc %d invalid at %d %d\n", code, s->mb_x, s->mb_y);
457
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1439 return -1;
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1440 }
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1441
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1442 s->mb_intra = code >>2;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
1443
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1444 cbp = code & 0x3;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1445 } else {
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1446 s->mb_intra = 1;
457
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1447 if(s->msmpeg4_version==2)
531
f5d7fcc81787 get_vlc() optimizations
michaelni
parents: 519
diff changeset
1448 cbp= get_vlc2(&s->gb, v2_intra_cbpc_vlc.table, V2_INTRA_CBPC_VLC_BITS, 1);
457
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1449 else
531
f5d7fcc81787 get_vlc() optimizations
michaelni
parents: 519
diff changeset
1450 cbp= get_vlc2(&s->gb, v1_intra_cbpc_vlc.table, V1_INTRA_CBPC_VLC_BITS, 1);
457
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1451 if(cbp<0 || cbp>3){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1399
diff changeset
1452 av_log(s->avctx, AV_LOG_ERROR, "cbpc %d invalid at %d %d\n", cbp, s->mb_x, s->mb_y);
457
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1453 return -1;
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1454 }
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1455 }
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1456
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1457 if (!s->mb_intra) {
457
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1458 int mx, my, cbpy;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
1459
531
f5d7fcc81787 get_vlc() optimizations
michaelni
parents: 519
diff changeset
1460 cbpy= get_vlc2(&s->gb, cbpy_vlc.table, CBPY_VLC_BITS, 1);
457
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1461 if(cbpy<0){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1399
diff changeset
1462 av_log(s->avctx, AV_LOG_ERROR, "cbpy %d invalid at %d %d\n", cbp, s->mb_x, s->mb_y);
457
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1463 return -1;
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1464 }
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1465
457
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1466 cbp|= cbpy<<2;
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1467 if(s->msmpeg4_version==1 || (cbp&3) != 3) cbp^= 0x3C;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
1468
1938
e2501e6e7ff7 unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents: 1739
diff changeset
1469 h263_pred_motion(s, 0, 0, &mx, &my);
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1470 mx= msmpeg4v2_decode_motion(s, mx, 1);
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1471 my= msmpeg4v2_decode_motion(s, my, 1);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
1472
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1473 s->mv_dir = MV_DIR_FORWARD;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1474 s->mv_type = MV_TYPE_16X16;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1475 s->mv[0][0][0] = mx;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1476 s->mv[0][0][1] = my;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1477 } else {
457
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1478 if(s->msmpeg4_version==2){
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1479 s->ac_pred = get_bits1(&s->gb);
531
f5d7fcc81787 get_vlc() optimizations
michaelni
parents: 519
diff changeset
1480 cbp|= get_vlc2(&s->gb, cbpy_vlc.table, CBPY_VLC_BITS, 1)<<2; //FIXME check errors
457
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1481 } else{
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1482 s->ac_pred = 0;
531
f5d7fcc81787 get_vlc() optimizations
michaelni
parents: 519
diff changeset
1483 cbp|= get_vlc2(&s->gb, cbpy_vlc.table, CBPY_VLC_BITS, 1)<<2; //FIXME check errors
457
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1484 if(s->pict_type==P_TYPE) cbp^=0x3C;
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1485 }
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1486 }
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1487
2632
67171616ead6 avoid unneeded clear_blocks()
michael
parents: 2628
diff changeset
1488 s->dsp.clear_blocks(s->block[0]);
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1489 for (i = 0; i < 6; i++) {
936
caa77cd960c0 qpel encoding
michaelni
parents: 903
diff changeset
1490 if (msmpeg4_decode_block(s, block[i], i, (cbp >> (5 - i)) & 1, NULL) < 0)
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
1491 {
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1399
diff changeset
1492 av_log(s->avctx, AV_LOG_ERROR, "\nerror while decoding block: %d x %d (%d)\n", s->mb_x, s->mb_y, i);
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1493 return -1;
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
1494 }
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1495 }
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1496 return 0;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1497 }
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1498
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 743
diff changeset
1499 static int msmpeg4v34_decode_mb(MpegEncContext *s, DCTELEM block[6][64])
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1500 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
1501 int cbp, code, i;
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1063
diff changeset
1502 uint8_t *coded_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: 1164
diff changeset
1503 uint32_t * const mb_type_ptr= &s->current_picture.mb_type[ s->mb_x + s->mb_y*s->mb_stride ];
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1504
986e461dc072 Initial revision
glantau
parents:
diff changeset
1505 if (s->pict_type == P_TYPE) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
1506 if (s->use_skip_mb_code) {
21
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 7
diff changeset
1507 if (get_bits1(&s->gb)) {
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1508 /* skip mb */
986e461dc072 Initial revision
glantau
parents:
diff changeset
1509 s->mb_intra = 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1510 for(i=0;i<6;i++)
986e461dc072 Initial revision
glantau
parents:
diff changeset
1511 s->block_last_index[i] = -1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1512 s->mv_dir = MV_DIR_FORWARD;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1513 s->mv_type = MV_TYPE_16X16;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1514 s->mv[0][0][0] = 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1515 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
1516 s->mb_skipped = 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: 1164
diff changeset
1517 *mb_type_ptr = MB_TYPE_SKIP | MB_TYPE_L0 | 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: 1164
diff changeset
1518
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1519 return 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1520 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1521 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
1522
936
caa77cd960c0 qpel encoding
michaelni
parents: 903
diff changeset
1523 code = get_vlc2(&s->gb, mb_non_intra_vlc[DEFAULT_INTER_INDEX].table, MB_NON_INTRA_VLC_BITS, 3);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1524 if (code < 0)
986e461dc072 Initial revision
glantau
parents:
diff changeset
1525 return -1;
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
1526 //s->mb_intra = (code & 0x40) ? 0 : 1;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
1527 s->mb_intra = (~code & 0x40) >> 6;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
1528
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1529 cbp = code & 0x3f;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1530 } else {
986e461dc072 Initial revision
glantau
parents:
diff changeset
1531 s->mb_intra = 1;
2474
81a9f883a17a In that patch:
michael
parents: 2465
diff changeset
1532 code = get_vlc2(&s->gb, ff_msmp4_mb_i_vlc.table, MB_INTRA_VLC_BITS, 2);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1533 if (code < 0)
986e461dc072 Initial revision
glantau
parents:
diff changeset
1534 return -1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1535 /* predict coded block pattern */
986e461dc072 Initial revision
glantau
parents:
diff changeset
1536 cbp = 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1537 for(i=0;i<6;i++) {
246
214ac77c0948 * simplified indexing
kabi
parents: 228
diff changeset
1538 int val = ((code >> (5 - i)) & 1);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1539 if (i < 4) {
246
214ac77c0948 * simplified indexing
kabi
parents: 228
diff changeset
1540 int pred = coded_block_pred(s, i, &coded_val);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1541 val = val ^ pred;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1542 *coded_val = val;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1543 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1544 cbp |= val << (5 - i);
986e461dc072 Initial revision
glantau
parents:
diff changeset
1545 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1546 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1547
986e461dc072 Initial revision
glantau
parents:
diff changeset
1548 if (!s->mb_intra) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
1549 int mx, my;
499
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
1550 //printf("P at %d %d\n", s->mb_x, s->mb_y);
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
1551 if(s->per_mb_rl_table && cbp){
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
1552 s->rl_table_index = decode012(&s->gb);
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
1553 s->rl_chroma_table_index = s->rl_table_index;
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
1554 }
1938
e2501e6e7ff7 unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents: 1739
diff changeset
1555 h263_pred_motion(s, 0, 0, &mx, &my);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1556 if (msmpeg4_decode_motion(s, &mx, &my) < 0)
986e461dc072 Initial revision
glantau
parents:
diff changeset
1557 return -1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1558 s->mv_dir = MV_DIR_FORWARD;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1559 s->mv_type = MV_TYPE_16X16;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1560 s->mv[0][0][0] = mx;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1561 s->mv[0][0][1] = my;
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: 1164
diff changeset
1562 *mb_type_ptr = MB_TYPE_L0 | MB_TYPE_16x16;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1563 } else {
499
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
1564 //printf("I at %d %d %d %06X\n", s->mb_x, s->mb_y, ((cbp&3)? 1 : 0) +((cbp&0x3C)? 2 : 0), show_bits(&s->gb, 24));
21
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 7
diff changeset
1565 s->ac_pred = get_bits1(&s->gb);
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: 1164
diff changeset
1566 *mb_type_ptr = MB_TYPE_INTRA;
519
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
1567 if(s->inter_intra_pred){
531
f5d7fcc81787 get_vlc() optimizations
michaelni
parents: 519
diff changeset
1568 s->h263_aic_dir= get_vlc2(&s->gb, inter_intra_vlc.table, INTER_INTRA_VLC_BITS, 1);
519
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
1569 // printf("%d%d %d %d/", s->ac_pred, s->h263_aic_dir, s->mb_x, s->mb_y);
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
1570 }
499
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
1571 if(s->per_mb_rl_table && cbp){
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
1572 s->rl_table_index = decode012(&s->gb);
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
1573 s->rl_chroma_table_index = s->rl_table_index;
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
1574 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1575 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1576
2632
67171616ead6 avoid unneeded clear_blocks()
michael
parents: 2628
diff changeset
1577 s->dsp.clear_blocks(s->block[0]);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1578 for (i = 0; i < 6; i++) {
936
caa77cd960c0 qpel encoding
michaelni
parents: 903
diff changeset
1579 if (msmpeg4_decode_block(s, block[i], i, (cbp >> (5 - i)) & 1, NULL) < 0)
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
1580 {
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
1581 av_log(s->avctx, AV_LOG_ERROR, "\nerror while decoding block: %d x %d (%d)\n", s->mb_x, s->mb_y, i);
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
1582 return -1;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
1583 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1584 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
1585
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1586 return 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1587 }
563
61442627f857 fixes fire.avi & subtitles.avi
michaelni
parents: 556
diff changeset
1588 //#define ERROR_DETAILS
499
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
1589 static inline int msmpeg4_decode_block(MpegEncContext * s, DCTELEM * block,
936
caa77cd960c0 qpel encoding
michaelni
parents: 903
diff changeset
1590 int n, int coded, const uint8_t *scan_table)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1591 {
542
d55978a3c369 rl vlc decoding optimizations
michaelni
parents: 531
diff changeset
1592 int level, i, last, run, run_diff;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1593 int dc_pred_dir;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1594 RLTable *rl;
542
d55978a3c369 rl vlc decoding optimizations
michaelni
parents: 531
diff changeset
1595 RL_VLC_ELEM *rl_vlc;
200
6ab301aaa652 (commit by michael)
arpi_esp
parents: 195
diff changeset
1596 int qmul, qadd;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1597
986e461dc072 Initial revision
glantau
parents:
diff changeset
1598 if (s->mb_intra) {
200
6ab301aaa652 (commit by michael)
arpi_esp
parents: 195
diff changeset
1599 qmul=1;
6ab301aaa652 (commit by michael)
arpi_esp
parents: 195
diff changeset
1600 qadd=0;
6ab301aaa652 (commit by michael)
arpi_esp
parents: 195
diff changeset
1601
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
1602 /* DC coef */
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1603 level = msmpeg4_decode_dc(s, n, &dc_pred_dir);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
1604
457
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1605 if (level < 0){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1399
diff changeset
1606 av_log(s->avctx, AV_LOG_ERROR, "dc overflow- block: %d qscale: %d//\n", n, s->qscale);
519
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
1607 if(s->inter_intra_pred) level=0;
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
1608 else return -1;
457
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1609 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1610 if (n < 4) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
1611 rl = &rl_table[s->rl_table_index];
457
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1612 if(level > 256*s->y_dc_scale){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1399
diff changeset
1613 av_log(s->avctx, AV_LOG_ERROR, "dc overflow+ L qscale: %d//\n", s->qscale);
519
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
1614 if(!s->inter_intra_pred) return -1;
457
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1615 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1616 } else {
986e461dc072 Initial revision
glantau
parents:
diff changeset
1617 rl = &rl_table[3 + s->rl_chroma_table_index];
457
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1618 if(level > 256*s->c_dc_scale){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1399
diff changeset
1619 av_log(s->avctx, AV_LOG_ERROR, "dc overflow+ C qscale: %d//\n", s->qscale);
519
55b4e2248a45 wmv1 slice_height != mb_height support
michaelni
parents: 501
diff changeset
1620 if(!s->inter_intra_pred) return -1;
457
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1621 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1622 }
457
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1623 block[0] = level;
200
6ab301aaa652 (commit by michael)
arpi_esp
parents: 195
diff changeset
1624
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1625 run_diff = 0;
542
d55978a3c369 rl vlc decoding optimizations
michaelni
parents: 531
diff changeset
1626 i = 0;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1627 if (!coded) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
1628 goto not_coded;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1629 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1630 if (s->ac_pred) {
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
1631 if (dc_pred_dir == 0)
706
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 601
diff changeset
1632 scan_table = s->intra_v_scantable.permutated; /* left */
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1633 else
706
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 601
diff changeset
1634 scan_table = s->intra_h_scantable.permutated; /* top */
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1635 } else {
706
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 601
diff changeset
1636 scan_table = s->intra_scantable.permutated;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1637 }
542
d55978a3c369 rl vlc decoding optimizations
michaelni
parents: 531
diff changeset
1638 rl_vlc= rl->rl_vlc[0];
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1639 } else {
200
6ab301aaa652 (commit by michael)
arpi_esp
parents: 195
diff changeset
1640 qmul = s->qscale << 1;
6ab301aaa652 (commit by michael)
arpi_esp
parents: 195
diff changeset
1641 qadd = (s->qscale - 1) | 1;
542
d55978a3c369 rl vlc decoding optimizations
michaelni
parents: 531
diff changeset
1642 i = -1;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1643 rl = &rl_table[3 + s->rl_table_index];
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1644
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1645 if(s->msmpeg4_version==2)
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1646 run_diff = 0;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1647 else
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1648 run_diff = 1;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1649
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1650 if (!coded) {
542
d55978a3c369 rl vlc decoding optimizations
michaelni
parents: 531
diff changeset
1651 s->block_last_index[n] = i;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1652 return 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1653 }
936
caa77cd960c0 qpel encoding
michaelni
parents: 903
diff changeset
1654 if(!scan_table)
caa77cd960c0 qpel encoding
michaelni
parents: 903
diff changeset
1655 scan_table = s->inter_scantable.permutated;
542
d55978a3c369 rl vlc decoding optimizations
michaelni
parents: 531
diff changeset
1656 rl_vlc= rl->rl_vlc[s->qscale];
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1657 }
542
d55978a3c369 rl vlc decoding optimizations
michaelni
parents: 531
diff changeset
1658 {
d55978a3c369 rl vlc decoding optimizations
michaelni
parents: 531
diff changeset
1659 OPEN_READER(re, &s->gb);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1660 for(;;) {
542
d55978a3c369 rl vlc decoding optimizations
michaelni
parents: 531
diff changeset
1661 UPDATE_CACHE(re, &s->gb);
2615
0d88e3f89379 avoid UPDATE_CACHE() in GET_RL_VLC() if not needed
michael
parents: 2474
diff changeset
1662 GET_RL_VLC(level, run, re, &s->gb, rl_vlc, TEX_VLC_BITS, 2, 0);
542
d55978a3c369 rl vlc decoding optimizations
michaelni
parents: 531
diff changeset
1663 if (level==0) {
d55978a3c369 rl vlc decoding optimizations
michaelni
parents: 531
diff changeset
1664 int cache;
d55978a3c369 rl vlc decoding optimizations
michaelni
parents: 531
diff changeset
1665 cache= GET_CACHE(re, &s->gb);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1666 /* escape */
542
d55978a3c369 rl vlc decoding optimizations
michaelni
parents: 531
diff changeset
1667 if (s->msmpeg4_version==1 || (cache&0x80000000)==0) {
d55978a3c369 rl vlc decoding optimizations
michaelni
parents: 531
diff changeset
1668 if (s->msmpeg4_version==1 || (cache&0x40000000)==0) {
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1669 /* third escape */
542
d55978a3c369 rl vlc decoding optimizations
michaelni
parents: 531
diff changeset
1670 if(s->msmpeg4_version!=1) LAST_SKIP_BITS(re, &s->gb, 2);
d55978a3c369 rl vlc decoding optimizations
michaelni
parents: 531
diff changeset
1671 UPDATE_CACHE(re, &s->gb);
499
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
1672 if(s->msmpeg4_version<=3){
542
d55978a3c369 rl vlc decoding optimizations
michaelni
parents: 531
diff changeset
1673 last= SHOW_UBITS(re, &s->gb, 1); SKIP_CACHE(re, &s->gb, 1);
d55978a3c369 rl vlc decoding optimizations
michaelni
parents: 531
diff changeset
1674 run= SHOW_UBITS(re, &s->gb, 6); SKIP_CACHE(re, &s->gb, 6);
d55978a3c369 rl vlc decoding optimizations
michaelni
parents: 531
diff changeset
1675 level= SHOW_SBITS(re, &s->gb, 8); LAST_SKIP_CACHE(re, &s->gb, 8);
d55978a3c369 rl vlc decoding optimizations
michaelni
parents: 531
diff changeset
1676 SKIP_COUNTER(re, &s->gb, 1+6+8);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
1677 }else{
499
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
1678 int sign;
542
d55978a3c369 rl vlc decoding optimizations
michaelni
parents: 531
diff changeset
1679 last= SHOW_UBITS(re, &s->gb, 1); SKIP_BITS(re, &s->gb, 1);
499
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
1680 if(!s->esc3_level_length){
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
1681 int ll;
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
1682 //printf("ESC-3 %X at %d %d\n", show_bits(&s->gb, 24), s->mb_x, s->mb_y);
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
1683 if(s->qscale<8){
542
d55978a3c369 rl vlc decoding optimizations
michaelni
parents: 531
diff changeset
1684 ll= SHOW_UBITS(re, &s->gb, 3); SKIP_BITS(re, &s->gb, 3);
499
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
1685 if(ll==0){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1399
diff changeset
1686 if(SHOW_UBITS(re, &s->gb, 1)) av_log(s->avctx, AV_LOG_ERROR, "cool a new vlc code ,contact the ffmpeg developers and upload the file\n");
542
d55978a3c369 rl vlc decoding optimizations
michaelni
parents: 531
diff changeset
1687 SKIP_BITS(re, &s->gb, 1);
499
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
1688 ll=8;
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
1689 }
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
1690 }else{
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
1691 ll=2;
542
d55978a3c369 rl vlc decoding optimizations
michaelni
parents: 531
diff changeset
1692 while(ll<8 && SHOW_UBITS(re, &s->gb, 1)==0){
d55978a3c369 rl vlc decoding optimizations
michaelni
parents: 531
diff changeset
1693 ll++;
d55978a3c369 rl vlc decoding optimizations
michaelni
parents: 531
diff changeset
1694 SKIP_BITS(re, &s->gb, 1);
d55978a3c369 rl vlc decoding optimizations
michaelni
parents: 531
diff changeset
1695 }
578
32c142b10263 fixing bitrate vs. kbitrate in header
michaelni
parents: 563
diff changeset
1696 if(ll<8) SKIP_BITS(re, &s->gb, 1);
499
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
1697 }
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
1698
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
1699 s->esc3_level_length= ll;
542
d55978a3c369 rl vlc decoding optimizations
michaelni
parents: 531
diff changeset
1700 s->esc3_run_length= SHOW_UBITS(re, &s->gb, 2) + 3; SKIP_BITS(re, &s->gb, 2);
499
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
1701 //printf("level length:%d, run length: %d\n", ll, s->esc3_run_length);
578
32c142b10263 fixing bitrate vs. kbitrate in header
michaelni
parents: 563
diff changeset
1702 UPDATE_CACHE(re, &s->gb);
499
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
1703 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
1704 run= SHOW_UBITS(re, &s->gb, s->esc3_run_length);
542
d55978a3c369 rl vlc decoding optimizations
michaelni
parents: 531
diff changeset
1705 SKIP_BITS(re, &s->gb, s->esc3_run_length);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
1706
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
1707 sign= SHOW_UBITS(re, &s->gb, 1);
542
d55978a3c369 rl vlc decoding optimizations
michaelni
parents: 531
diff changeset
1708 SKIP_BITS(re, &s->gb, 1);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
1709
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
1710 level= SHOW_UBITS(re, &s->gb, s->esc3_level_length);
542
d55978a3c369 rl vlc decoding optimizations
michaelni
parents: 531
diff changeset
1711 SKIP_BITS(re, &s->gb, s->esc3_level_length);
499
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
1712 if(sign) level= -level;
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
1713 }
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
1714 //printf("level: %d, run: %d at %d %d\n", level, run, s->mb_x, s->mb_y);
457
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1715 #if 0 // waste of time / this will detect very few errors
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1716 {
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1717 const int abs_level= ABS(level);
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1718 const int run1= run - rl->max_run[last][abs_level] - run_diff;
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1719 if(abs_level<=MAX_LEVEL && run<=MAX_RUN){
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1720 if(abs_level <= rl->max_level[last][run]){
3177
8d1b2cc2a75b (f)printf --> av_log conversion
diego
parents: 3036
diff changeset
1721 av_log(s->avctx, AV_LOG_ERROR, "illegal 3. esc, vlc encoding possible\n");
457
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1722 return DECODING_AC_LOST;
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1723 }
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1724 if(abs_level <= rl->max_level[last][run]*2){
3177
8d1b2cc2a75b (f)printf --> av_log conversion
diego
parents: 3036
diff changeset
1725 av_log(s->avctx, AV_LOG_ERROR, "illegal 3. esc, esc 1 encoding possible\n");
457
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1726 return DECODING_AC_LOST;
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1727 }
499
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
1728 if(run1>=0 && abs_level <= rl->max_level[last][run1]){
3177
8d1b2cc2a75b (f)printf --> av_log conversion
diego
parents: 3036
diff changeset
1729 av_log(s->avctx, AV_LOG_ERROR, "illegal 3. esc, esc 2 encoding possible\n");
457
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1730 return DECODING_AC_LOST;
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1731 }
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1732 }
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1733 }
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1734 #endif
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
1735 //level = level * qmul + (level>0) * qadd - (level<=0) * qadd ;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
1736 if (level>0) level= level * qmul + qadd;
457
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1737 else level= level * qmul - qadd;
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1738 #if 0 // waste of time too :(
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1739 if(level>2048 || level<-2048){
3177
8d1b2cc2a75b (f)printf --> av_log conversion
diego
parents: 3036
diff changeset
1740 av_log(s->avctx, AV_LOG_ERROR, "|level| overflow in 3. esc\n");
457
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1741 return DECODING_AC_LOST;
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1742 }
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1743 #endif
542
d55978a3c369 rl vlc decoding optimizations
michaelni
parents: 531
diff changeset
1744 i+= run + 1;
d55978a3c369 rl vlc decoding optimizations
michaelni
parents: 531
diff changeset
1745 if(last) i+=192;
563
61442627f857 fixes fire.avi & subtitles.avi
michaelni
parents: 556
diff changeset
1746 #ifdef ERROR_DETAILS
61442627f857 fixes fire.avi & subtitles.avi
michaelni
parents: 556
diff changeset
1747 if(run==66)
2846
40765c51a7a9 Compilation fixes part 1 patch by (Arvind R. and Burkhard Plaum, plaum, ipf uni-stuttgart de)
michael
parents: 2639
diff changeset
1748 av_log(s->avctx, AV_LOG_ERROR, "illegal vlc code in ESC3 level=%d\n", level);
563
61442627f857 fixes fire.avi & subtitles.avi
michaelni
parents: 556
diff changeset
1749 else if((i>62 && i<192) || i>192+63)
2846
40765c51a7a9 Compilation fixes part 1 patch by (Arvind R. and Burkhard Plaum, plaum, ipf uni-stuttgart de)
michael
parents: 2639
diff changeset
1750 av_log(s->avctx, AV_LOG_ERROR, "run overflow in ESC3 i=%d run=%d level=%d\n", i, run, level);
563
61442627f857 fixes fire.avi & subtitles.avi
michaelni
parents: 556
diff changeset
1751 #endif
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1752 } else {
986e461dc072 Initial revision
glantau
parents:
diff changeset
1753 /* second escape */
542
d55978a3c369 rl vlc decoding optimizations
michaelni
parents: 531
diff changeset
1754 #if MIN_CACHE_BITS < 23
d55978a3c369 rl vlc decoding optimizations
michaelni
parents: 531
diff changeset
1755 LAST_SKIP_BITS(re, &s->gb, 2);
d55978a3c369 rl vlc decoding optimizations
michaelni
parents: 531
diff changeset
1756 UPDATE_CACHE(re, &s->gb);
d55978a3c369 rl vlc decoding optimizations
michaelni
parents: 531
diff changeset
1757 #else
d55978a3c369 rl vlc decoding optimizations
michaelni
parents: 531
diff changeset
1758 SKIP_BITS(re, &s->gb, 2);
d55978a3c369 rl vlc decoding optimizations
michaelni
parents: 531
diff changeset
1759 #endif
2615
0d88e3f89379 avoid UPDATE_CACHE() in GET_RL_VLC() if not needed
michael
parents: 2474
diff changeset
1760 GET_RL_VLC(level, run, re, &s->gb, rl_vlc, TEX_VLC_BITS, 2, 1);
542
d55978a3c369 rl vlc decoding optimizations
michaelni
parents: 531
diff changeset
1761 i+= run + rl->max_run[run>>7][level/qmul] + run_diff; //FIXME opt indexing
d55978a3c369 rl vlc decoding optimizations
michaelni
parents: 531
diff changeset
1762 level = (level ^ SHOW_SBITS(re, &s->gb, 1)) - SHOW_SBITS(re, &s->gb, 1);
d55978a3c369 rl vlc decoding optimizations
michaelni
parents: 531
diff changeset
1763 LAST_SKIP_BITS(re, &s->gb, 1);
563
61442627f857 fixes fire.avi & subtitles.avi
michaelni
parents: 556
diff changeset
1764 #ifdef ERROR_DETAILS
61442627f857 fixes fire.avi & subtitles.avi
michaelni
parents: 556
diff changeset
1765 if(run==66)
2846
40765c51a7a9 Compilation fixes part 1 patch by (Arvind R. and Burkhard Plaum, plaum, ipf uni-stuttgart de)
michael
parents: 2639
diff changeset
1766 av_log(s->avctx, AV_LOG_ERROR, "illegal vlc code in ESC2 level=%d\n", level);
563
61442627f857 fixes fire.avi & subtitles.avi
michaelni
parents: 556
diff changeset
1767 else if((i>62 && i<192) || i>192+63)
2846
40765c51a7a9 Compilation fixes part 1 patch by (Arvind R. and Burkhard Plaum, plaum, ipf uni-stuttgart de)
michael
parents: 2639
diff changeset
1768 av_log(s->avctx, AV_LOG_ERROR, "run overflow in ESC2 i=%d run=%d level=%d\n", i, run, level);
563
61442627f857 fixes fire.avi & subtitles.avi
michaelni
parents: 556
diff changeset
1769 #endif
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1770 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1771 } else {
986e461dc072 Initial revision
glantau
parents:
diff changeset
1772 /* first escape */
542
d55978a3c369 rl vlc decoding optimizations
michaelni
parents: 531
diff changeset
1773 #if MIN_CACHE_BITS < 22
d55978a3c369 rl vlc decoding optimizations
michaelni
parents: 531
diff changeset
1774 LAST_SKIP_BITS(re, &s->gb, 1);
d55978a3c369 rl vlc decoding optimizations
michaelni
parents: 531
diff changeset
1775 UPDATE_CACHE(re, &s->gb);
d55978a3c369 rl vlc decoding optimizations
michaelni
parents: 531
diff changeset
1776 #else
d55978a3c369 rl vlc decoding optimizations
michaelni
parents: 531
diff changeset
1777 SKIP_BITS(re, &s->gb, 1);
d55978a3c369 rl vlc decoding optimizations
michaelni
parents: 531
diff changeset
1778 #endif
2615
0d88e3f89379 avoid UPDATE_CACHE() in GET_RL_VLC() if not needed
michael
parents: 2474
diff changeset
1779 GET_RL_VLC(level, run, re, &s->gb, rl_vlc, TEX_VLC_BITS, 2, 1);
542
d55978a3c369 rl vlc decoding optimizations
michaelni
parents: 531
diff changeset
1780 i+= run;
d55978a3c369 rl vlc decoding optimizations
michaelni
parents: 531
diff changeset
1781 level = level + rl->max_level[run>>7][(run-1)&63] * qmul;//FIXME opt indexing
d55978a3c369 rl vlc decoding optimizations
michaelni
parents: 531
diff changeset
1782 level = (level ^ SHOW_SBITS(re, &s->gb, 1)) - SHOW_SBITS(re, &s->gb, 1);
d55978a3c369 rl vlc decoding optimizations
michaelni
parents: 531
diff changeset
1783 LAST_SKIP_BITS(re, &s->gb, 1);
563
61442627f857 fixes fire.avi & subtitles.avi
michaelni
parents: 556
diff changeset
1784 #ifdef ERROR_DETAILS
61442627f857 fixes fire.avi & subtitles.avi
michaelni
parents: 556
diff changeset
1785 if(run==66)
2846
40765c51a7a9 Compilation fixes part 1 patch by (Arvind R. and Burkhard Plaum, plaum, ipf uni-stuttgart de)
michael
parents: 2639
diff changeset
1786 av_log(s->avctx, AV_LOG_ERROR, "illegal vlc code in ESC1 level=%d\n", level);
563
61442627f857 fixes fire.avi & subtitles.avi
michaelni
parents: 556
diff changeset
1787 else if((i>62 && i<192) || i>192+63)
2846
40765c51a7a9 Compilation fixes part 1 patch by (Arvind R. and Burkhard Plaum, plaum, ipf uni-stuttgart de)
michael
parents: 2639
diff changeset
1788 av_log(s->avctx, AV_LOG_ERROR, "run overflow in ESC1 i=%d run=%d level=%d\n", i, run, level);
563
61442627f857 fixes fire.avi & subtitles.avi
michaelni
parents: 556
diff changeset
1789 #endif
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1790 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1791 } else {
542
d55978a3c369 rl vlc decoding optimizations
michaelni
parents: 531
diff changeset
1792 i+= run;
d55978a3c369 rl vlc decoding optimizations
michaelni
parents: 531
diff changeset
1793 level = (level ^ SHOW_SBITS(re, &s->gb, 1)) - SHOW_SBITS(re, &s->gb, 1);
d55978a3c369 rl vlc decoding optimizations
michaelni
parents: 531
diff changeset
1794 LAST_SKIP_BITS(re, &s->gb, 1);
563
61442627f857 fixes fire.avi & subtitles.avi
michaelni
parents: 556
diff changeset
1795 #ifdef ERROR_DETAILS
61442627f857 fixes fire.avi & subtitles.avi
michaelni
parents: 556
diff changeset
1796 if(run==66)
2846
40765c51a7a9 Compilation fixes part 1 patch by (Arvind R. and Burkhard Plaum, plaum, ipf uni-stuttgart de)
michael
parents: 2639
diff changeset
1797 av_log(s->avctx, AV_LOG_ERROR, "illegal vlc code level=%d\n", level);
563
61442627f857 fixes fire.avi & subtitles.avi
michaelni
parents: 556
diff changeset
1798 else if((i>62 && i<192) || i>192+63)
2846
40765c51a7a9 Compilation fixes part 1 patch by (Arvind R. and Burkhard Plaum, plaum, ipf uni-stuttgart de)
michael
parents: 2639
diff changeset
1799 av_log(s->avctx, AV_LOG_ERROR, "run overflow i=%d run=%d level=%d\n", i, run, level);
563
61442627f857 fixes fire.avi & subtitles.avi
michaelni
parents: 556
diff changeset
1800 #endif
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1801 }
542
d55978a3c369 rl vlc decoding optimizations
michaelni
parents: 531
diff changeset
1802 if (i > 62){
d55978a3c369 rl vlc decoding optimizations
michaelni
parents: 531
diff changeset
1803 i-= 192;
d55978a3c369 rl vlc decoding optimizations
michaelni
parents: 531
diff changeset
1804 if(i&(~63)){
1025
1f9afd8b9131 GetBitContext.size is allways multiplied by 8 -> use size_in_bits to avoid useless *8 in a few inner loops
michaelni
parents: 983
diff changeset
1805 const int left= s->gb.size_in_bits - get_bits_count(&s->gb);
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 743
diff changeset
1806 if(((i+192 == 64 && level/qmul==-1) || s->error_resilience<=1) && left>=0){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1399
diff changeset
1807 av_log(s->avctx, AV_LOG_ERROR, "ignoring overflow at %d %d\n", s->mb_x, s->mb_y);
563
61442627f857 fixes fire.avi & subtitles.avi
michaelni
parents: 556
diff changeset
1808 break;
61442627f857 fixes fire.avi & subtitles.avi
michaelni
parents: 556
diff changeset
1809 }else{
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1399
diff changeset
1810 av_log(s->avctx, AV_LOG_ERROR, "ac-tex damaged at %d %d\n", s->mb_x, s->mb_y);
563
61442627f857 fixes fire.avi & subtitles.avi
michaelni
parents: 556
diff changeset
1811 return -1;
61442627f857 fixes fire.avi & subtitles.avi
michaelni
parents: 556
diff changeset
1812 }
542
d55978a3c369 rl vlc decoding optimizations
michaelni
parents: 531
diff changeset
1813 }
d55978a3c369 rl vlc decoding optimizations
michaelni
parents: 531
diff changeset
1814
d55978a3c369 rl vlc decoding optimizations
michaelni
parents: 531
diff changeset
1815 block[scan_table[i]] = level;
d55978a3c369 rl vlc decoding optimizations
michaelni
parents: 531
diff changeset
1816 break;
499
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
1817 }
457
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1818
542
d55978a3c369 rl vlc decoding optimizations
michaelni
parents: 531
diff changeset
1819 block[scan_table[i]] = level;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1820 }
542
d55978a3c369 rl vlc decoding optimizations
michaelni
parents: 531
diff changeset
1821 CLOSE_READER(re, &s->gb);
d55978a3c369 rl vlc decoding optimizations
michaelni
parents: 531
diff changeset
1822 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1823 not_coded:
986e461dc072 Initial revision
glantau
parents:
diff changeset
1824 if (s->mb_intra) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
1825 mpeg4_pred_ac(s, block, n, dc_pred_dir);
986e461dc072 Initial revision
glantau
parents:
diff changeset
1826 if (s->ac_pred) {
542
d55978a3c369 rl vlc decoding optimizations
michaelni
parents: 531
diff changeset
1827 i = 63; /* XXX: not optimal */
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1828 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1829 }
936
caa77cd960c0 qpel encoding
michaelni
parents: 903
diff changeset
1830 if(s->msmpeg4_version>=4 && i>0) i=63; //FIXME/XXX optimize
542
d55978a3c369 rl vlc decoding optimizations
michaelni
parents: 531
diff changeset
1831 s->block_last_index[n] = i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
1832
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1833 return 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1834 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1835
986e461dc072 Initial revision
glantau
parents:
diff changeset
1836 static int msmpeg4_decode_dc(MpegEncContext * s, int n, int *dir_ptr)
986e461dc072 Initial revision
glantau
parents:
diff changeset
1837 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
1838 int level, pred;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1839
457
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1840 if(s->msmpeg4_version<=2){
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1841 if (n < 4) {
531
f5d7fcc81787 get_vlc() optimizations
michaelni
parents: 519
diff changeset
1842 level = get_vlc2(&s->gb, v2_dc_lum_vlc.table, DC_VLC_BITS, 3);
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1843 } else {
531
f5d7fcc81787 get_vlc() optimizations
michaelni
parents: 519
diff changeset
1844 level = get_vlc2(&s->gb, v2_dc_chroma_vlc.table, DC_VLC_BITS, 3);
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1845 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
1846 if (level < 0)
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1847 return -1;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1848 level-=256;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1849 }else{ //FIXME optimize use unified tables & index
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1850 if (n < 4) {
2474
81a9f883a17a In that patch:
michael
parents: 2465
diff changeset
1851 level = get_vlc2(&s->gb, ff_msmp4_dc_luma_vlc[s->dc_table_index].table, DC_VLC_BITS, 3);
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1852 } else {
2474
81a9f883a17a In that patch:
michael
parents: 2465
diff changeset
1853 level = get_vlc2(&s->gb, ff_msmp4_dc_chroma_vlc[s->dc_table_index].table, DC_VLC_BITS, 3);
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1854 }
457
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1855 if (level < 0){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1399
diff changeset
1856 av_log(s->avctx, AV_LOG_ERROR, "illegal dc vlc\n");
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1857 return -1;
457
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1858 }
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1859
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1860 if (level == DC_MAX) {
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1861 level = get_bits(&s->gb, 8);
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1862 if (get_bits1(&s->gb))
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1863 level = -level;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1864 } else if (level != 0) {
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1865 if (get_bits1(&s->gb))
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1866 level = -level;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 300
diff changeset
1867 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1868 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1869
457
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1870 if(s->msmpeg4_version==1){
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1063
diff changeset
1871 int32_t *dc_val;
457
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1872 pred = msmpeg4v1_pred_dc(s, n, &dc_val);
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1873 level += pred;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
1874
457
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1875 /* update predictor */
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1876 *dc_val= level;
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1877 }else{
3781
8e79b099d354 dc_val should be signed
mru
parents: 3777
diff changeset
1878 int16_t *dc_val;
501
2241bce35bb9 fixing wmv1 bugs, it was foolish to belive that m$ would use the same dc prediction as mpeg4 just cuz they changed it a bit from msmpeg4v3
michaelni
parents: 499
diff changeset
1879 pred = msmpeg4_pred_dc(s, n, &dc_val, dir_ptr);
457
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1880 level += pred;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1881
457
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1882 /* update predictor */
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1883 if (n < 4) {
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1884 *dc_val = level * s->y_dc_scale;
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1885 } else {
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1886 *dc_val = level * s->c_dc_scale;
583dcee270d2 msmpeg4v1 decoding
michaelni
parents: 440
diff changeset
1887 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1888 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1889
986e461dc072 Initial revision
glantau
parents:
diff changeset
1890 return level;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1891 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1892
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
1893 static int msmpeg4_decode_motion(MpegEncContext * s,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1894 int *mx_ptr, int *my_ptr)
986e461dc072 Initial revision
glantau
parents:
diff changeset
1895 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
1896 MVTable *mv;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1897 int code, mx, my;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1898
986e461dc072 Initial revision
glantau
parents:
diff changeset
1899 mv = &mv_tables[s->mv_table_index];
986e461dc072 Initial revision
glantau
parents:
diff changeset
1900
531
f5d7fcc81787 get_vlc() optimizations
michaelni
parents: 519
diff changeset
1901 code = get_vlc2(&s->gb, mv->vlc.table, MV_VLC_BITS, 2);
499
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
1902 if (code < 0){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1399
diff changeset
1903 av_log(s->avctx, AV_LOG_ERROR, "illegal MV code at %d %d\n", s->mb_x, s->mb_y);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1904 return -1;
499
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
1905 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1906 if (code == mv->n) {
499
8b7a54d58549 wmv1 support
michaelni
parents: 483
diff changeset
1907 //printf("MV ESC %X at %d %d\n", show_bits(&s->gb, 24), s->mb_x, s->mb_y);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1908 mx = get_bits(&s->gb, 6);
986e461dc072 Initial revision
glantau
parents:
diff changeset
1909 my = get_bits(&s->gb, 6);
986e461dc072 Initial revision
glantau
parents:
diff changeset
1910 } else {
986e461dc072 Initial revision
glantau
parents:
diff changeset
1911 mx = mv->table_mvx[code];
986e461dc072 Initial revision
glantau
parents:
diff changeset
1912 my = mv->table_mvy[code];
986e461dc072 Initial revision
glantau
parents:
diff changeset
1913 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1914
986e461dc072 Initial revision
glantau
parents:
diff changeset
1915 mx += *mx_ptr - 32;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1916 my += *my_ptr - 32;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1917 /* WARNING : they do not do exactly modulo encoding */
986e461dc072 Initial revision
glantau
parents:
diff changeset
1918 if (mx <= -64)
986e461dc072 Initial revision
glantau
parents:
diff changeset
1919 mx += 64;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1920 else if (mx >= 64)
986e461dc072 Initial revision
glantau
parents:
diff changeset
1921 mx -= 64;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1922
986e461dc072 Initial revision
glantau
parents:
diff changeset
1923 if (my <= -64)
986e461dc072 Initial revision
glantau
parents:
diff changeset
1924 my += 64;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1925 else if (my >= 64)
986e461dc072 Initial revision
glantau
parents:
diff changeset
1926 my -= 64;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1927 *mx_ptr = mx;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1928 *my_ptr = my;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1929 return 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1930 }
936
caa77cd960c0 qpel encoding
michaelni
parents: 903
diff changeset
1931
caa77cd960c0 qpel encoding
michaelni
parents: 903
diff changeset
1932 /* cleanest way to support it
caa77cd960c0 qpel encoding
michaelni
parents: 903
diff changeset
1933 * there is too much shared between versions so that we cant have 1 file per version & 1 common
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2846
diff changeset
1934 * as allmost everything would be in the common file
936
caa77cd960c0 qpel encoding
michaelni
parents: 903
diff changeset
1935 */
caa77cd960c0 qpel encoding
michaelni
parents: 903
diff changeset
1936 #include "wmv2.c"