annotate h263dec.c @ 846:ade627a74709 libavcodec

avoid duplicate ";" warnings (based upon a patch by mru at users dot sourceforge dot net (Mns Rullgrd))
author michaelni
date Sun, 10 Nov 2002 11:24:27 +0000
parents 32de034be20e
children eacc2dd8fd9d
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1 /*
986e461dc072 Initial revision
glantau
parents:
diff changeset
2 * H263 decoder
429
718a22dc121f license/copyright change
glantau
parents: 411
diff changeset
3 * Copyright (c) 2001 Fabrice Bellard.
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
4 *
429
718a22dc121f license/copyright change
glantau
parents: 411
diff changeset
5 * This library is free software; you can redistribute it and/or
718a22dc121f license/copyright change
glantau
parents: 411
diff changeset
6 * modify it under the terms of the GNU Lesser General Public
718a22dc121f license/copyright change
glantau
parents: 411
diff changeset
7 * License as published by the Free Software Foundation; either
718a22dc121f license/copyright change
glantau
parents: 411
diff changeset
8 * version 2 of the License, or (at your option) any later version.
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
9 *
429
718a22dc121f license/copyright change
glantau
parents: 411
diff changeset
10 * This library is distributed in the hope that it will be useful,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
429
718a22dc121f license/copyright change
glantau
parents: 411
diff changeset
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
718a22dc121f license/copyright change
glantau
parents: 411
diff changeset
13 * Lesser General Public License for more details.
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
14 *
429
718a22dc121f license/copyright change
glantau
parents: 411
diff changeset
15 * You should have received a copy of the GNU Lesser General Public
718a22dc121f license/copyright change
glantau
parents: 411
diff changeset
16 * License along with this library; if not, write to the Free Software
718a22dc121f license/copyright change
glantau
parents: 411
diff changeset
17 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
18 */
396
fce0a2520551 removed useless header includes - use av memory functions
glantau
parents: 384
diff changeset
19 #include "avcodec.h"
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
20 #include "dsputil.h"
986e461dc072 Initial revision
glantau
parents:
diff changeset
21 #include "mpegvideo.h"
986e461dc072 Initial revision
glantau
parents:
diff changeset
22
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
23 #if 1
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
24 #define PRINT_QP(a, b) {}
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
25 #else
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
26 #define PRINT_QP(a, b) printf(a, b)
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
27 #endif
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
28
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
29 //#define DEBUG
384
d442918c4698 print frame decoding time support (x86 only)
michaelni
parents: 361
diff changeset
30 //#define PRINT_FRAME_TIME
d442918c4698 print frame decoding time support (x86 only)
michaelni
parents: 361
diff changeset
31 #ifdef PRINT_FRAME_TIME
d442918c4698 print frame decoding time support (x86 only)
michaelni
parents: 361
diff changeset
32 static inline long long rdtsc()
d442918c4698 print frame decoding time support (x86 only)
michaelni
parents: 361
diff changeset
33 {
d442918c4698 print frame decoding time support (x86 only)
michaelni
parents: 361
diff changeset
34 long long l;
d442918c4698 print frame decoding time support (x86 only)
michaelni
parents: 361
diff changeset
35 asm volatile( "rdtsc\n\t"
d442918c4698 print frame decoding time support (x86 only)
michaelni
parents: 361
diff changeset
36 : "=A" (l)
d442918c4698 print frame decoding time support (x86 only)
michaelni
parents: 361
diff changeset
37 );
d442918c4698 print frame decoding time support (x86 only)
michaelni
parents: 361
diff changeset
38 // printf("%d\n", int(l/1000));
d442918c4698 print frame decoding time support (x86 only)
michaelni
parents: 361
diff changeset
39 return l;
d442918c4698 print frame decoding time support (x86 only)
michaelni
parents: 361
diff changeset
40 }
d442918c4698 print frame decoding time support (x86 only)
michaelni
parents: 361
diff changeset
41 #endif
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
42
986e461dc072 Initial revision
glantau
parents:
diff changeset
43 static int h263_decode_init(AVCodecContext *avctx)
986e461dc072 Initial revision
glantau
parents:
diff changeset
44 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
45 MpegEncContext *s = avctx->priv_data;
60
35c1141e23d9 moved matrix init away from MPV_common_init()
glantau
parents: 56
diff changeset
46
67
cdd89f96cbe1 added draw_horiz_band test
glantau
parents: 60
diff changeset
47 s->avctx = avctx;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
48 s->out_format = FMT_H263;
986e461dc072 Initial revision
glantau
parents:
diff changeset
49
986e461dc072 Initial revision
glantau
parents:
diff changeset
50 s->width = avctx->width;
986e461dc072 Initial revision
glantau
parents:
diff changeset
51 s->height = avctx->height;
411
5c8b3a717929 workaround dc_scale bug in old ffmpeg msmpeg4v3 encoder (set workaround_bugs=1 for this)
michaelni
parents: 396
diff changeset
52 s->workaround_bugs= avctx->workaround_bugs;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
53
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
54 // set defaults
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
55 s->quant_precision=5;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
56 s->progressive_sequence=1;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
57 s->decode_mb= ff_h263_decode_mb;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
58
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
59 /* select sub codec */
986e461dc072 Initial revision
glantau
parents:
diff changeset
60 switch(avctx->codec->id) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
61 case CODEC_ID_H263:
154
f914f710b8d0 - Fixed a bug on H.263 MV prediction for MB on GOBs limits.
pulento
parents: 144
diff changeset
62 s->gob_number = 0;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
63 break;
67
cdd89f96cbe1 added draw_horiz_band test
glantau
parents: 60
diff changeset
64 case CODEC_ID_MPEG4:
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
65 s->time_increment_bits = 4; /* default value for broken headers */
986e461dc072 Initial revision
glantau
parents:
diff changeset
66 s->h263_pred = 1;
336
c56b45669214 export delay info
michaelni
parents: 333
diff changeset
67 s->has_b_frames = 1; //default, might be overriden in the vol header during header parsing
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
68 break;
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
69 case CODEC_ID_MSMPEG4V1:
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
70 s->h263_msmpeg4 = 1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
71 s->h263_pred = 1;
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
72 s->msmpeg4_version=1;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
73 break;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
74 case CODEC_ID_MSMPEG4V2:
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
75 s->h263_msmpeg4 = 1;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
76 s->h263_pred = 1;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
77 s->msmpeg4_version=2;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
78 break;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
79 case CODEC_ID_MSMPEG4V3:
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
80 s->h263_msmpeg4 = 1;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
81 s->h263_pred = 1;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
82 s->msmpeg4_version=3;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
83 break;
311
ac677a84d5df wmv1 header parser (unfinished)
michaelni
parents: 308
diff changeset
84 case CODEC_ID_WMV1:
ac677a84d5df wmv1 header parser (unfinished)
michaelni
parents: 308
diff changeset
85 s->h263_msmpeg4 = 1;
ac677a84d5df wmv1 header parser (unfinished)
michaelni
parents: 308
diff changeset
86 s->h263_pred = 1;
ac677a84d5df wmv1 header parser (unfinished)
michaelni
parents: 308
diff changeset
87 s->msmpeg4_version=4;
ac677a84d5df wmv1 header parser (unfinished)
michaelni
parents: 308
diff changeset
88 break;
498
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 485
diff changeset
89 case CODEC_ID_WMV2:
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 485
diff changeset
90 s->h263_msmpeg4 = 1;
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 485
diff changeset
91 s->h263_pred = 1;
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 485
diff changeset
92 s->msmpeg4_version=5;
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 485
diff changeset
93 break;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
94 case CODEC_ID_H263I:
986e461dc072 Initial revision
glantau
parents:
diff changeset
95 s->h263_intel = 1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
96 break;
986e461dc072 Initial revision
glantau
parents:
diff changeset
97 default:
986e461dc072 Initial revision
glantau
parents:
diff changeset
98 return -1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
99 }
344
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
100 s->codec_id= avctx->codec->id;
553
18ad513d92fe direct rendering method 1 support
michaelni
parents: 543
diff changeset
101
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
102 /* for h263, we allocate the images after having read the header */
274
d0c186bcf075 use the width & height from the mpeg4 header ... in the case that its complete
michaelni
parents: 273
diff changeset
103 if (avctx->codec->id != CODEC_ID_H263 && avctx->codec->id != CODEC_ID_MPEG4)
144
cb5dabd00ba2 - Bug fix on inter MCBPC table for inter+q.
pulento
parents: 67
diff changeset
104 if (MPV_common_init(s) < 0)
cb5dabd00ba2 - Bug fix on inter MCBPC table for inter+q.
pulento
parents: 67
diff changeset
105 return -1;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
106
986e461dc072 Initial revision
glantau
parents:
diff changeset
107 if (s->h263_msmpeg4)
498
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 485
diff changeset
108 ff_msmpeg4_decode_init(s);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
109 else
986e461dc072 Initial revision
glantau
parents:
diff changeset
110 h263_decode_init_vlc(s);
986e461dc072 Initial revision
glantau
parents:
diff changeset
111
986e461dc072 Initial revision
glantau
parents:
diff changeset
112 return 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
113 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
114
986e461dc072 Initial revision
glantau
parents:
diff changeset
115 static int h263_decode_end(AVCodecContext *avctx)
986e461dc072 Initial revision
glantau
parents:
diff changeset
116 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
117 MpegEncContext *s = avctx->priv_data;
986e461dc072 Initial revision
glantau
parents:
diff changeset
118
986e461dc072 Initial revision
glantau
parents:
diff changeset
119 MPV_common_end(s);
986e461dc072 Initial revision
glantau
parents:
diff changeset
120 return 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
121 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
122
655
0018e190cc4c m4v input support
michaelni
parents: 589
diff changeset
123 /**
0018e190cc4c m4v input support
michaelni
parents: 589
diff changeset
124 * retunrs the number of bytes consumed for building the current frame
0018e190cc4c m4v input support
michaelni
parents: 589
diff changeset
125 */
0018e190cc4c m4v input support
michaelni
parents: 589
diff changeset
126 static int get_consumed_bytes(MpegEncContext *s, int buf_size){
0018e190cc4c m4v input support
michaelni
parents: 589
diff changeset
127 int pos= (get_bits_count(&s->gb)+7)>>3;
842
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
128
655
0018e190cc4c m4v input support
michaelni
parents: 589
diff changeset
129 if(s->divx_version>=500){
0018e190cc4c m4v input support
michaelni
parents: 589
diff changeset
130 //we would have to scan through the whole buf to handle the weird reordering ...
0018e190cc4c m4v input support
michaelni
parents: 589
diff changeset
131 return buf_size;
842
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
132 }else if(s->flags&CODEC_FLAG_TRUNCATED){
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
133 pos -= s->parse_context.last_index;
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
134 if(pos<0) pos=0; // padding is not really read so this might be -1
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
135 return pos;
655
0018e190cc4c m4v input support
michaelni
parents: 589
diff changeset
136 }else{
0018e190cc4c m4v input support
michaelni
parents: 589
diff changeset
137 if(pos==0) pos=1; //avoid infinite loops (i doubt thats needed but ...)
658
dc8df8792a24 avoid nonsense frame-skip messages
michaelni
parents: 657
diff changeset
138 if(pos+10>buf_size) pos=buf_size; // oops ;)
655
0018e190cc4c m4v input support
michaelni
parents: 589
diff changeset
139
0018e190cc4c m4v input support
michaelni
parents: 589
diff changeset
140 return pos;
0018e190cc4c m4v input support
michaelni
parents: 589
diff changeset
141 }
0018e190cc4c m4v input support
michaelni
parents: 589
diff changeset
142 }
0018e190cc4c m4v input support
michaelni
parents: 589
diff changeset
143
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
144 static int decode_slice(MpegEncContext *s){
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
145 s->last_resync_gb= s->gb;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
146 s->first_slice_line= 1;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
147
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
148 s->resync_mb_x= s->mb_x;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
149 s->resync_mb_y= s->mb_y;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
150
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
151 s->y_dc_scale= s->y_dc_scale_table[ s->qscale ];
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
152 s->c_dc_scale= s->c_dc_scale_table[ s->qscale ];
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
153
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
154 if(s->partitioned_frame){
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
155 const int qscale= s->qscale;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
156
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
157 if(s->codec_id==CODEC_ID_MPEG4){
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
158 if(ff_mpeg4_decode_partitions(s) < 0)
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
159 return -1;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
160 }
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
161
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
162 /* restore variables which where modified */
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
163 s->first_slice_line=1;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
164 s->mb_x= s->resync_mb_x;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
165 s->mb_y= s->resync_mb_y;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
166 s->qscale= qscale;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
167 s->y_dc_scale= s->y_dc_scale_table[ s->qscale ];
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
168 s->c_dc_scale= s->c_dc_scale_table[ s->qscale ];
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
169 }
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
170
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
171 for(; s->mb_y < s->mb_height; s->mb_y++) {
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
172 /* per-row end of slice checks */
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
173 if(s->msmpeg4_version){
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
174 if(s->resync_mb_y + s->slice_height == s->mb_y){
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
175 const int xy= s->mb_x + s->mb_y*s->mb_width;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
176 s->error_status_table[xy-1]|= AC_END|DC_END|MV_END;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
177 return 0;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
178 }
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
179 }
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
180
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
181 if(s->msmpeg4_version==1){
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
182 s->last_dc[0]=
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
183 s->last_dc[1]=
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
184 s->last_dc[2]= 128;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
185 }
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
186
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
187 ff_init_block_index(s);
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
188 for(; s->mb_x < s->mb_width; s->mb_x++) {
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
189 int ret;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
190
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
191 ff_update_block_index(s);
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
192
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
193 if(s->resync_mb_x == s->mb_x && s->resync_mb_y+1 == s->mb_y){
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
194 s->first_slice_line=0;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
195 }
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
196
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
197 /* DCT & quantize */
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
198 clear_blocks(s->block[0]);
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
199
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
200 s->mv_dir = MV_DIR_FORWARD;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
201 s->mv_type = MV_TYPE_16X16;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
202 //printf("%d %d %06X\n", ret, get_bits_count(&s->gb), show_bits(&s->gb, 24));
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
203 ret= s->decode_mb(s, s->block);
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
204
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
205 PRINT_QP("%2d", s->qscale);
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
206 MPV_decode_mb(s, s->block);
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
207
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
208 if(ret<0){
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
209 const int xy= s->mb_x + s->mb_y*s->mb_width;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
210 if(ret==SLICE_END){
758
cca620e89cf0 fixing h263 slice decoding (again)
michaelni
parents: 756
diff changeset
211 //printf("%d %d %d %06X\n", s->mb_x, s->mb_y, s->gb.size*8 - get_bits_count(&s->gb), show_bits(&s->gb, 24));
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
212 s->error_status_table[xy]|= AC_END;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
213 if(!s->partitioned_frame)
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
214 s->error_status_table[xy]|= MV_END|DC_END;
750
4adadf210b3b better padding bug detection
michaelni
parents: 747
diff changeset
215
4adadf210b3b better padding bug detection
michaelni
parents: 747
diff changeset
216 s->padding_bug_score--;
4adadf210b3b better padding bug detection
michaelni
parents: 747
diff changeset
217
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
218 if(++s->mb_x >= s->mb_width){
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
219 s->mb_x=0;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
220 ff_draw_horiz_band(s);
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
221 s->mb_y++;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
222 }
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
223 return 0;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
224 }else if(ret==SLICE_NOEND){
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
225 fprintf(stderr,"Slice mismatch at MB: %d\n", xy);
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
226 return -1;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
227 }
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
228 fprintf(stderr,"Error at MB: %d\n", xy);
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
229 s->error_status_table[xy]|= AC_ERROR;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
230 if(!s->partitioned_frame)
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
231 s->error_status_table[xy]|= DC_ERROR|MV_ERROR;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
232
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
233 return -1;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
234 }
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
235 }
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
236
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
237 ff_draw_horiz_band(s);
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
238
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
239 PRINT_QP("%s", "\n");
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
240
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
241 s->mb_x= 0;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
242 }
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
243
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
244 assert(s->mb_x==0 && s->mb_y==s->mb_height);
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
245
750
4adadf210b3b better padding bug detection
michaelni
parents: 747
diff changeset
246 /* try to detect the padding bug */
4adadf210b3b better padding bug detection
michaelni
parents: 747
diff changeset
247 if( s->codec_id==CODEC_ID_MPEG4
4adadf210b3b better padding bug detection
michaelni
parents: 747
diff changeset
248 && (s->workaround_bugs&FF_BUG_AUTODETECT)
4adadf210b3b better padding bug detection
michaelni
parents: 747
diff changeset
249 && s->gb.size*8 - get_bits_count(&s->gb) >=0
4adadf210b3b better padding bug detection
michaelni
parents: 747
diff changeset
250 && s->gb.size*8 - get_bits_count(&s->gb) < 48
4adadf210b3b better padding bug detection
michaelni
parents: 747
diff changeset
251 && !s->resync_marker
4adadf210b3b better padding bug detection
michaelni
parents: 747
diff changeset
252 && !s->data_partitioning){
4adadf210b3b better padding bug detection
michaelni
parents: 747
diff changeset
253
4adadf210b3b better padding bug detection
michaelni
parents: 747
diff changeset
254 const int bits_count= get_bits_count(&s->gb);
4adadf210b3b better padding bug detection
michaelni
parents: 747
diff changeset
255 const int bits_left = s->gb.size*8 - bits_count;
4adadf210b3b better padding bug detection
michaelni
parents: 747
diff changeset
256
4adadf210b3b better padding bug detection
michaelni
parents: 747
diff changeset
257 if(bits_left==0 || bits_left>8){
4adadf210b3b better padding bug detection
michaelni
parents: 747
diff changeset
258 s->padding_bug_score++;
824
371ef113d984 better padding bug detection
michaelni
parents: 822
diff changeset
259 } else if(bits_left != 1){
750
4adadf210b3b better padding bug detection
michaelni
parents: 747
diff changeset
260 int v= show_bits(&s->gb, 8);
4adadf210b3b better padding bug detection
michaelni
parents: 747
diff changeset
261 v|= 0x7F >> (7-(bits_count&7));
824
371ef113d984 better padding bug detection
michaelni
parents: 822
diff changeset
262
750
4adadf210b3b better padding bug detection
michaelni
parents: 747
diff changeset
263 if(v==0x7F)
4adadf210b3b better padding bug detection
michaelni
parents: 747
diff changeset
264 s->padding_bug_score--;
4adadf210b3b better padding bug detection
michaelni
parents: 747
diff changeset
265 else
4adadf210b3b better padding bug detection
michaelni
parents: 747
diff changeset
266 s->padding_bug_score++;
4adadf210b3b better padding bug detection
michaelni
parents: 747
diff changeset
267 }
4adadf210b3b better padding bug detection
michaelni
parents: 747
diff changeset
268
4adadf210b3b better padding bug detection
michaelni
parents: 747
diff changeset
269 if(s->padding_bug_score > -2)
4adadf210b3b better padding bug detection
michaelni
parents: 747
diff changeset
270 s->workaround_bugs |= FF_BUG_NO_PADDING;
4adadf210b3b better padding bug detection
michaelni
parents: 747
diff changeset
271 else
4adadf210b3b better padding bug detection
michaelni
parents: 747
diff changeset
272 s->workaround_bugs &= ~FF_BUG_NO_PADDING;
4adadf210b3b better padding bug detection
michaelni
parents: 747
diff changeset
273 }
4adadf210b3b better padding bug detection
michaelni
parents: 747
diff changeset
274
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
275 // handle formats which dont have unique end markers
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
276 if(s->msmpeg4_version || (s->workaround_bugs&FF_BUG_NO_PADDING)){ //FIXME perhaps solve this more cleanly
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
277 int left= s->gb.size*8 - get_bits_count(&s->gb);
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
278 int max_extra=7;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
279
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
280 /* no markers in M$ crap */
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
281 if(s->msmpeg4_version && s->pict_type==I_TYPE)
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
282 max_extra+= 17;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
283
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
284 /* buggy padding but the frame should still end approximately at the bitstream end */
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
285 if((s->workaround_bugs&FF_BUG_NO_PADDING) && s->error_resilience>=3)
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
286 max_extra+= 48;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
287 else if((s->workaround_bugs&FF_BUG_NO_PADDING))
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
288 max_extra+= 256*256*256*64;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
289
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
290 if(left>max_extra){
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
291 fprintf(stderr, "discarding %d junk bits at end, next would be %X\n", left, show_bits(&s->gb, 24));
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
292 }
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
293 else if(left<0){
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
294 fprintf(stderr, "overreading %d bits\n", -left);
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
295 }else
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
296 s->error_status_table[s->mb_num-1]|= AC_END|MV_END|DC_END;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
297
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
298 return 0;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
299 }
750
4adadf210b3b better padding bug detection
michaelni
parents: 747
diff changeset
300
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
301 fprintf(stderr, "slice end not reached but screenspace end (%d left %06X)\n",
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
302 s->gb.size*8 - get_bits_count(&s->gb),
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
303 show_bits(&s->gb, 24));
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
304 return -1;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
305 }
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
306
842
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
307 /**
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
308 * finds the end of the current frame in the bitstream.
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
309 * @return the position of the first byte of the next frame, or -1
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
310 */
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
311 static int mpeg4_find_frame_end(MpegEncContext *s, UINT8 *buf, int buf_size){
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
312 ParseContext *pc= &s->parse_context;
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
313 int vop_found, i;
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
314 uint32_t state;
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
315
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
316 vop_found= pc->frame_start_found;
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
317 state= pc->state;
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
318
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
319 i=0;
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
320 if(!vop_found){
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
321 for(i=0; i<buf_size; i++){
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
322 state= (state<<8) | buf[i];
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
323 if(state == 0x1B6){
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
324 i++;
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
325 vop_found=1;
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
326 break;
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
327 }
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
328 }
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
329 }
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
330
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
331 for(; i<buf_size; i++){
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
332 state= (state<<8) | buf[i];
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
333 if((state&0xFFFFFF00) == 0x100){
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
334 pc->frame_start_found=0;
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
335 pc->state=-1;
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
336 return i-3;
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
337 }
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
338 }
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
339 pc->frame_start_found= vop_found;
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
340 pc->state= state;
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
341 return -1;
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
342 }
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
343
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
344 static int h263_decode_frame(AVCodecContext *avctx,
986e461dc072 Initial revision
glantau
parents:
diff changeset
345 void *data, int *data_size,
986e461dc072 Initial revision
glantau
parents:
diff changeset
346 UINT8 *buf, int buf_size)
986e461dc072 Initial revision
glantau
parents:
diff changeset
347 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
348 MpegEncContext *s = avctx->priv_data;
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
349 int ret,i;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
350 AVPicture *pict = data;
384
d442918c4698 print frame decoding time support (x86 only)
michaelni
parents: 361
diff changeset
351 #ifdef PRINT_FRAME_TIME
d442918c4698 print frame decoding time support (x86 only)
michaelni
parents: 361
diff changeset
352 uint64_t time= rdtsc();
d442918c4698 print frame decoding time support (x86 only)
michaelni
parents: 361
diff changeset
353 #endif
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
354 #ifdef DEBUG
986e461dc072 Initial revision
glantau
parents:
diff changeset
355 printf("*****frame %d size=%d\n", avctx->frame_number, buf_size);
986e461dc072 Initial revision
glantau
parents:
diff changeset
356 printf("bytes=%x %x %x %x\n", buf[0], buf[1], buf[2], buf[3]);
986e461dc072 Initial revision
glantau
parents:
diff changeset
357 #endif
345
e05b357a398a export mbskip_table for direct rendering
michaelni
parents: 344
diff changeset
358
e05b357a398a export mbskip_table for direct rendering
michaelni
parents: 344
diff changeset
359 s->hurry_up= avctx->hurry_up;
454
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
360 s->error_resilience= avctx->error_resilience;
701
85b071dfc7e3 ff_get_fourcc() & XVIX support
michaelni
parents: 669
diff changeset
361
485
20108840b0e5 grayscale only decoding
michaelni
parents: 465
diff changeset
362 s->flags= avctx->flags;
454
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
363
657
8de2081a39ab uninitialized var ...
michaelni
parents: 655
diff changeset
364 *data_size = 0;
8de2081a39ab uninitialized var ...
michaelni
parents: 655
diff changeset
365
8de2081a39ab uninitialized var ...
michaelni
parents: 655
diff changeset
366 /* no supplementary picture */
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
367 if (buf_size == 0) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
368 return 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
369 }
842
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
370
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
371 if(s->flags&CODEC_FLAG_TRUNCATED){
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
372 int next;
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
373 ParseContext *pc= &s->parse_context;
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
374
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
375 pc->last_index= pc->index;
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
376
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
377 if(s->codec_id==CODEC_ID_MPEG4){
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
378 next= mpeg4_find_frame_end(s, buf, buf_size);
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
379 }else{
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
380 fprintf(stderr, "this codec doesnt support truncated bitstreams\n");
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
381 return -1;
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
382 }
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
383 if(next==-1){
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
384 if(buf_size + FF_INPUT_BUFFER_PADDING_SIZE + pc->index > pc->buffer_size){
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
385 pc->buffer_size= buf_size + pc->index + 10*1024;
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
386 pc->buffer= realloc(pc->buffer, pc->buffer_size);
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
387 }
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
388
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
389 memcpy(&pc->buffer[pc->index], buf, buf_size);
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
390 pc->index += buf_size;
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
391 return buf_size;
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
392 }
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
393
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
394 if(pc->index){
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
395 if(next + FF_INPUT_BUFFER_PADDING_SIZE + pc->index > pc->buffer_size){
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
396 pc->buffer_size= next + pc->index + 10*1024;
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
397 pc->buffer= realloc(pc->buffer, pc->buffer_size);
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
398 }
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
399
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
400 memcpy(&pc->buffer[pc->index], buf, next + FF_INPUT_BUFFER_PADDING_SIZE );
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
401 pc->index = 0;
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
402 buf= pc->buffer;
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
403 buf_size= pc->last_index + next;
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
404 }
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
405 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
406
763
339db642859d fixing interlaced MC & edge-emu
michaelni
parents: 761
diff changeset
407 retry:
339db642859d fixing interlaced MC & edge-emu
michaelni
parents: 761
diff changeset
408
465
76c8afc9c1eb 100l divx501+ seeking bugfix
michaelni
parents: 454
diff changeset
409 if(s->bitstream_buffer_size && buf_size<20){ //divx 5.01+ frame reorder
333
8aa87f1dfc52 divx 5.01 support
michaelni
parents: 311
diff changeset
410 init_get_bits(&s->gb, s->bitstream_buffer, s->bitstream_buffer_size);
353
386f430e93f4 freeze fix
michaelni
parents: 350
diff changeset
411 }else
333
8aa87f1dfc52 divx 5.01 support
michaelni
parents: 311
diff changeset
412 init_get_bits(&s->gb, buf, buf_size);
465
76c8afc9c1eb 100l divx501+ seeking bugfix
michaelni
parents: 454
diff changeset
413 s->bitstream_buffer_size=0;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
414
718
16dab8296293 fixing custom quantizer matrix decoding
michaelni
parents: 717
diff changeset
415 if (!s->context_initialized) {
752
97077dd24bfa fixing alt_scan for the first frame (variable was reset)
michaelni
parents: 750
diff changeset
416 if (MPV_common_init(s) < 0) //we need the idct permutaton for reading a custom matrix
718
16dab8296293 fixing custom quantizer matrix decoding
michaelni
parents: 717
diff changeset
417 return -1;
16dab8296293 fixing custom quantizer matrix decoding
michaelni
parents: 717
diff changeset
418 }
16dab8296293 fixing custom quantizer matrix decoding
michaelni
parents: 717
diff changeset
419
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
420 /* let's go :-) */
986e461dc072 Initial revision
glantau
parents:
diff changeset
421 if (s->h263_msmpeg4) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
422 ret = msmpeg4_decode_picture_header(s);
986e461dc072 Initial revision
glantau
parents:
diff changeset
423 } else if (s->h263_pred) {
747
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
424 if(s->avctx->extradata_size && s->picture_number==0){
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
425 GetBitContext gb;
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
426
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
427 init_get_bits(&gb, s->avctx->extradata, s->avctx->extradata_size);
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
428 ret = ff_mpeg4_decode_picture_header(s, &gb);
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
429 }
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
430 ret = ff_mpeg4_decode_picture_header(s, &s->gb);
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
431
831
14f4598ec793 support forcing low_delay during decoding
michaelni
parents: 824
diff changeset
432 if(s->flags& CODEC_FLAG_LOW_DELAY)
14f4598ec793 support forcing low_delay during decoding
michaelni
parents: 824
diff changeset
433 s->low_delay=1;
14f4598ec793 support forcing low_delay during decoding
michaelni
parents: 824
diff changeset
434
336
c56b45669214 export delay info
michaelni
parents: 333
diff changeset
435 s->has_b_frames= !s->low_delay;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
436 } else if (s->h263_intel) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
437 ret = intel_h263_decode_picture_header(s);
986e461dc072 Initial revision
glantau
parents:
diff changeset
438 } else {
986e461dc072 Initial revision
glantau
parents:
diff changeset
439 ret = h263_decode_picture_header(s);
274
d0c186bcf075 use the width & height from the mpeg4 header ... in the case that its complete
michaelni
parents: 273
diff changeset
440 }
556
762c67fd4078 uvlinesize
michaelni
parents: 553
diff changeset
441 avctx->has_b_frames= s->has_b_frames;
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
442
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
443 if(s->workaround_bugs&FF_BUG_AUTODETECT){
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
444 if(s->avctx->fourcc == ff_get_fourcc("XVIX"))
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
445 s->workaround_bugs|= FF_BUG_XVID_ILACE;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
446
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
447 if(s->avctx->fourcc == ff_get_fourcc("MP4S"))
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
448 s->workaround_bugs|= FF_BUG_AC_VLC;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
449
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
450 if(s->avctx->fourcc == ff_get_fourcc("M4S2"))
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
451 s->workaround_bugs|= FF_BUG_AC_VLC;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
452
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
453 if(s->avctx->fourcc == ff_get_fourcc("UMP4")){
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
454 s->workaround_bugs|= FF_BUG_UMP4;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
455 s->workaround_bugs|= FF_BUG_AC_VLC;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
456 }
760
e858fe220ce0 xvid qpel bug workaround
michaelni
parents: 758
diff changeset
457
e858fe220ce0 xvid qpel bug workaround
michaelni
parents: 758
diff changeset
458 if(s->divx_version){
e858fe220ce0 xvid qpel bug workaround
michaelni
parents: 758
diff changeset
459 s->workaround_bugs|= FF_BUG_QPEL_CHROMA;
e858fe220ce0 xvid qpel bug workaround
michaelni
parents: 758
diff changeset
460 }
761
7f4cc2f6d642 xvid qpel bug autodetect
michaelni
parents: 760
diff changeset
461
7f4cc2f6d642 xvid qpel bug autodetect
michaelni
parents: 760
diff changeset
462 if(s->avctx->fourcc == ff_get_fourcc("XVID") && s->xvid_build==0)
7f4cc2f6d642 xvid qpel bug autodetect
michaelni
parents: 760
diff changeset
463 s->workaround_bugs|= FF_BUG_QPEL_CHROMA;
7f4cc2f6d642 xvid qpel bug autodetect
michaelni
parents: 760
diff changeset
464
7f4cc2f6d642 xvid qpel bug autodetect
michaelni
parents: 760
diff changeset
465 if(s->xvid_build && s->xvid_build<=1)
7f4cc2f6d642 xvid qpel bug autodetect
michaelni
parents: 760
diff changeset
466 s->workaround_bugs|= FF_BUG_QPEL_CHROMA;
7f4cc2f6d642 xvid qpel bug autodetect
michaelni
parents: 760
diff changeset
467
750
4adadf210b3b better padding bug detection
michaelni
parents: 747
diff changeset
468 //printf("padding_bug_score: %d\n", s->padding_bug_score);
4adadf210b3b better padding bug detection
michaelni
parents: 747
diff changeset
469 #if 0
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
470 if(s->divx_version==500)
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
471 s->workaround_bugs|= FF_BUG_NO_PADDING;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
472
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
473 /* very ugly XVID padding bug detection FIXME/XXX solve this differently
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
474 * lets hope this at least works
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
475 */
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
476 if( s->resync_marker==0 && s->data_partitioning==0 && s->divx_version==0
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
477 && s->codec_id==CODEC_ID_MPEG4 && s->vo_type==0)
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
478 s->workaround_bugs|= FF_BUG_NO_PADDING;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
479
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
480 if(s->lavc_build && s->lavc_build<4609) //FIXME not sure about the version num but a 4609 file seems ok
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
481 s->workaround_bugs|= FF_BUG_NO_PADDING;
750
4adadf210b3b better padding bug detection
michaelni
parents: 747
diff changeset
482 #endif
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
483 }
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
484
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
485
585
86ebb02c6693 dump bits per frame / qp / frame complexity support
michaelni
parents: 562
diff changeset
486 #if 0 // dump bits per frame / qp / complexity
86ebb02c6693 dump bits per frame / qp / frame complexity support
michaelni
parents: 562
diff changeset
487 {
86ebb02c6693 dump bits per frame / qp / frame complexity support
michaelni
parents: 562
diff changeset
488 static FILE *f=NULL;
86ebb02c6693 dump bits per frame / qp / frame complexity support
michaelni
parents: 562
diff changeset
489 if(!f) f=fopen("rate_qp_cplx.txt", "w");
589
507e688d57b2 10l found by Rmi Guyomarch <rguyom at pobox dot com>
michaelni
parents: 585
diff changeset
490 fprintf(f, "%d %d %f\n", buf_size, s->qscale, buf_size*(double)s->qscale);
585
86ebb02c6693 dump bits per frame / qp / frame complexity support
michaelni
parents: 562
diff changeset
491 }
86ebb02c6693 dump bits per frame / qp / frame complexity support
michaelni
parents: 562
diff changeset
492 #endif
553
18ad513d92fe direct rendering method 1 support
michaelni
parents: 543
diff changeset
493
274
d0c186bcf075 use the width & height from the mpeg4 header ... in the case that its complete
michaelni
parents: 273
diff changeset
494 /* After H263 & mpeg4 header decode we have the height, width,*/
160
1bf8c111691d - Bug fixed on H.263 decoder initialization.
pulento
parents: 154
diff changeset
495 /* and other parameters. So then we could init the picture */
1bf8c111691d - Bug fixed on H.263 decoder initialization.
pulento
parents: 154
diff changeset
496 /* FIXME: By the way H263 decoder is evolving it should have */
1bf8c111691d - Bug fixed on H.263 decoder initialization.
pulento
parents: 154
diff changeset
497 /* an H263EncContext */
718
16dab8296293 fixing custom quantizer matrix decoding
michaelni
parents: 717
diff changeset
498 if ( s->width != avctx->width || s->height != avctx->height
16dab8296293 fixing custom quantizer matrix decoding
michaelni
parents: 717
diff changeset
499 || avctx->aspect_ratio_info != s->aspect_ratio_info
16dab8296293 fixing custom quantizer matrix decoding
michaelni
parents: 717
diff changeset
500 || avctx->aspected_width != s->aspected_width
16dab8296293 fixing custom quantizer matrix decoding
michaelni
parents: 717
diff changeset
501 || avctx->aspected_height != s->aspected_height) {
553
18ad513d92fe direct rendering method 1 support
michaelni
parents: 543
diff changeset
502 /* H.263 could change picture size any time */
18ad513d92fe direct rendering method 1 support
michaelni
parents: 543
diff changeset
503 MPV_common_end(s);
18ad513d92fe direct rendering method 1 support
michaelni
parents: 543
diff changeset
504 s->context_initialized=0;
18ad513d92fe direct rendering method 1 support
michaelni
parents: 543
diff changeset
505 }
274
d0c186bcf075 use the width & height from the mpeg4 header ... in the case that its complete
michaelni
parents: 273
diff changeset
506 if (!s->context_initialized) {
d0c186bcf075 use the width & height from the mpeg4 header ... in the case that its complete
michaelni
parents: 273
diff changeset
507 avctx->width = s->width;
d0c186bcf075 use the width & height from the mpeg4 header ... in the case that its complete
michaelni
parents: 273
diff changeset
508 avctx->height = s->height;
281
1fc96b02142e mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents: 274
diff changeset
509 avctx->aspect_ratio_info= s->aspect_ratio_info;
669
b4bddbde44f3 aspect (ext. par too) support for h263 and mpeg4 (inc. build becouse of new vars)
al3x
parents: 658
diff changeset
510 if (s->aspect_ratio_info == FF_ASPECT_EXTENDED)
b4bddbde44f3 aspect (ext. par too) support for h263 and mpeg4 (inc. build becouse of new vars)
al3x
parents: 658
diff changeset
511 {
b4bddbde44f3 aspect (ext. par too) support for h263 and mpeg4 (inc. build becouse of new vars)
al3x
parents: 658
diff changeset
512 avctx->aspected_width = s->aspected_width;
b4bddbde44f3 aspect (ext. par too) support for h263 and mpeg4 (inc. build becouse of new vars)
al3x
parents: 658
diff changeset
513 avctx->aspected_height = s->aspected_height;
b4bddbde44f3 aspect (ext. par too) support for h263 and mpeg4 (inc. build becouse of new vars)
al3x
parents: 658
diff changeset
514 }
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
515
763
339db642859d fixing interlaced MC & edge-emu
michaelni
parents: 761
diff changeset
516 goto retry;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
517 }
758
cca620e89cf0 fixing h263 slice decoding (again)
michaelni
parents: 756
diff changeset
518
cca620e89cf0 fixing h263 slice decoding (again)
michaelni
parents: 756
diff changeset
519 if((s->codec_id==CODEC_ID_H263 || s->codec_id==CODEC_ID_H263P))
cca620e89cf0 fixing h263 slice decoding (again)
michaelni
parents: 756
diff changeset
520 s->gob_index = ff_h263_get_gob_height(s);
cca620e89cf0 fixing h263 slice decoding (again)
michaelni
parents: 756
diff changeset
521
655
0018e190cc4c m4v input support
michaelni
parents: 589
diff changeset
522 if(ret==FRAME_SKIPED) return get_consumed_bytes(s, buf_size);
454
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
523 /* skip if the header was thrashed */
498
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 485
diff changeset
524 if (ret < 0){
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 485
diff changeset
525 fprintf(stderr, "header damaged\n");
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
526 return -1;
498
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 485
diff changeset
527 }
845
32de034be20e hurry_up>=5 -> skip everything except header & set pict_type&key_frame
michaelni
parents: 842
diff changeset
528
32de034be20e hurry_up>=5 -> skip everything except header & set pict_type&key_frame
michaelni
parents: 842
diff changeset
529 s->avctx->key_frame = (s->pict_type == I_TYPE);
32de034be20e hurry_up>=5 -> skip everything except header & set pict_type&key_frame
michaelni
parents: 842
diff changeset
530 s->avctx->pict_type = s->pict_type;
32de034be20e hurry_up>=5 -> skip everything except header & set pict_type&key_frame
michaelni
parents: 842
diff changeset
531
341
bf26081c373c avcodec_flush_buffers()
michaelni
parents: 336
diff changeset
532 /* skip b frames if we dont have reference frames */
655
0018e190cc4c m4v input support
michaelni
parents: 589
diff changeset
533 if(s->num_available_buffers<2 && s->pict_type==B_TYPE) return get_consumed_bytes(s, buf_size);
345
e05b357a398a export mbskip_table for direct rendering
michaelni
parents: 344
diff changeset
534 /* skip b frames if we are in a hurry */
655
0018e190cc4c m4v input support
michaelni
parents: 589
diff changeset
535 if(s->hurry_up && s->pict_type==B_TYPE) return get_consumed_bytes(s, buf_size);
845
32de034be20e hurry_up>=5 -> skip everything except header & set pict_type&key_frame
michaelni
parents: 842
diff changeset
536 /* skip everything if we are in a hurry>=5 */
32de034be20e hurry_up>=5 -> skip everything except header & set pict_type&key_frame
michaelni
parents: 842
diff changeset
537 if(s->hurry_up>=5) return get_consumed_bytes(s, buf_size);
454
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
538
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
539 if(s->next_p_frame_damaged){
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
540 if(s->pict_type==B_TYPE)
655
0018e190cc4c m4v input support
michaelni
parents: 589
diff changeset
541 return get_consumed_bytes(s, buf_size);
454
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
542 else
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
543 s->next_p_frame_damaged=0;
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
544 }
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
545
771
d4cc92144266 handle direct rendering buffer allocation failure
michaelni
parents: 763
diff changeset
546 if(MPV_frame_start(s, avctx) < 0)
d4cc92144266 handle direct rendering buffer allocation failure
michaelni
parents: 763
diff changeset
547 return -1;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
548
986e461dc072 Initial revision
glantau
parents:
diff changeset
549 #ifdef DEBUG
986e461dc072 Initial revision
glantau
parents:
diff changeset
550 printf("qscale=%d\n", s->qscale);
986e461dc072 Initial revision
glantau
parents:
diff changeset
551 #endif
986e461dc072 Initial revision
glantau
parents:
diff changeset
552
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
553 if(s->error_resilience)
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
554 memset(s->error_status_table, MV_ERROR|AC_ERROR|DC_ERROR|VP_START|AC_END|DC_END|MV_END, s->mb_num*sizeof(UINT8));
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
555
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
556 /* decode each macroblock */
266
252444e5259b optimization
michaelni
parents: 262
diff changeset
557 s->block_wrap[0]=
252444e5259b optimization
michaelni
parents: 262
diff changeset
558 s->block_wrap[1]=
252444e5259b optimization
michaelni
parents: 262
diff changeset
559 s->block_wrap[2]=
252444e5259b optimization
michaelni
parents: 262
diff changeset
560 s->block_wrap[3]= s->mb_width*2 + 2;
252444e5259b optimization
michaelni
parents: 262
diff changeset
561 s->block_wrap[4]=
252444e5259b optimization
michaelni
parents: 262
diff changeset
562 s->block_wrap[5]= s->mb_width + 2;
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
563 s->mb_x=0;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
564 s->mb_y=0;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
565
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
566 decode_slice(s);
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
567 s->error_status_table[0]|= VP_START;
822
21d400c67fc5 fixing msmpeg4v3 with mb_height % slice_height != 0
michaelni
parents: 771
diff changeset
568 while(s->mb_y<s->mb_height && s->gb.size*8 - get_bits_count(&s->gb)>16){
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
569 if(s->msmpeg4_version){
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
570 if(s->mb_x!=0 || (s->mb_y%s->slice_height)!=0)
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
571 break;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
572 }else{
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
573 if(ff_h263_resync(s)<0)
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
574 break;
454
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
575 }
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
576
756
f2644bb12a43 fixing h263 decoding (did segfault)
michaelni
parents: 752
diff changeset
577 if(s->msmpeg4_version!=4 && s->h263_pred)
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
578 ff_mpeg4_clean_buffers(s);
454
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
579
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
580 decode_slice(s);
756
f2644bb12a43 fixing h263 decoding (did segfault)
michaelni
parents: 752
diff changeset
581
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
582 s->error_status_table[s->resync_mb_x + s->resync_mb_y*s->mb_width]|= VP_START;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
583 }
756
f2644bb12a43 fixing h263 decoding (did segfault)
michaelni
parents: 752
diff changeset
584
311
ac677a84d5df wmv1 header parser (unfinished)
michaelni
parents: 308
diff changeset
585 if (s->h263_msmpeg4 && s->msmpeg4_version<4 && s->pict_type==I_TYPE)
208
2eb04d6be309 (commit by michael)
arpi_esp
parents: 203
diff changeset
586 if(msmpeg4_decode_ext_header(s, buf_size) < 0) return -1;
333
8aa87f1dfc52 divx 5.01 support
michaelni
parents: 311
diff changeset
587
8aa87f1dfc52 divx 5.01 support
michaelni
parents: 311
diff changeset
588 /* divx 5.01+ bistream reorder stuff */
655
0018e190cc4c m4v input support
michaelni
parents: 589
diff changeset
589 if(s->codec_id==CODEC_ID_MPEG4 && s->bitstream_buffer_size==0 && s->divx_version>=500){
454
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
590 int current_pos= get_bits_count(&s->gb)>>3;
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
591
333
8aa87f1dfc52 divx 5.01 support
michaelni
parents: 311
diff changeset
592 if( buf_size - current_pos > 5
8aa87f1dfc52 divx 5.01 support
michaelni
parents: 311
diff changeset
593 && buf_size - current_pos < BITSTREAM_BUFFER_SIZE){
454
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
594 int i;
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
595 int startcode_found=0;
655
0018e190cc4c m4v input support
michaelni
parents: 589
diff changeset
596 for(i=current_pos; i<buf_size-3; i++){
454
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
597 if(buf[i]==0 && buf[i+1]==0 && buf[i+2]==1 && buf[i+3]==0xB6){
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
598 startcode_found=1;
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
599 break;
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
600 }
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
601 }
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
602 if(startcode_found){
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
603 memcpy(s->bitstream_buffer, buf + current_pos, buf_size - current_pos);
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
604 s->bitstream_buffer_size= buf_size - current_pos;
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
605 }
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
606 }
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
607 }
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
608
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
609 if(s->error_resilience){
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
610 int error=0, num_end_markers=0;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
611 for(i=0; i<s->mb_num; i++){
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
612 int status= s->error_status_table[i];
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
613 #if 0
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
614 if(i%s->mb_width == 0) printf("\n");
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
615 printf("%2X ", status);
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
616 #endif
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
617 if(status==0) continue;
454
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
618
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
619 if(status&(DC_ERROR|AC_ERROR|MV_ERROR))
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
620 error=1;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
621 if(status&VP_START){
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
622 if(num_end_markers)
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
623 error=1;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
624 num_end_markers=3;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
625 }
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
626 if(status&AC_END)
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
627 num_end_markers--;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
628 if(status&DC_END)
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
629 num_end_markers--;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
630 if(status&MV_END)
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
631 num_end_markers--;
454
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
632 }
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
633 if(num_end_markers || error){
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
634 fprintf(stderr, "concealing errors\n");
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
635 //printf("type:%d\n", s->pict_type);
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
636 ff_error_resilience(s);
333
8aa87f1dfc52 divx 5.01 support
michaelni
parents: 311
diff changeset
637 }
353
386f430e93f4 freeze fix
michaelni
parents: 350
diff changeset
638 }
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
639
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
640 MPV_frame_end(s);
361
dc2fb310008d MV visualisation support
michaelni
parents: 353
diff changeset
641 #if 0 //dirty show MVs, we should export the MV tables and write a filter to show them
dc2fb310008d MV visualisation support
michaelni
parents: 353
diff changeset
642 {
dc2fb310008d MV visualisation support
michaelni
parents: 353
diff changeset
643 int mb_y;
dc2fb310008d MV visualisation support
michaelni
parents: 353
diff changeset
644 s->has_b_frames=1;
dc2fb310008d MV visualisation support
michaelni
parents: 353
diff changeset
645 for(mb_y=0; mb_y<s->mb_height; mb_y++){
dc2fb310008d MV visualisation support
michaelni
parents: 353
diff changeset
646 int mb_x;
411
5c8b3a717929 workaround dc_scale bug in old ffmpeg msmpeg4v3 encoder (set workaround_bugs=1 for this)
michaelni
parents: 396
diff changeset
647 int y= mb_y*16 + 8;
361
dc2fb310008d MV visualisation support
michaelni
parents: 353
diff changeset
648 for(mb_x=0; mb_x<s->mb_width; mb_x++){
411
5c8b3a717929 workaround dc_scale bug in old ffmpeg msmpeg4v3 encoder (set workaround_bugs=1 for this)
michaelni
parents: 396
diff changeset
649 int x= mb_x*16 + 8;
361
dc2fb310008d MV visualisation support
michaelni
parents: 353
diff changeset
650 uint8_t *ptr= s->last_picture[0];
dc2fb310008d MV visualisation support
michaelni
parents: 353
diff changeset
651 int xy= 1 + mb_x*2 + (mb_y*2 + 1)*(s->mb_width*2 + 2);
dc2fb310008d MV visualisation support
michaelni
parents: 353
diff changeset
652 int mx= (s->motion_val[xy][0]>>1) + x;
dc2fb310008d MV visualisation support
michaelni
parents: 353
diff changeset
653 int my= (s->motion_val[xy][1]>>1) + y;
dc2fb310008d MV visualisation support
michaelni
parents: 353
diff changeset
654 int i;
dc2fb310008d MV visualisation support
michaelni
parents: 353
diff changeset
655 int max;
dc2fb310008d MV visualisation support
michaelni
parents: 353
diff changeset
656
dc2fb310008d MV visualisation support
michaelni
parents: 353
diff changeset
657 if(mx<0) mx=0;
dc2fb310008d MV visualisation support
michaelni
parents: 353
diff changeset
658 if(my<0) my=0;
dc2fb310008d MV visualisation support
michaelni
parents: 353
diff changeset
659 if(mx>=s->width) mx= s->width -1;
dc2fb310008d MV visualisation support
michaelni
parents: 353
diff changeset
660 if(my>=s->height) my= s->height-1;
dc2fb310008d MV visualisation support
michaelni
parents: 353
diff changeset
661 max= ABS(mx-x);
dc2fb310008d MV visualisation support
michaelni
parents: 353
diff changeset
662 if(ABS(my-y) > max) max= ABS(my-y);
dc2fb310008d MV visualisation support
michaelni
parents: 353
diff changeset
663 /* the ugliest linedrawing routine ... */
dc2fb310008d MV visualisation support
michaelni
parents: 353
diff changeset
664 for(i=0; i<max; i++){
dc2fb310008d MV visualisation support
michaelni
parents: 353
diff changeset
665 int x1= x + (mx-x)*i/max;
dc2fb310008d MV visualisation support
michaelni
parents: 353
diff changeset
666 int y1= y + (my-y)*i/max;
dc2fb310008d MV visualisation support
michaelni
parents: 353
diff changeset
667 ptr[y1*s->linesize + x1]+=100;
dc2fb310008d MV visualisation support
michaelni
parents: 353
diff changeset
668 }
411
5c8b3a717929 workaround dc_scale bug in old ffmpeg msmpeg4v3 encoder (set workaround_bugs=1 for this)
michaelni
parents: 396
diff changeset
669 ptr[y*s->linesize + x]+=100;
361
dc2fb310008d MV visualisation support
michaelni
parents: 353
diff changeset
670 s->mbskip_table[mb_x + mb_y*s->mb_width]=0;
dc2fb310008d MV visualisation support
michaelni
parents: 353
diff changeset
671 }
dc2fb310008d MV visualisation support
michaelni
parents: 353
diff changeset
672 }
dc2fb310008d MV visualisation support
michaelni
parents: 353
diff changeset
673
dc2fb310008d MV visualisation support
michaelni
parents: 353
diff changeset
674 }
dc2fb310008d MV visualisation support
michaelni
parents: 353
diff changeset
675 #endif
273
34f40a0fc840 msmpeg4 bugfix (wrong frame displayed if some frames are skipped)
michaelni
parents: 266
diff changeset
676 if(s->pict_type==B_TYPE || (!s->has_b_frames)){
262
7d941b8c4e84 mpeg4 b-frames :)
michaelni
parents: 251
diff changeset
677 pict->data[0] = s->current_picture[0];
7d941b8c4e84 mpeg4 b-frames :)
michaelni
parents: 251
diff changeset
678 pict->data[1] = s->current_picture[1];
7d941b8c4e84 mpeg4 b-frames :)
michaelni
parents: 251
diff changeset
679 pict->data[2] = s->current_picture[2];
7d941b8c4e84 mpeg4 b-frames :)
michaelni
parents: 251
diff changeset
680 } else {
7d941b8c4e84 mpeg4 b-frames :)
michaelni
parents: 251
diff changeset
681 pict->data[0] = s->last_picture[0];
7d941b8c4e84 mpeg4 b-frames :)
michaelni
parents: 251
diff changeset
682 pict->data[1] = s->last_picture[1];
7d941b8c4e84 mpeg4 b-frames :)
michaelni
parents: 251
diff changeset
683 pict->data[2] = s->last_picture[2];
7d941b8c4e84 mpeg4 b-frames :)
michaelni
parents: 251
diff changeset
684 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
685 pict->linesize[0] = s->linesize;
556
762c67fd4078 uvlinesize
michaelni
parents: 553
diff changeset
686 pict->linesize[1] = s->uvlinesize;
762c67fd4078 uvlinesize
michaelni
parents: 553
diff changeset
687 pict->linesize[2] = s->uvlinesize;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
688
986e461dc072 Initial revision
glantau
parents:
diff changeset
689 avctx->quality = s->qscale;
231
840cd25bf259 - Fixes on RTP and GOB headers for H.263.
pulento
parents: 208
diff changeset
690
840cd25bf259 - Fixes on RTP and GOB headers for H.263.
pulento
parents: 208
diff changeset
691 /* Return the Picture timestamp as the frame number */
840cd25bf259 - Fixes on RTP and GOB headers for H.263.
pulento
parents: 208
diff changeset
692 /* we substract 1 because it is added on utils.c */
840cd25bf259 - Fixes on RTP and GOB headers for H.263.
pulento
parents: 208
diff changeset
693 avctx->frame_number = s->picture_number - 1;
840cd25bf259 - Fixes on RTP and GOB headers for H.263.
pulento
parents: 208
diff changeset
694
341
bf26081c373c avcodec_flush_buffers()
michaelni
parents: 336
diff changeset
695 /* dont output the last pic after seeking
bf26081c373c avcodec_flush_buffers()
michaelni
parents: 336
diff changeset
696 note we allready added +1 for the current pix in MPV_frame_end(s) */
bf26081c373c avcodec_flush_buffers()
michaelni
parents: 336
diff changeset
697 if(s->num_available_buffers>=2 || (!s->has_b_frames))
bf26081c373c avcodec_flush_buffers()
michaelni
parents: 336
diff changeset
698 *data_size = sizeof(AVPicture);
384
d442918c4698 print frame decoding time support (x86 only)
michaelni
parents: 361
diff changeset
699 #ifdef PRINT_FRAME_TIME
d442918c4698 print frame decoding time support (x86 only)
michaelni
parents: 361
diff changeset
700 printf("%Ld\n", rdtsc()-time);
d442918c4698 print frame decoding time support (x86 only)
michaelni
parents: 361
diff changeset
701 #endif
655
0018e190cc4c m4v input support
michaelni
parents: 589
diff changeset
702 return get_consumed_bytes(s, buf_size);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
703 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
704
67
cdd89f96cbe1 added draw_horiz_band test
glantau
parents: 60
diff changeset
705 AVCodec mpeg4_decoder = {
cdd89f96cbe1 added draw_horiz_band test
glantau
parents: 60
diff changeset
706 "mpeg4",
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
707 CODEC_TYPE_VIDEO,
67
cdd89f96cbe1 added draw_horiz_band test
glantau
parents: 60
diff changeset
708 CODEC_ID_MPEG4,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
709 sizeof(MpegEncContext),
986e461dc072 Initial revision
glantau
parents:
diff changeset
710 h263_decode_init,
986e461dc072 Initial revision
glantau
parents:
diff changeset
711 NULL,
986e461dc072 Initial revision
glantau
parents:
diff changeset
712 h263_decode_end,
986e461dc072 Initial revision
glantau
parents:
diff changeset
713 h263_decode_frame,
842
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
714 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
715 };
986e461dc072 Initial revision
glantau
parents:
diff changeset
716
986e461dc072 Initial revision
glantau
parents:
diff changeset
717 AVCodec h263_decoder = {
986e461dc072 Initial revision
glantau
parents:
diff changeset
718 "h263",
986e461dc072 Initial revision
glantau
parents:
diff changeset
719 CODEC_TYPE_VIDEO,
986e461dc072 Initial revision
glantau
parents:
diff changeset
720 CODEC_ID_H263,
986e461dc072 Initial revision
glantau
parents:
diff changeset
721 sizeof(MpegEncContext),
986e461dc072 Initial revision
glantau
parents:
diff changeset
722 h263_decode_init,
986e461dc072 Initial revision
glantau
parents:
diff changeset
723 NULL,
986e461dc072 Initial revision
glantau
parents:
diff changeset
724 h263_decode_end,
986e461dc072 Initial revision
glantau
parents:
diff changeset
725 h263_decode_frame,
553
18ad513d92fe direct rendering method 1 support
michaelni
parents: 543
diff changeset
726 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
727 };
986e461dc072 Initial revision
glantau
parents:
diff changeset
728
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
729 AVCodec msmpeg4v1_decoder = {
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
730 "msmpeg4v1",
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
731 CODEC_TYPE_VIDEO,
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
732 CODEC_ID_MSMPEG4V1,
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
733 sizeof(MpegEncContext),
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
734 h263_decode_init,
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
735 NULL,
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
736 h263_decode_end,
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
737 h263_decode_frame,
553
18ad513d92fe direct rendering method 1 support
michaelni
parents: 543
diff changeset
738 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1,
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
739 };
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
740
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
741 AVCodec msmpeg4v2_decoder = {
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
742 "msmpeg4v2",
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
743 CODEC_TYPE_VIDEO,
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
744 CODEC_ID_MSMPEG4V2,
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
745 sizeof(MpegEncContext),
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
746 h263_decode_init,
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
747 NULL,
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
748 h263_decode_end,
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
749 h263_decode_frame,
553
18ad513d92fe direct rendering method 1 support
michaelni
parents: 543
diff changeset
750 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1,
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
751 };
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
752
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
753 AVCodec msmpeg4v3_decoder = {
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
754 "msmpeg4",
986e461dc072 Initial revision
glantau
parents:
diff changeset
755 CODEC_TYPE_VIDEO,
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
756 CODEC_ID_MSMPEG4V3,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
757 sizeof(MpegEncContext),
986e461dc072 Initial revision
glantau
parents:
diff changeset
758 h263_decode_init,
986e461dc072 Initial revision
glantau
parents:
diff changeset
759 NULL,
986e461dc072 Initial revision
glantau
parents:
diff changeset
760 h263_decode_end,
986e461dc072 Initial revision
glantau
parents:
diff changeset
761 h263_decode_frame,
553
18ad513d92fe direct rendering method 1 support
michaelni
parents: 543
diff changeset
762 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
763 };
986e461dc072 Initial revision
glantau
parents:
diff changeset
764
311
ac677a84d5df wmv1 header parser (unfinished)
michaelni
parents: 308
diff changeset
765 AVCodec wmv1_decoder = {
ac677a84d5df wmv1 header parser (unfinished)
michaelni
parents: 308
diff changeset
766 "wmv1",
ac677a84d5df wmv1 header parser (unfinished)
michaelni
parents: 308
diff changeset
767 CODEC_TYPE_VIDEO,
ac677a84d5df wmv1 header parser (unfinished)
michaelni
parents: 308
diff changeset
768 CODEC_ID_WMV1,
ac677a84d5df wmv1 header parser (unfinished)
michaelni
parents: 308
diff changeset
769 sizeof(MpegEncContext),
ac677a84d5df wmv1 header parser (unfinished)
michaelni
parents: 308
diff changeset
770 h263_decode_init,
ac677a84d5df wmv1 header parser (unfinished)
michaelni
parents: 308
diff changeset
771 NULL,
ac677a84d5df wmv1 header parser (unfinished)
michaelni
parents: 308
diff changeset
772 h263_decode_end,
ac677a84d5df wmv1 header parser (unfinished)
michaelni
parents: 308
diff changeset
773 h263_decode_frame,
553
18ad513d92fe direct rendering method 1 support
michaelni
parents: 543
diff changeset
774 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1,
311
ac677a84d5df wmv1 header parser (unfinished)
michaelni
parents: 308
diff changeset
775 };
ac677a84d5df wmv1 header parser (unfinished)
michaelni
parents: 308
diff changeset
776
498
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 485
diff changeset
777 AVCodec wmv2_decoder = {
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 485
diff changeset
778 "wmv2",
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 485
diff changeset
779 CODEC_TYPE_VIDEO,
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 485
diff changeset
780 CODEC_ID_WMV2,
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 485
diff changeset
781 sizeof(MpegEncContext),
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 485
diff changeset
782 h263_decode_init,
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 485
diff changeset
783 NULL,
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 485
diff changeset
784 h263_decode_end,
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 485
diff changeset
785 h263_decode_frame,
553
18ad513d92fe direct rendering method 1 support
michaelni
parents: 543
diff changeset
786 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1,
498
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 485
diff changeset
787 };
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 485
diff changeset
788
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
789 AVCodec h263i_decoder = {
986e461dc072 Initial revision
glantau
parents:
diff changeset
790 "h263i",
986e461dc072 Initial revision
glantau
parents:
diff changeset
791 CODEC_TYPE_VIDEO,
986e461dc072 Initial revision
glantau
parents:
diff changeset
792 CODEC_ID_H263I,
986e461dc072 Initial revision
glantau
parents:
diff changeset
793 sizeof(MpegEncContext),
986e461dc072 Initial revision
glantau
parents:
diff changeset
794 h263_decode_init,
986e461dc072 Initial revision
glantau
parents:
diff changeset
795 NULL,
986e461dc072 Initial revision
glantau
parents:
diff changeset
796 h263_decode_end,
986e461dc072 Initial revision
glantau
parents:
diff changeset
797 h263_decode_frame,
553
18ad513d92fe direct rendering method 1 support
michaelni
parents: 543
diff changeset
798 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
799 };
986e461dc072 Initial revision
glantau
parents:
diff changeset
800