annotate h263dec.c @ 752:97077dd24bfa libavcodec

fixing alt_scan for the first frame (variable was reset)
author michaelni
date Wed, 16 Oct 2002 17:23:18 +0000
parents 4adadf210b3b
children f2644bb12a43
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;
454
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
63 s->first_slice_line = 0;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
64 break;
67
cdd89f96cbe1 added draw_horiz_band test
glantau
parents: 60
diff changeset
65 case CODEC_ID_MPEG4:
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
66 s->time_increment_bits = 4; /* default value for broken headers */
986e461dc072 Initial revision
glantau
parents:
diff changeset
67 s->h263_pred = 1;
336
c56b45669214 export delay info
michaelni
parents: 333
diff changeset
68 s->has_b_frames = 1; //default, might be overriden in the vol header during header parsing
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
69 break;
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
70 case CODEC_ID_MSMPEG4V1:
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
71 s->h263_msmpeg4 = 1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
72 s->h263_pred = 1;
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
73 s->msmpeg4_version=1;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
74 break;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
75 case CODEC_ID_MSMPEG4V2:
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
76 s->h263_msmpeg4 = 1;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
77 s->h263_pred = 1;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
78 s->msmpeg4_version=2;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
79 break;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
80 case CODEC_ID_MSMPEG4V3:
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
81 s->h263_msmpeg4 = 1;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
82 s->h263_pred = 1;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
83 s->msmpeg4_version=3;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
84 break;
311
ac677a84d5df wmv1 header parser (unfinished)
michaelni
parents: 308
diff changeset
85 case CODEC_ID_WMV1:
ac677a84d5df wmv1 header parser (unfinished)
michaelni
parents: 308
diff changeset
86 s->h263_msmpeg4 = 1;
ac677a84d5df wmv1 header parser (unfinished)
michaelni
parents: 308
diff changeset
87 s->h263_pred = 1;
ac677a84d5df wmv1 header parser (unfinished)
michaelni
parents: 308
diff changeset
88 s->msmpeg4_version=4;
ac677a84d5df wmv1 header parser (unfinished)
michaelni
parents: 308
diff changeset
89 break;
498
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 485
diff changeset
90 case CODEC_ID_WMV2:
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 485
diff changeset
91 s->h263_msmpeg4 = 1;
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 485
diff changeset
92 s->h263_pred = 1;
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 485
diff changeset
93 s->msmpeg4_version=5;
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 485
diff changeset
94 break;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
95 case CODEC_ID_H263I:
986e461dc072 Initial revision
glantau
parents:
diff changeset
96 s->h263_intel = 1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
97 break;
986e461dc072 Initial revision
glantau
parents:
diff changeset
98 default:
986e461dc072 Initial revision
glantau
parents:
diff changeset
99 return -1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
100 }
344
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
101 s->codec_id= avctx->codec->id;
553
18ad513d92fe direct rendering method 1 support
michaelni
parents: 543
diff changeset
102
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
103 /* 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
104 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
105 if (MPV_common_init(s) < 0)
cb5dabd00ba2 - Bug fix on inter MCBPC table for inter+q.
pulento
parents: 67
diff changeset
106 return -1;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
107
986e461dc072 Initial revision
glantau
parents:
diff changeset
108 if (s->h263_msmpeg4)
498
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 485
diff changeset
109 ff_msmpeg4_decode_init(s);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
110 else
986e461dc072 Initial revision
glantau
parents:
diff changeset
111 h263_decode_init_vlc(s);
986e461dc072 Initial revision
glantau
parents:
diff changeset
112
986e461dc072 Initial revision
glantau
parents:
diff changeset
113 return 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
114 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
115
986e461dc072 Initial revision
glantau
parents:
diff changeset
116 static int h263_decode_end(AVCodecContext *avctx)
986e461dc072 Initial revision
glantau
parents:
diff changeset
117 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
118 MpegEncContext *s = avctx->priv_data;
986e461dc072 Initial revision
glantau
parents:
diff changeset
119
986e461dc072 Initial revision
glantau
parents:
diff changeset
120 MPV_common_end(s);
986e461dc072 Initial revision
glantau
parents:
diff changeset
121 return 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
122 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
123
655
0018e190cc4c m4v input support
michaelni
parents: 589
diff changeset
124 /**
0018e190cc4c m4v input support
michaelni
parents: 589
diff changeset
125 * retunrs the number of bytes consumed for building the current frame
0018e190cc4c m4v input support
michaelni
parents: 589
diff changeset
126 */
0018e190cc4c m4v input support
michaelni
parents: 589
diff changeset
127 static int get_consumed_bytes(MpegEncContext *s, int buf_size){
0018e190cc4c m4v input support
michaelni
parents: 589
diff changeset
128 int pos= (get_bits_count(&s->gb)+7)>>3;
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;
0018e190cc4c m4v input support
michaelni
parents: 589
diff changeset
132 }else{
0018e190cc4c m4v input support
michaelni
parents: 589
diff changeset
133 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
134 if(pos+10>buf_size) pos=buf_size; // oops ;)
655
0018e190cc4c m4v input support
michaelni
parents: 589
diff changeset
135
0018e190cc4c m4v input support
michaelni
parents: 589
diff changeset
136 return pos;
0018e190cc4c m4v input support
michaelni
parents: 589
diff changeset
137 }
0018e190cc4c m4v input support
michaelni
parents: 589
diff changeset
138 }
0018e190cc4c m4v input support
michaelni
parents: 589
diff changeset
139
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
140 static int decode_slice(MpegEncContext *s){
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
141 s->last_resync_gb= s->gb;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
142 s->first_slice_line= 1;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
143
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
144 s->resync_mb_x= s->mb_x;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
145 s->resync_mb_y= s->mb_y;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
146
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
147 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
148 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
149
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
150 if(s->partitioned_frame){
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
151 const int qscale= s->qscale;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
152
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
153 if(s->codec_id==CODEC_ID_MPEG4){
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
154 if(ff_mpeg4_decode_partitions(s) < 0)
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
155 return -1;
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
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
158 /* restore variables which where modified */
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
159 s->first_slice_line=1;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
160 s->mb_x= s->resync_mb_x;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
161 s->mb_y= s->resync_mb_y;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
162 s->qscale= qscale;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
163 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
164 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
165 }
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
166
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
167 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
168 /* per-row end of slice checks */
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
169 if(s->msmpeg4_version){
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
170 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
171 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
172 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
173 return 0;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
174 }
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
175 }
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
176
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
177 if(s->msmpeg4_version==1){
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
178 s->last_dc[0]=
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
179 s->last_dc[1]=
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
180 s->last_dc[2]= 128;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
181 }
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
182
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
183 ff_init_block_index(s);
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
184 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
185 int ret;
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_update_block_index(s);
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
188
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
189 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
190 s->first_slice_line=0;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
191 }
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 /* DCT & quantize */
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
194 clear_blocks(s->block[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 s->mv_dir = MV_DIR_FORWARD;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
197 s->mv_type = MV_TYPE_16X16;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
198 //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
199 ret= s->decode_mb(s, s->block);
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
200
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
201 PRINT_QP("%2d", s->qscale);
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
202 MPV_decode_mb(s, s->block);
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
203
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
204 if(ret<0){
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
205 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
206 if(ret==SLICE_END){
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
207 //printf("%d %d %06X\n", s->mb_x, s->gb.size*8 - 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
208 s->error_status_table[xy]|= AC_END;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
209 if(!s->partitioned_frame)
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
210 s->error_status_table[xy]|= MV_END|DC_END;
750
4adadf210b3b better padding bug detection
michaelni
parents: 747
diff changeset
211
4adadf210b3b better padding bug detection
michaelni
parents: 747
diff changeset
212 s->padding_bug_score--;
4adadf210b3b better padding bug detection
michaelni
parents: 747
diff changeset
213
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
214 if(++s->mb_x >= s->mb_width){
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
215 s->mb_x=0;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
216 ff_draw_horiz_band(s);
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
217 s->mb_y++;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
218 }
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
219 return 0;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
220 }else if(ret==SLICE_NOEND){
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
221 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
222 return -1;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
223 }
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
224 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
225 s->error_status_table[xy]|= AC_ERROR;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
226 if(!s->partitioned_frame)
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
227 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
228
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
229 return -1;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
230 }
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
231 }
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 ff_draw_horiz_band(s);
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 PRINT_QP("%s", "\n");
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 s->mb_x= 0;
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
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
240 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
241
750
4adadf210b3b better padding bug detection
michaelni
parents: 747
diff changeset
242 /* try to detect the padding bug */
4adadf210b3b better padding bug detection
michaelni
parents: 747
diff changeset
243 if( s->codec_id==CODEC_ID_MPEG4
4adadf210b3b better padding bug detection
michaelni
parents: 747
diff changeset
244 && (s->workaround_bugs&FF_BUG_AUTODETECT)
4adadf210b3b better padding bug detection
michaelni
parents: 747
diff changeset
245 && s->gb.size*8 - get_bits_count(&s->gb) >=0
4adadf210b3b better padding bug detection
michaelni
parents: 747
diff changeset
246 && s->gb.size*8 - get_bits_count(&s->gb) < 48
4adadf210b3b better padding bug detection
michaelni
parents: 747
diff changeset
247 && !s->resync_marker
4adadf210b3b better padding bug detection
michaelni
parents: 747
diff changeset
248 && !s->data_partitioning){
4adadf210b3b better padding bug detection
michaelni
parents: 747
diff changeset
249
4adadf210b3b better padding bug detection
michaelni
parents: 747
diff changeset
250 const int bits_count= get_bits_count(&s->gb);
4adadf210b3b better padding bug detection
michaelni
parents: 747
diff changeset
251 const int bits_left = s->gb.size*8 - bits_count;
4adadf210b3b better padding bug detection
michaelni
parents: 747
diff changeset
252
4adadf210b3b better padding bug detection
michaelni
parents: 747
diff changeset
253 if(bits_left==0 || bits_left>8){
4adadf210b3b better padding bug detection
michaelni
parents: 747
diff changeset
254 s->padding_bug_score++;
4adadf210b3b better padding bug detection
michaelni
parents: 747
diff changeset
255 } else {
4adadf210b3b better padding bug detection
michaelni
parents: 747
diff changeset
256 int v= show_bits(&s->gb, 8);
4adadf210b3b better padding bug detection
michaelni
parents: 747
diff changeset
257 v|= 0x7F >> (7-(bits_count&7));
4adadf210b3b better padding bug detection
michaelni
parents: 747
diff changeset
258
4adadf210b3b better padding bug detection
michaelni
parents: 747
diff changeset
259 if(v==0x7F)
4adadf210b3b better padding bug detection
michaelni
parents: 747
diff changeset
260 s->padding_bug_score--;
4adadf210b3b better padding bug detection
michaelni
parents: 747
diff changeset
261 else
4adadf210b3b better padding bug detection
michaelni
parents: 747
diff changeset
262 s->padding_bug_score++;
4adadf210b3b better padding bug detection
michaelni
parents: 747
diff changeset
263 }
4adadf210b3b better padding bug detection
michaelni
parents: 747
diff changeset
264
4adadf210b3b better padding bug detection
michaelni
parents: 747
diff changeset
265 if(s->padding_bug_score > -2)
4adadf210b3b better padding bug detection
michaelni
parents: 747
diff changeset
266 s->workaround_bugs |= FF_BUG_NO_PADDING;
4adadf210b3b better padding bug detection
michaelni
parents: 747
diff changeset
267 else
4adadf210b3b better padding bug detection
michaelni
parents: 747
diff changeset
268 s->workaround_bugs &= ~FF_BUG_NO_PADDING;
4adadf210b3b better padding bug detection
michaelni
parents: 747
diff changeset
269 }
4adadf210b3b better padding bug detection
michaelni
parents: 747
diff changeset
270
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
271 // 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
272 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
273 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
274 int max_extra=7;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
275
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
276 /* no markers in M$ crap */
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
277 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
278 max_extra+= 17;
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 /* 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
281 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
282 max_extra+= 48;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
283 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
284 max_extra+= 256*256*256*64;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
285
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
286 if(left>max_extra){
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
287 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
288 }
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
289 else if(left<0){
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
290 fprintf(stderr, "overreading %d bits\n", -left);
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
291 }else
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
292 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
293
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
294 return 0;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
295 }
750
4adadf210b3b better padding bug detection
michaelni
parents: 747
diff changeset
296
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
297 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
298 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
299 show_bits(&s->gb, 24));
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
300 return -1;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
301 }
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
302
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
303 static int h263_decode_frame(AVCodecContext *avctx,
986e461dc072 Initial revision
glantau
parents:
diff changeset
304 void *data, int *data_size,
986e461dc072 Initial revision
glantau
parents:
diff changeset
305 UINT8 *buf, int buf_size)
986e461dc072 Initial revision
glantau
parents:
diff changeset
306 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
307 MpegEncContext *s = avctx->priv_data;
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
308 int ret,i;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
309 AVPicture *pict = data;
384
d442918c4698 print frame decoding time support (x86 only)
michaelni
parents: 361
diff changeset
310 #ifdef PRINT_FRAME_TIME
d442918c4698 print frame decoding time support (x86 only)
michaelni
parents: 361
diff changeset
311 uint64_t time= rdtsc();
d442918c4698 print frame decoding time support (x86 only)
michaelni
parents: 361
diff changeset
312 #endif
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
313 #ifdef DEBUG
986e461dc072 Initial revision
glantau
parents:
diff changeset
314 printf("*****frame %d size=%d\n", avctx->frame_number, buf_size);
986e461dc072 Initial revision
glantau
parents:
diff changeset
315 printf("bytes=%x %x %x %x\n", buf[0], buf[1], buf[2], buf[3]);
986e461dc072 Initial revision
glantau
parents:
diff changeset
316 #endif
345
e05b357a398a export mbskip_table for direct rendering
michaelni
parents: 344
diff changeset
317
e05b357a398a export mbskip_table for direct rendering
michaelni
parents: 344
diff changeset
318 s->hurry_up= avctx->hurry_up;
454
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
319 s->error_resilience= avctx->error_resilience;
701
85b071dfc7e3 ff_get_fourcc() & XVIX support
michaelni
parents: 669
diff changeset
320
485
20108840b0e5 grayscale only decoding
michaelni
parents: 465
diff changeset
321 s->flags= avctx->flags;
454
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
322
657
8de2081a39ab uninitialized var ...
michaelni
parents: 655
diff changeset
323 *data_size = 0;
8de2081a39ab uninitialized var ...
michaelni
parents: 655
diff changeset
324
8de2081a39ab uninitialized var ...
michaelni
parents: 655
diff changeset
325 /* no supplementary picture */
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
326 if (buf_size == 0) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
327 return 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
328 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
329
465
76c8afc9c1eb 100l divx501+ seeking bugfix
michaelni
parents: 454
diff changeset
330 if(s->bitstream_buffer_size && buf_size<20){ //divx 5.01+ frame reorder
333
8aa87f1dfc52 divx 5.01 support
michaelni
parents: 311
diff changeset
331 init_get_bits(&s->gb, s->bitstream_buffer, s->bitstream_buffer_size);
353
386f430e93f4 freeze fix
michaelni
parents: 350
diff changeset
332 }else
333
8aa87f1dfc52 divx 5.01 support
michaelni
parents: 311
diff changeset
333 init_get_bits(&s->gb, buf, buf_size);
465
76c8afc9c1eb 100l divx501+ seeking bugfix
michaelni
parents: 454
diff changeset
334 s->bitstream_buffer_size=0;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
335
718
16dab8296293 fixing custom quantizer matrix decoding
michaelni
parents: 717
diff changeset
336 if (!s->context_initialized) {
752
97077dd24bfa fixing alt_scan for the first frame (variable was reset)
michaelni
parents: 750
diff changeset
337 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
338 return -1;
16dab8296293 fixing custom quantizer matrix decoding
michaelni
parents: 717
diff changeset
339 }
16dab8296293 fixing custom quantizer matrix decoding
michaelni
parents: 717
diff changeset
340
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
341 /* let's go :-) */
986e461dc072 Initial revision
glantau
parents:
diff changeset
342 if (s->h263_msmpeg4) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
343 ret = msmpeg4_decode_picture_header(s);
986e461dc072 Initial revision
glantau
parents:
diff changeset
344 } 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
345 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
346 GetBitContext gb;
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
347
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
348 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
349 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
350 }
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
351 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
352
336
c56b45669214 export delay info
michaelni
parents: 333
diff changeset
353 s->has_b_frames= !s->low_delay;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
354 } else if (s->h263_intel) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
355 ret = intel_h263_decode_picture_header(s);
986e461dc072 Initial revision
glantau
parents:
diff changeset
356 } else {
986e461dc072 Initial revision
glantau
parents:
diff changeset
357 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
358 }
556
762c67fd4078 uvlinesize
michaelni
parents: 553
diff changeset
359 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
360
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
361 if(s->workaround_bugs&FF_BUG_AUTODETECT){
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
362 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
363 s->workaround_bugs|= FF_BUG_XVID_ILACE;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
364
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
365 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
366 s->workaround_bugs|= FF_BUG_AC_VLC;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
367
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
368 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
369 s->workaround_bugs|= FF_BUG_AC_VLC;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
370
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
371 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
372 s->workaround_bugs|= FF_BUG_UMP4;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
373 s->workaround_bugs|= FF_BUG_AC_VLC;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
374 }
750
4adadf210b3b better padding bug detection
michaelni
parents: 747
diff changeset
375 //printf("padding_bug_score: %d\n", s->padding_bug_score);
4adadf210b3b better padding bug detection
michaelni
parents: 747
diff changeset
376 #if 0
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
377 if(s->divx_version==500)
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
378 s->workaround_bugs|= FF_BUG_NO_PADDING;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
379
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
380 /* 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
381 * lets hope this at least works
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
382 */
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
383 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
384 && 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
385 s->workaround_bugs|= FF_BUG_NO_PADDING;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
386
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
387 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
388 s->workaround_bugs|= FF_BUG_NO_PADDING;
750
4adadf210b3b better padding bug detection
michaelni
parents: 747
diff changeset
389 #endif
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
390 }
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
391
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
392
585
86ebb02c6693 dump bits per frame / qp / frame complexity support
michaelni
parents: 562
diff changeset
393 #if 0 // dump bits per frame / qp / complexity
86ebb02c6693 dump bits per frame / qp / frame complexity support
michaelni
parents: 562
diff changeset
394 {
86ebb02c6693 dump bits per frame / qp / frame complexity support
michaelni
parents: 562
diff changeset
395 static FILE *f=NULL;
86ebb02c6693 dump bits per frame / qp / frame complexity support
michaelni
parents: 562
diff changeset
396 if(!f) f=fopen("rate_qp_cplx.txt", "w");
589
507e688d57b2 10l found by R«±mi Guyomarch <rguyom at pobox dot com>
michaelni
parents: 585
diff changeset
397 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
398 }
86ebb02c6693 dump bits per frame / qp / frame complexity support
michaelni
parents: 562
diff changeset
399 #endif
553
18ad513d92fe direct rendering method 1 support
michaelni
parents: 543
diff changeset
400
274
d0c186bcf075 use the width & height from the mpeg4 header ... in the case that its complete
michaelni
parents: 273
diff changeset
401 /* After H263 & mpeg4 header decode we have the height, width,*/
160
1bf8c111691d - Bug fixed on H.263 decoder initialization.
pulento
parents: 154
diff changeset
402 /* and other parameters. So then we could init the picture */
1bf8c111691d - Bug fixed on H.263 decoder initialization.
pulento
parents: 154
diff changeset
403 /* FIXME: By the way H263 decoder is evolving it should have */
1bf8c111691d - Bug fixed on H.263 decoder initialization.
pulento
parents: 154
diff changeset
404 /* an H263EncContext */
718
16dab8296293 fixing custom quantizer matrix decoding
michaelni
parents: 717
diff changeset
405 if ( s->width != avctx->width || s->height != avctx->height
16dab8296293 fixing custom quantizer matrix decoding
michaelni
parents: 717
diff changeset
406 || avctx->aspect_ratio_info != s->aspect_ratio_info
16dab8296293 fixing custom quantizer matrix decoding
michaelni
parents: 717
diff changeset
407 || avctx->aspected_width != s->aspected_width
16dab8296293 fixing custom quantizer matrix decoding
michaelni
parents: 717
diff changeset
408 || avctx->aspected_height != s->aspected_height) {
553
18ad513d92fe direct rendering method 1 support
michaelni
parents: 543
diff changeset
409 /* H.263 could change picture size any time */
18ad513d92fe direct rendering method 1 support
michaelni
parents: 543
diff changeset
410 MPV_common_end(s);
18ad513d92fe direct rendering method 1 support
michaelni
parents: 543
diff changeset
411 s->context_initialized=0;
18ad513d92fe direct rendering method 1 support
michaelni
parents: 543
diff changeset
412 }
274
d0c186bcf075 use the width & height from the mpeg4 header ... in the case that its complete
michaelni
parents: 273
diff changeset
413 if (!s->context_initialized) {
d0c186bcf075 use the width & height from the mpeg4 header ... in the case that its complete
michaelni
parents: 273
diff changeset
414 avctx->width = s->width;
d0c186bcf075 use the width & height from the mpeg4 header ... in the case that its complete
michaelni
parents: 273
diff changeset
415 avctx->height = s->height;
281
1fc96b02142e mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents: 274
diff changeset
416 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
417 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
418 {
b4bddbde44f3 aspect (ext. par too) support for h263 and mpeg4 (inc. build becouse of new vars)
al3x
parents: 658
diff changeset
419 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
420 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
421 }
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
422
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
423 if (s->codec_id==CODEC_ID_H263 && s->codec_id==CODEC_ID_H263)
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
424 s->gob_index = ff_h263_get_gob_height(s);
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
425
274
d0c186bcf075 use the width & height from the mpeg4 header ... in the case that its complete
michaelni
parents: 273
diff changeset
426 if (MPV_common_init(s) < 0)
d0c186bcf075 use the width & height from the mpeg4 header ... in the case that its complete
michaelni
parents: 273
diff changeset
427 return -1;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
428 }
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
429
655
0018e190cc4c m4v input support
michaelni
parents: 589
diff changeset
430 if(ret==FRAME_SKIPED) return get_consumed_bytes(s, buf_size);
454
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
431 /* skip if the header was thrashed */
498
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 485
diff changeset
432 if (ret < 0){
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 485
diff changeset
433 fprintf(stderr, "header damaged\n");
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
434 return -1;
498
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 485
diff changeset
435 }
341
bf26081c373c avcodec_flush_buffers()
michaelni
parents: 336
diff changeset
436 /* skip b frames if we dont have reference frames */
655
0018e190cc4c m4v input support
michaelni
parents: 589
diff changeset
437 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
438 /* skip b frames if we are in a hurry */
655
0018e190cc4c m4v input support
michaelni
parents: 589
diff changeset
439 if(s->hurry_up && s->pict_type==B_TYPE) return get_consumed_bytes(s, buf_size);
454
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
440
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
441 if(s->next_p_frame_damaged){
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
442 if(s->pict_type==B_TYPE)
655
0018e190cc4c m4v input support
michaelni
parents: 589
diff changeset
443 return get_consumed_bytes(s, buf_size);
454
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
444 else
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
445 s->next_p_frame_damaged=0;
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
446 }
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
447
553
18ad513d92fe direct rendering method 1 support
michaelni
parents: 543
diff changeset
448 MPV_frame_start(s, avctx);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
449
986e461dc072 Initial revision
glantau
parents:
diff changeset
450 #ifdef DEBUG
986e461dc072 Initial revision
glantau
parents:
diff changeset
451 printf("qscale=%d\n", s->qscale);
986e461dc072 Initial revision
glantau
parents:
diff changeset
452 #endif
986e461dc072 Initial revision
glantau
parents:
diff changeset
453
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
454 if(s->error_resilience)
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
455 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
456
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
457 /* decode each macroblock */
266
252444e5259b optimization
michaelni
parents: 262
diff changeset
458 s->block_wrap[0]=
252444e5259b optimization
michaelni
parents: 262
diff changeset
459 s->block_wrap[1]=
252444e5259b optimization
michaelni
parents: 262
diff changeset
460 s->block_wrap[2]=
252444e5259b optimization
michaelni
parents: 262
diff changeset
461 s->block_wrap[3]= s->mb_width*2 + 2;
252444e5259b optimization
michaelni
parents: 262
diff changeset
462 s->block_wrap[4]=
252444e5259b optimization
michaelni
parents: 262
diff changeset
463 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
464 s->mb_x=0;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
465 s->mb_y=0;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
466
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
467 decode_slice(s);
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
468 s->error_status_table[0]|= VP_START;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
469 while(s->mb_y<s->mb_height && s->gb.size*8 - get_bits_count(&s->gb)>32){
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
470 if(s->msmpeg4_version){
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
471 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
472 break;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
473 }else{
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
474 if(ff_h263_resync(s)<0)
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
475 break;
454
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
476 }
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
477
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
478 if(s->msmpeg4_version!=4)
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
479 ff_mpeg4_clean_buffers(s);
454
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
480
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
481 decode_slice(s);
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
482 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
483 }
208
2eb04d6be309 (commit by michael)
arpi_esp
parents: 203
diff changeset
484
311
ac677a84d5df wmv1 header parser (unfinished)
michaelni
parents: 308
diff changeset
485 if (s->h263_msmpeg4 && s->msmpeg4_version<4 && s->pict_type==I_TYPE)
208
2eb04d6be309 (commit by michael)
arpi_esp
parents: 203
diff changeset
486 if(msmpeg4_decode_ext_header(s, buf_size) < 0) return -1;
333
8aa87f1dfc52 divx 5.01 support
michaelni
parents: 311
diff changeset
487
8aa87f1dfc52 divx 5.01 support
michaelni
parents: 311
diff changeset
488 /* divx 5.01+ bistream reorder stuff */
655
0018e190cc4c m4v input support
michaelni
parents: 589
diff changeset
489 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
490 int current_pos= get_bits_count(&s->gb)>>3;
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
491
333
8aa87f1dfc52 divx 5.01 support
michaelni
parents: 311
diff changeset
492 if( buf_size - current_pos > 5
8aa87f1dfc52 divx 5.01 support
michaelni
parents: 311
diff changeset
493 && buf_size - current_pos < BITSTREAM_BUFFER_SIZE){
454
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
494 int i;
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
495 int startcode_found=0;
655
0018e190cc4c m4v input support
michaelni
parents: 589
diff changeset
496 for(i=current_pos; i<buf_size-3; i++){
454
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
497 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
498 startcode_found=1;
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
499 break;
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
500 }
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
501 }
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
502 if(startcode_found){
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
503 memcpy(s->bitstream_buffer, buf + current_pos, buf_size - current_pos);
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
504 s->bitstream_buffer_size= buf_size - current_pos;
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
505 }
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
506 }
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
507 }
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
508
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
509 if(s->error_resilience){
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
510 int error=0, num_end_markers=0;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
511 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
512 int status= s->error_status_table[i];
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
513 #if 0
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
514 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
515 printf("%2X ", status);
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
516 #endif
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
517 if(status==0) continue;
454
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
518
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
519 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
520 error=1;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
521 if(status&VP_START){
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
522 if(num_end_markers)
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
523 error=1;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
524 num_end_markers=3;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
525 }
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
526 if(status&AC_END)
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
527 num_end_markers--;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
528 if(status&DC_END)
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
529 num_end_markers--;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
530 if(status&MV_END)
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
531 num_end_markers--;
454
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
532 }
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
533 if(num_end_markers || error){
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
534 fprintf(stderr, "concealing errors\n");
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
535 //printf("type:%d\n", s->pict_type);
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
536 ff_error_resilience(s);
333
8aa87f1dfc52 divx 5.01 support
michaelni
parents: 311
diff changeset
537 }
353
386f430e93f4 freeze fix
michaelni
parents: 350
diff changeset
538 }
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
539
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
540 MPV_frame_end(s);
361
dc2fb310008d MV visualisation support
michaelni
parents: 353
diff changeset
541 #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
542 {
dc2fb310008d MV visualisation support
michaelni
parents: 353
diff changeset
543 int mb_y;
dc2fb310008d MV visualisation support
michaelni
parents: 353
diff changeset
544 s->has_b_frames=1;
dc2fb310008d MV visualisation support
michaelni
parents: 353
diff changeset
545 for(mb_y=0; mb_y<s->mb_height; mb_y++){
dc2fb310008d MV visualisation support
michaelni
parents: 353
diff changeset
546 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
547 int y= mb_y*16 + 8;
361
dc2fb310008d MV visualisation support
michaelni
parents: 353
diff changeset
548 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
549 int x= mb_x*16 + 8;
361
dc2fb310008d MV visualisation support
michaelni
parents: 353
diff changeset
550 uint8_t *ptr= s->last_picture[0];
dc2fb310008d MV visualisation support
michaelni
parents: 353
diff changeset
551 int xy= 1 + mb_x*2 + (mb_y*2 + 1)*(s->mb_width*2 + 2);
dc2fb310008d MV visualisation support
michaelni
parents: 353
diff changeset
552 int mx= (s->motion_val[xy][0]>>1) + x;
dc2fb310008d MV visualisation support
michaelni
parents: 353
diff changeset
553 int my= (s->motion_val[xy][1]>>1) + y;
dc2fb310008d MV visualisation support
michaelni
parents: 353
diff changeset
554 int i;
dc2fb310008d MV visualisation support
michaelni
parents: 353
diff changeset
555 int max;
dc2fb310008d MV visualisation support
michaelni
parents: 353
diff changeset
556
dc2fb310008d MV visualisation support
michaelni
parents: 353
diff changeset
557 if(mx<0) mx=0;
dc2fb310008d MV visualisation support
michaelni
parents: 353
diff changeset
558 if(my<0) my=0;
dc2fb310008d MV visualisation support
michaelni
parents: 353
diff changeset
559 if(mx>=s->width) mx= s->width -1;
dc2fb310008d MV visualisation support
michaelni
parents: 353
diff changeset
560 if(my>=s->height) my= s->height-1;
dc2fb310008d MV visualisation support
michaelni
parents: 353
diff changeset
561 max= ABS(mx-x);
dc2fb310008d MV visualisation support
michaelni
parents: 353
diff changeset
562 if(ABS(my-y) > max) max= ABS(my-y);
dc2fb310008d MV visualisation support
michaelni
parents: 353
diff changeset
563 /* the ugliest linedrawing routine ... */
dc2fb310008d MV visualisation support
michaelni
parents: 353
diff changeset
564 for(i=0; i<max; i++){
dc2fb310008d MV visualisation support
michaelni
parents: 353
diff changeset
565 int x1= x + (mx-x)*i/max;
dc2fb310008d MV visualisation support
michaelni
parents: 353
diff changeset
566 int y1= y + (my-y)*i/max;
dc2fb310008d MV visualisation support
michaelni
parents: 353
diff changeset
567 ptr[y1*s->linesize + x1]+=100;
dc2fb310008d MV visualisation support
michaelni
parents: 353
diff changeset
568 }
411
5c8b3a717929 workaround dc_scale bug in old ffmpeg msmpeg4v3 encoder (set workaround_bugs=1 for this)
michaelni
parents: 396
diff changeset
569 ptr[y*s->linesize + x]+=100;
361
dc2fb310008d MV visualisation support
michaelni
parents: 353
diff changeset
570 s->mbskip_table[mb_x + mb_y*s->mb_width]=0;
dc2fb310008d MV visualisation support
michaelni
parents: 353
diff changeset
571 }
dc2fb310008d MV visualisation support
michaelni
parents: 353
diff changeset
572 }
dc2fb310008d MV visualisation support
michaelni
parents: 353
diff changeset
573
dc2fb310008d MV visualisation support
michaelni
parents: 353
diff changeset
574 }
dc2fb310008d MV visualisation support
michaelni
parents: 353
diff changeset
575 #endif
273
34f40a0fc840 msmpeg4 bugfix (wrong frame displayed if some frames are skipped)
michaelni
parents: 266
diff changeset
576 if(s->pict_type==B_TYPE || (!s->has_b_frames)){
262
7d941b8c4e84 mpeg4 b-frames :)
michaelni
parents: 251
diff changeset
577 pict->data[0] = s->current_picture[0];
7d941b8c4e84 mpeg4 b-frames :)
michaelni
parents: 251
diff changeset
578 pict->data[1] = s->current_picture[1];
7d941b8c4e84 mpeg4 b-frames :)
michaelni
parents: 251
diff changeset
579 pict->data[2] = s->current_picture[2];
7d941b8c4e84 mpeg4 b-frames :)
michaelni
parents: 251
diff changeset
580 } else {
7d941b8c4e84 mpeg4 b-frames :)
michaelni
parents: 251
diff changeset
581 pict->data[0] = s->last_picture[0];
7d941b8c4e84 mpeg4 b-frames :)
michaelni
parents: 251
diff changeset
582 pict->data[1] = s->last_picture[1];
7d941b8c4e84 mpeg4 b-frames :)
michaelni
parents: 251
diff changeset
583 pict->data[2] = s->last_picture[2];
7d941b8c4e84 mpeg4 b-frames :)
michaelni
parents: 251
diff changeset
584 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
585 pict->linesize[0] = s->linesize;
556
762c67fd4078 uvlinesize
michaelni
parents: 553
diff changeset
586 pict->linesize[1] = s->uvlinesize;
762c67fd4078 uvlinesize
michaelni
parents: 553
diff changeset
587 pict->linesize[2] = s->uvlinesize;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
588
986e461dc072 Initial revision
glantau
parents:
diff changeset
589 avctx->quality = s->qscale;
231
840cd25bf259 - Fixes on RTP and GOB headers for H.263.
pulento
parents: 208
diff changeset
590
840cd25bf259 - Fixes on RTP and GOB headers for H.263.
pulento
parents: 208
diff changeset
591 /* Return the Picture timestamp as the frame number */
840cd25bf259 - Fixes on RTP and GOB headers for H.263.
pulento
parents: 208
diff changeset
592 /* 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
593 avctx->frame_number = s->picture_number - 1;
840cd25bf259 - Fixes on RTP and GOB headers for H.263.
pulento
parents: 208
diff changeset
594
341
bf26081c373c avcodec_flush_buffers()
michaelni
parents: 336
diff changeset
595 /* dont output the last pic after seeking
bf26081c373c avcodec_flush_buffers()
michaelni
parents: 336
diff changeset
596 note we allready added +1 for the current pix in MPV_frame_end(s) */
bf26081c373c avcodec_flush_buffers()
michaelni
parents: 336
diff changeset
597 if(s->num_available_buffers>=2 || (!s->has_b_frames))
bf26081c373c avcodec_flush_buffers()
michaelni
parents: 336
diff changeset
598 *data_size = sizeof(AVPicture);
384
d442918c4698 print frame decoding time support (x86 only)
michaelni
parents: 361
diff changeset
599 #ifdef PRINT_FRAME_TIME
d442918c4698 print frame decoding time support (x86 only)
michaelni
parents: 361
diff changeset
600 printf("%Ld\n", rdtsc()-time);
d442918c4698 print frame decoding time support (x86 only)
michaelni
parents: 361
diff changeset
601 #endif
655
0018e190cc4c m4v input support
michaelni
parents: 589
diff changeset
602 return get_consumed_bytes(s, buf_size);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
603 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
604
67
cdd89f96cbe1 added draw_horiz_band test
glantau
parents: 60
diff changeset
605 AVCodec mpeg4_decoder = {
cdd89f96cbe1 added draw_horiz_band test
glantau
parents: 60
diff changeset
606 "mpeg4",
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
607 CODEC_TYPE_VIDEO,
67
cdd89f96cbe1 added draw_horiz_band test
glantau
parents: 60
diff changeset
608 CODEC_ID_MPEG4,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
609 sizeof(MpegEncContext),
986e461dc072 Initial revision
glantau
parents:
diff changeset
610 h263_decode_init,
986e461dc072 Initial revision
glantau
parents:
diff changeset
611 NULL,
986e461dc072 Initial revision
glantau
parents:
diff changeset
612 h263_decode_end,
986e461dc072 Initial revision
glantau
parents:
diff changeset
613 h263_decode_frame,
553
18ad513d92fe direct rendering method 1 support
michaelni
parents: 543
diff changeset
614 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
615 };
986e461dc072 Initial revision
glantau
parents:
diff changeset
616
986e461dc072 Initial revision
glantau
parents:
diff changeset
617 AVCodec h263_decoder = {
986e461dc072 Initial revision
glantau
parents:
diff changeset
618 "h263",
986e461dc072 Initial revision
glantau
parents:
diff changeset
619 CODEC_TYPE_VIDEO,
986e461dc072 Initial revision
glantau
parents:
diff changeset
620 CODEC_ID_H263,
986e461dc072 Initial revision
glantau
parents:
diff changeset
621 sizeof(MpegEncContext),
986e461dc072 Initial revision
glantau
parents:
diff changeset
622 h263_decode_init,
986e461dc072 Initial revision
glantau
parents:
diff changeset
623 NULL,
986e461dc072 Initial revision
glantau
parents:
diff changeset
624 h263_decode_end,
986e461dc072 Initial revision
glantau
parents:
diff changeset
625 h263_decode_frame,
553
18ad513d92fe direct rendering method 1 support
michaelni
parents: 543
diff changeset
626 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
627 };
986e461dc072 Initial revision
glantau
parents:
diff changeset
628
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
629 AVCodec msmpeg4v1_decoder = {
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
630 "msmpeg4v1",
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
631 CODEC_TYPE_VIDEO,
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
632 CODEC_ID_MSMPEG4V1,
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
633 sizeof(MpegEncContext),
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
634 h263_decode_init,
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
635 NULL,
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
636 h263_decode_end,
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
637 h263_decode_frame,
553
18ad513d92fe direct rendering method 1 support
michaelni
parents: 543
diff changeset
638 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1,
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
639 };
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
640
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
641 AVCodec msmpeg4v2_decoder = {
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
642 "msmpeg4v2",
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
643 CODEC_TYPE_VIDEO,
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
644 CODEC_ID_MSMPEG4V2,
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
645 sizeof(MpegEncContext),
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
646 h263_decode_init,
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
647 NULL,
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
648 h263_decode_end,
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
649 h263_decode_frame,
553
18ad513d92fe direct rendering method 1 support
michaelni
parents: 543
diff changeset
650 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1,
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
651 };
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
652
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
653 AVCodec msmpeg4v3_decoder = {
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
654 "msmpeg4",
986e461dc072 Initial revision
glantau
parents:
diff changeset
655 CODEC_TYPE_VIDEO,
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
656 CODEC_ID_MSMPEG4V3,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
657 sizeof(MpegEncContext),
986e461dc072 Initial revision
glantau
parents:
diff changeset
658 h263_decode_init,
986e461dc072 Initial revision
glantau
parents:
diff changeset
659 NULL,
986e461dc072 Initial revision
glantau
parents:
diff changeset
660 h263_decode_end,
986e461dc072 Initial revision
glantau
parents:
diff changeset
661 h263_decode_frame,
553
18ad513d92fe direct rendering method 1 support
michaelni
parents: 543
diff changeset
662 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
663 };
986e461dc072 Initial revision
glantau
parents:
diff changeset
664
311
ac677a84d5df wmv1 header parser (unfinished)
michaelni
parents: 308
diff changeset
665 AVCodec wmv1_decoder = {
ac677a84d5df wmv1 header parser (unfinished)
michaelni
parents: 308
diff changeset
666 "wmv1",
ac677a84d5df wmv1 header parser (unfinished)
michaelni
parents: 308
diff changeset
667 CODEC_TYPE_VIDEO,
ac677a84d5df wmv1 header parser (unfinished)
michaelni
parents: 308
diff changeset
668 CODEC_ID_WMV1,
ac677a84d5df wmv1 header parser (unfinished)
michaelni
parents: 308
diff changeset
669 sizeof(MpegEncContext),
ac677a84d5df wmv1 header parser (unfinished)
michaelni
parents: 308
diff changeset
670 h263_decode_init,
ac677a84d5df wmv1 header parser (unfinished)
michaelni
parents: 308
diff changeset
671 NULL,
ac677a84d5df wmv1 header parser (unfinished)
michaelni
parents: 308
diff changeset
672 h263_decode_end,
ac677a84d5df wmv1 header parser (unfinished)
michaelni
parents: 308
diff changeset
673 h263_decode_frame,
553
18ad513d92fe direct rendering method 1 support
michaelni
parents: 543
diff changeset
674 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1,
311
ac677a84d5df wmv1 header parser (unfinished)
michaelni
parents: 308
diff changeset
675 };
ac677a84d5df wmv1 header parser (unfinished)
michaelni
parents: 308
diff changeset
676
498
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 485
diff changeset
677 AVCodec wmv2_decoder = {
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 485
diff changeset
678 "wmv2",
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 485
diff changeset
679 CODEC_TYPE_VIDEO,
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 485
diff changeset
680 CODEC_ID_WMV2,
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 485
diff changeset
681 sizeof(MpegEncContext),
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 485
diff changeset
682 h263_decode_init,
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 485
diff changeset
683 NULL,
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 485
diff changeset
684 h263_decode_end,
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 485
diff changeset
685 h263_decode_frame,
553
18ad513d92fe direct rendering method 1 support
michaelni
parents: 543
diff changeset
686 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1,
498
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 485
diff changeset
687 };
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 485
diff changeset
688
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
689 AVCodec h263i_decoder = {
986e461dc072 Initial revision
glantau
parents:
diff changeset
690 "h263i",
986e461dc072 Initial revision
glantau
parents:
diff changeset
691 CODEC_TYPE_VIDEO,
986e461dc072 Initial revision
glantau
parents:
diff changeset
692 CODEC_ID_H263I,
986e461dc072 Initial revision
glantau
parents:
diff changeset
693 sizeof(MpegEncContext),
986e461dc072 Initial revision
glantau
parents:
diff changeset
694 h263_decode_init,
986e461dc072 Initial revision
glantau
parents:
diff changeset
695 NULL,
986e461dc072 Initial revision
glantau
parents:
diff changeset
696 h263_decode_end,
986e461dc072 Initial revision
glantau
parents:
diff changeset
697 h263_decode_frame,
553
18ad513d92fe direct rendering method 1 support
michaelni
parents: 543
diff changeset
698 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
699 };
986e461dc072 Initial revision
glantau
parents:
diff changeset
700