annotate h263dec.c @ 1099:988b180afd31 libavcodec

cleanup
author michaelni
date Wed, 05 Mar 2003 20:13:11 +0000
parents b7f267d168b7
children 1e39f273ecd6
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
986e461dc072 Initial revision
glantau
parents:
diff changeset
23 //#define DEBUG
384
d442918c4698 print frame decoding time support (x86 only)
michaelni
parents: 361
diff changeset
24 //#define PRINT_FRAME_TIME
d442918c4698 print frame decoding time support (x86 only)
michaelni
parents: 361
diff changeset
25 #ifdef PRINT_FRAME_TIME
d442918c4698 print frame decoding time support (x86 only)
michaelni
parents: 361
diff changeset
26 static inline long long rdtsc()
d442918c4698 print frame decoding time support (x86 only)
michaelni
parents: 361
diff changeset
27 {
d442918c4698 print frame decoding time support (x86 only)
michaelni
parents: 361
diff changeset
28 long long l;
d442918c4698 print frame decoding time support (x86 only)
michaelni
parents: 361
diff changeset
29 asm volatile( "rdtsc\n\t"
d442918c4698 print frame decoding time support (x86 only)
michaelni
parents: 361
diff changeset
30 : "=A" (l)
d442918c4698 print frame decoding time support (x86 only)
michaelni
parents: 361
diff changeset
31 );
d442918c4698 print frame decoding time support (x86 only)
michaelni
parents: 361
diff changeset
32 // printf("%d\n", int(l/1000));
d442918c4698 print frame decoding time support (x86 only)
michaelni
parents: 361
diff changeset
33 return l;
d442918c4698 print frame decoding time support (x86 only)
michaelni
parents: 361
diff changeset
34 }
d442918c4698 print frame decoding time support (x86 only)
michaelni
parents: 361
diff changeset
35 #endif
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
36
936
caa77cd960c0 qpel encoding
michaelni
parents: 931
diff changeset
37 int ff_h263_decode_init(AVCodecContext *avctx)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
38 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
39 MpegEncContext *s = avctx->priv_data;
60
35c1141e23d9 moved matrix init away from MPV_common_init()
glantau
parents: 56
diff changeset
40
67
cdd89f96cbe1 added draw_horiz_band test
glantau
parents: 60
diff changeset
41 s->avctx = avctx;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
42 s->out_format = FMT_H263;
986e461dc072 Initial revision
glantau
parents:
diff changeset
43
986e461dc072 Initial revision
glantau
parents:
diff changeset
44 s->width = avctx->width;
986e461dc072 Initial revision
glantau
parents:
diff changeset
45 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
46 s->workaround_bugs= avctx->workaround_bugs;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
47
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
48 // set defaults
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
49 s->quant_precision=5;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
50 s->progressive_sequence=1;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
51 s->decode_mb= ff_h263_decode_mb;
924
3814e9115672 cleanup / messup?
michaelni
parents: 921
diff changeset
52 s->low_delay= 1;
939
3800f9c70736 better set pix_fmt explicitly
michaelni
parents: 938
diff changeset
53 avctx->pix_fmt= PIX_FMT_YUV420P;
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
54
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
55 /* select sub codec */
986e461dc072 Initial revision
glantau
parents:
diff changeset
56 switch(avctx->codec->id) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
57 case CODEC_ID_H263:
154
f914f710b8d0 - Fixed a bug on H.263 MV prediction for MB on GOBs limits.
pulento
parents: 144
diff changeset
58 s->gob_number = 0;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
59 break;
67
cdd89f96cbe1 added draw_horiz_band test
glantau
parents: 60
diff changeset
60 case CODEC_ID_MPEG4:
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
61 s->time_increment_bits = 4; /* default value for broken headers */
986e461dc072 Initial revision
glantau
parents:
diff changeset
62 s->h263_pred = 1;
924
3814e9115672 cleanup / messup?
michaelni
parents: 921
diff changeset
63 s->low_delay = 0; //default, might be overriden in the vol header during header parsing
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
64 break;
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
65 case CODEC_ID_MSMPEG4V1:
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
66 s->h263_msmpeg4 = 1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
67 s->h263_pred = 1;
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
68 s->msmpeg4_version=1;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
69 break;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
70 case CODEC_ID_MSMPEG4V2:
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
71 s->h263_msmpeg4 = 1;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
72 s->h263_pred = 1;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
73 s->msmpeg4_version=2;
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_MSMPEG4V3:
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=3;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
79 break;
311
ac677a84d5df wmv1 header parser (unfinished)
michaelni
parents: 308
diff changeset
80 case CODEC_ID_WMV1:
ac677a84d5df wmv1 header parser (unfinished)
michaelni
parents: 308
diff changeset
81 s->h263_msmpeg4 = 1;
ac677a84d5df wmv1 header parser (unfinished)
michaelni
parents: 308
diff changeset
82 s->h263_pred = 1;
ac677a84d5df wmv1 header parser (unfinished)
michaelni
parents: 308
diff changeset
83 s->msmpeg4_version=4;
ac677a84d5df wmv1 header parser (unfinished)
michaelni
parents: 308
diff changeset
84 break;
498
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 485
diff changeset
85 case CODEC_ID_WMV2:
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 485
diff changeset
86 s->h263_msmpeg4 = 1;
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 485
diff changeset
87 s->h263_pred = 1;
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 485
diff changeset
88 s->msmpeg4_version=5;
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 485
diff changeset
89 break;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
90 case CODEC_ID_H263I:
986e461dc072 Initial revision
glantau
parents:
diff changeset
91 s->h263_intel = 1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
92 break;
986e461dc072 Initial revision
glantau
parents:
diff changeset
93 default:
986e461dc072 Initial revision
glantau
parents:
diff changeset
94 return -1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
95 }
344
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
96 s->codec_id= avctx->codec->id;
553
18ad513d92fe direct rendering method 1 support
michaelni
parents: 543
diff changeset
97
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
98 /* 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
99 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
100 if (MPV_common_init(s) < 0)
cb5dabd00ba2 - Bug fix on inter MCBPC table for inter+q.
pulento
parents: 67
diff changeset
101 return -1;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
102
986e461dc072 Initial revision
glantau
parents:
diff changeset
103 if (s->h263_msmpeg4)
498
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 485
diff changeset
104 ff_msmpeg4_decode_init(s);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
105 else
986e461dc072 Initial revision
glantau
parents:
diff changeset
106 h263_decode_init_vlc(s);
986e461dc072 Initial revision
glantau
parents:
diff changeset
107
986e461dc072 Initial revision
glantau
parents:
diff changeset
108 return 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
109 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
110
936
caa77cd960c0 qpel encoding
michaelni
parents: 931
diff changeset
111 int ff_h263_decode_end(AVCodecContext *avctx)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
112 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
113 MpegEncContext *s = avctx->priv_data;
986e461dc072 Initial revision
glantau
parents:
diff changeset
114
986e461dc072 Initial revision
glantau
parents:
diff changeset
115 MPV_common_end(s);
986e461dc072 Initial revision
glantau
parents:
diff changeset
116 return 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
117 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
118
655
0018e190cc4c m4v input support
michaelni
parents: 589
diff changeset
119 /**
0018e190cc4c m4v input support
michaelni
parents: 589
diff changeset
120 * retunrs the number of bytes consumed for building the current frame
0018e190cc4c m4v input support
michaelni
parents: 589
diff changeset
121 */
0018e190cc4c m4v input support
michaelni
parents: 589
diff changeset
122 static int get_consumed_bytes(MpegEncContext *s, int buf_size){
0018e190cc4c m4v input support
michaelni
parents: 589
diff changeset
123 int pos= (get_bits_count(&s->gb)+7)>>3;
842
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
124
655
0018e190cc4c m4v input support
michaelni
parents: 589
diff changeset
125 if(s->divx_version>=500){
0018e190cc4c m4v input support
michaelni
parents: 589
diff changeset
126 //we would have to scan through the whole buf to handle the weird reordering ...
0018e190cc4c m4v input support
michaelni
parents: 589
diff changeset
127 return buf_size;
842
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
128 }else if(s->flags&CODEC_FLAG_TRUNCATED){
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
129 pos -= s->parse_context.last_index;
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
130 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
131 return pos;
655
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 */
853
eacc2dd8fd9d * using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents: 845
diff changeset
194 s->dsp.clear_blocks(s->block[0]);
745
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;
903
22ee74da2cd3 cleanup
michaelni
parents: 888
diff changeset
198 // s->mb_skiped = 0;
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
199 //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
200 ret= s->decode_mb(s, s->block);
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
201
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){
758
cca620e89cf0 fixing h263 slice decoding (again)
michaelni
parents: 756
diff changeset
207 //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
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;
1098
b7f267d168b7 mpeg2 field pictures + sliced mode (doesnt work with mplayer though, dunno why)
michaelni
parents: 1088
diff changeset
216 ff_draw_horiz_band(s, s->mb_y*16, 16);
745
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
1098
b7f267d168b7 mpeg2 field pictures + sliced mode (doesnt work with mplayer though, dunno why)
michaelni
parents: 1088
diff changeset
233 ff_draw_horiz_band(s, s->mb_y*16, 16);
745
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 s->mb_x= 0;
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
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
238 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
239
750
4adadf210b3b better padding bug detection
michaelni
parents: 747
diff changeset
240 /* try to detect the padding bug */
4adadf210b3b better padding bug detection
michaelni
parents: 747
diff changeset
241 if( s->codec_id==CODEC_ID_MPEG4
4adadf210b3b better padding bug detection
michaelni
parents: 747
diff changeset
242 && (s->workaround_bugs&FF_BUG_AUTODETECT)
1025
1f9afd8b9131 GetBitContext.size is allways multiplied by 8 -> use size_in_bits to avoid useless *8 in a few inner loops
michaelni
parents: 1004
diff changeset
243 && s->gb.size_in_bits - get_bits_count(&s->gb) >=0
1f9afd8b9131 GetBitContext.size is allways multiplied by 8 -> use size_in_bits to avoid useless *8 in a few inner loops
michaelni
parents: 1004
diff changeset
244 && s->gb.size_in_bits - get_bits_count(&s->gb) < 48
928
5627a7b7ce83 fixing playback of DaveMatthews_Crash_PocketPC.avi
michaelni
parents: 925
diff changeset
245 // && !s->resync_marker
750
4adadf210b3b better padding bug detection
michaelni
parents: 747
diff changeset
246 && !s->data_partitioning){
4adadf210b3b better padding bug detection
michaelni
parents: 747
diff changeset
247
4adadf210b3b better padding bug detection
michaelni
parents: 747
diff changeset
248 const int bits_count= get_bits_count(&s->gb);
1025
1f9afd8b9131 GetBitContext.size is allways multiplied by 8 -> use size_in_bits to avoid useless *8 in a few inner loops
michaelni
parents: 1004
diff changeset
249 const int bits_left = s->gb.size_in_bits - bits_count;
750
4adadf210b3b better padding bug detection
michaelni
parents: 747
diff changeset
250
1003
c2c116876fd7 better padding/stuffing bug autodetection
michaelni
parents: 984
diff changeset
251 if(bits_left==0){
c2c116876fd7 better padding/stuffing bug autodetection
michaelni
parents: 984
diff changeset
252 s->padding_bug_score+=16;
c2c116876fd7 better padding/stuffing bug autodetection
michaelni
parents: 984
diff changeset
253 }else if(bits_left>8){
750
4adadf210b3b better padding bug detection
michaelni
parents: 747
diff changeset
254 s->padding_bug_score++;
824
371ef113d984 better padding bug detection
michaelni
parents: 822
diff changeset
255 } else if(bits_left != 1){
750
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));
824
371ef113d984 better padding bug detection
michaelni
parents: 822
diff changeset
258
750
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++;
1003
c2c116876fd7 better padding/stuffing bug autodetection
michaelni
parents: 984
diff changeset
263 }
750
4adadf210b3b better padding bug detection
michaelni
parents: 747
diff changeset
264 }
4adadf210b3b better padding bug detection
michaelni
parents: 747
diff changeset
265
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
266 // handle formats which dont have unique end markers
1004
3b9c2ac59ec4 padding bug autodetection improvement 2nd try
michaelni
parents: 1003
diff changeset
267 if(s->msmpeg4_version || (s->workaround_bugs&FF_BUG_NO_PADDING)){ //FIXME perhaps solve this more cleanly
1025
1f9afd8b9131 GetBitContext.size is allways multiplied by 8 -> use size_in_bits to avoid useless *8 in a few inner loops
michaelni
parents: 1004
diff changeset
268 int left= s->gb.size_in_bits - get_bits_count(&s->gb);
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
269 int max_extra=7;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
270
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
271 /* no markers in M$ crap */
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
272 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
273 max_extra+= 17;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
274
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
275 /* buggy padding but the frame should still end approximately at the bitstream end */
1004
3b9c2ac59ec4 padding bug autodetection improvement 2nd try
michaelni
parents: 1003
diff changeset
276 if((s->workaround_bugs&FF_BUG_NO_PADDING) && s->error_resilience>=3)
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
277 max_extra+= 48;
1004
3b9c2ac59ec4 padding bug autodetection improvement 2nd try
michaelni
parents: 1003
diff changeset
278 else if((s->workaround_bugs&FF_BUG_NO_PADDING))
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
279 max_extra+= 256*256*256*64;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
280
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
281 if(left>max_extra){
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
282 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
283 }
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
284 else if(left<0){
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
285 fprintf(stderr, "overreading %d bits\n", -left);
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
286 }else
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
287 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
288
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
289 return 0;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
290 }
750
4adadf210b3b better padding bug detection
michaelni
parents: 747
diff changeset
291
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
292 fprintf(stderr, "slice end not reached but screenspace end (%d left %06X)\n",
1025
1f9afd8b9131 GetBitContext.size is allways multiplied by 8 -> use size_in_bits to avoid useless *8 in a few inner loops
michaelni
parents: 1004
diff changeset
293 s->gb.size_in_bits - get_bits_count(&s->gb),
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
294 show_bits(&s->gb, 24));
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
295 return -1;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
296 }
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
297
842
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
298 /**
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
299 * finds the end of the current frame in the bitstream.
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
300 * @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
301 */
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1053
diff changeset
302 static int mpeg4_find_frame_end(MpegEncContext *s, uint8_t *buf, int buf_size){
842
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
303 ParseContext *pc= &s->parse_context;
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
304 int vop_found, i;
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
305 uint32_t state;
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
306
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
307 vop_found= pc->frame_start_found;
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
308 state= pc->state;
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
309
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
310 i=0;
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
311 if(!vop_found){
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
312 for(i=0; i<buf_size; i++){
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
313 state= (state<<8) | buf[i];
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
314 if(state == 0x1B6){
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
315 i++;
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
316 vop_found=1;
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
317 break;
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 }
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
320 }
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
321
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
322 for(; i<buf_size; i++){
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
323 state= (state<<8) | buf[i];
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
324 if((state&0xFFFFFF00) == 0x100){
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
325 pc->frame_start_found=0;
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
326 pc->state=-1;
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
327 return i-3;
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 pc->frame_start_found= vop_found;
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
331 pc->state= state;
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
332 return -1;
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
333 }
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
334
1053
f07fd48c23d4 direct blocksize in bframes fix (might fix qpel+bframe bug)
michaelni
parents: 1048
diff changeset
335 /**
f07fd48c23d4 direct blocksize in bframes fix (might fix qpel+bframe bug)
michaelni
parents: 1048
diff changeset
336 * draws an line from (ex, ey) -> (sx, sy).
f07fd48c23d4 direct blocksize in bframes fix (might fix qpel+bframe bug)
michaelni
parents: 1048
diff changeset
337 * @param w width of the image
f07fd48c23d4 direct blocksize in bframes fix (might fix qpel+bframe bug)
michaelni
parents: 1048
diff changeset
338 * @param h height of the image
f07fd48c23d4 direct blocksize in bframes fix (might fix qpel+bframe bug)
michaelni
parents: 1048
diff changeset
339 * @param stride stride/linesize of the image
f07fd48c23d4 direct blocksize in bframes fix (might fix qpel+bframe bug)
michaelni
parents: 1048
diff changeset
340 * @param color color of the arrow
f07fd48c23d4 direct blocksize in bframes fix (might fix qpel+bframe bug)
michaelni
parents: 1048
diff changeset
341 */
984
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
342 static void draw_line(uint8_t *buf, int sx, int sy, int ex, int ey, int w, int h, int stride, int color){
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
343 int t, x, y, f;
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
344
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
345 ex= clip(ex, 0, w-1);
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
346 ey= clip(ey, 0, h-1);
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
347
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
348 buf[sy*stride + sx]+= color;
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
349
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
350 if(ABS(ex - sx) > ABS(ey - sy)){
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
351 if(sx > ex){
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
352 t=sx; sx=ex; ex=t;
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
353 t=sy; sy=ey; ey=t;
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
354 }
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
355 buf+= sx + sy*stride;
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
356 ex-= sx;
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
357 f= ((ey-sy)<<16)/ex;
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
358 for(x= 0; x <= ex; x++){
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
359 y= ((x*f) + (1<<15))>>16;
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
360 buf[y*stride + x]+= color;
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
361 }
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
362 }else{
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
363 if(sy > ey){
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
364 t=sx; sx=ex; ex=t;
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
365 t=sy; sy=ey; ey=t;
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
366 }
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
367 buf+= sx + sy*stride;
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
368 ey-= sy;
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
369 if(ey) f= ((ex-sx)<<16)/ey;
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
370 else f= 0;
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
371 for(y= 0; y <= ey; y++){
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
372 x= ((y*f) + (1<<15))>>16;
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
373 buf[y*stride + x]+= color;
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
374 }
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
375 }
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
376 }
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
377
1053
f07fd48c23d4 direct blocksize in bframes fix (might fix qpel+bframe bug)
michaelni
parents: 1048
diff changeset
378 /**
f07fd48c23d4 direct blocksize in bframes fix (might fix qpel+bframe bug)
michaelni
parents: 1048
diff changeset
379 * draws an arrow from (ex, ey) -> (sx, sy).
f07fd48c23d4 direct blocksize in bframes fix (might fix qpel+bframe bug)
michaelni
parents: 1048
diff changeset
380 * @param w width of the image
f07fd48c23d4 direct blocksize in bframes fix (might fix qpel+bframe bug)
michaelni
parents: 1048
diff changeset
381 * @param h height of the image
f07fd48c23d4 direct blocksize in bframes fix (might fix qpel+bframe bug)
michaelni
parents: 1048
diff changeset
382 * @param stride stride/linesize of the image
f07fd48c23d4 direct blocksize in bframes fix (might fix qpel+bframe bug)
michaelni
parents: 1048
diff changeset
383 * @param color color of the arrow
f07fd48c23d4 direct blocksize in bframes fix (might fix qpel+bframe bug)
michaelni
parents: 1048
diff changeset
384 */
1035
9fbad5cf7e9e drawing cute arrows instead of lame lines for motion vector visualization
michaelni
parents: 1026
diff changeset
385 static void draw_arrow(uint8_t *buf, int sx, int sy, int ex, int ey, int w, int h, int stride, int color){
9fbad5cf7e9e drawing cute arrows instead of lame lines for motion vector visualization
michaelni
parents: 1026
diff changeset
386 int dx= ex - sx;
9fbad5cf7e9e drawing cute arrows instead of lame lines for motion vector visualization
michaelni
parents: 1026
diff changeset
387 int dy= ey - sy;
9fbad5cf7e9e drawing cute arrows instead of lame lines for motion vector visualization
michaelni
parents: 1026
diff changeset
388
9fbad5cf7e9e drawing cute arrows instead of lame lines for motion vector visualization
michaelni
parents: 1026
diff changeset
389 if(dx*dx + dy*dy > 3*3){
9fbad5cf7e9e drawing cute arrows instead of lame lines for motion vector visualization
michaelni
parents: 1026
diff changeset
390 int rx= dx + dy;
9fbad5cf7e9e drawing cute arrows instead of lame lines for motion vector visualization
michaelni
parents: 1026
diff changeset
391 int ry= -dx + dy;
9fbad5cf7e9e drawing cute arrows instead of lame lines for motion vector visualization
michaelni
parents: 1026
diff changeset
392 int length= ff_sqrt((rx*rx + ry*ry)<<8);
9fbad5cf7e9e drawing cute arrows instead of lame lines for motion vector visualization
michaelni
parents: 1026
diff changeset
393
9fbad5cf7e9e drawing cute arrows instead of lame lines for motion vector visualization
michaelni
parents: 1026
diff changeset
394 //FIXME subpixel accuracy
9fbad5cf7e9e drawing cute arrows instead of lame lines for motion vector visualization
michaelni
parents: 1026
diff changeset
395 rx= ROUNDED_DIV(rx*3<<4, length);
9fbad5cf7e9e drawing cute arrows instead of lame lines for motion vector visualization
michaelni
parents: 1026
diff changeset
396 ry= ROUNDED_DIV(ry*3<<4, length);
9fbad5cf7e9e drawing cute arrows instead of lame lines for motion vector visualization
michaelni
parents: 1026
diff changeset
397
9fbad5cf7e9e drawing cute arrows instead of lame lines for motion vector visualization
michaelni
parents: 1026
diff changeset
398 draw_line(buf, sx, sy, sx + rx, sy + ry, w, h, stride, color);
9fbad5cf7e9e drawing cute arrows instead of lame lines for motion vector visualization
michaelni
parents: 1026
diff changeset
399 draw_line(buf, sx, sy, sx - ry, sy + rx, w, h, stride, color);
9fbad5cf7e9e drawing cute arrows instead of lame lines for motion vector visualization
michaelni
parents: 1026
diff changeset
400 }
9fbad5cf7e9e drawing cute arrows instead of lame lines for motion vector visualization
michaelni
parents: 1026
diff changeset
401 draw_line(buf, sx, sy, ex, ey, w, h, stride, color);
9fbad5cf7e9e drawing cute arrows instead of lame lines for motion vector visualization
michaelni
parents: 1026
diff changeset
402 }
9fbad5cf7e9e drawing cute arrows instead of lame lines for motion vector visualization
michaelni
parents: 1026
diff changeset
403
936
caa77cd960c0 qpel encoding
michaelni
parents: 931
diff changeset
404 int ff_h263_decode_frame(AVCodecContext *avctx,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
405 void *data, int *data_size,
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1053
diff changeset
406 uint8_t *buf, int buf_size)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
407 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
408 MpegEncContext *s = avctx->priv_data;
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
409 int ret,i;
925
7fccaa0d699d AVVideoFrame -> AVFrame
michaelni
parents: 924
diff changeset
410 AVFrame *pict = data;
880
1c32039e7215 aspect ratio cleanup
michaelni
parents: 853
diff changeset
411 float new_aspect;
1c32039e7215 aspect ratio cleanup
michaelni
parents: 853
diff changeset
412
384
d442918c4698 print frame decoding time support (x86 only)
michaelni
parents: 361
diff changeset
413 #ifdef PRINT_FRAME_TIME
d442918c4698 print frame decoding time support (x86 only)
michaelni
parents: 361
diff changeset
414 uint64_t time= rdtsc();
d442918c4698 print frame decoding time support (x86 only)
michaelni
parents: 361
diff changeset
415 #endif
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
416 #ifdef DEBUG
986e461dc072 Initial revision
glantau
parents:
diff changeset
417 printf("*****frame %d size=%d\n", avctx->frame_number, buf_size);
986e461dc072 Initial revision
glantau
parents:
diff changeset
418 printf("bytes=%x %x %x %x\n", buf[0], buf[1], buf[2], buf[3]);
986e461dc072 Initial revision
glantau
parents:
diff changeset
419 #endif
485
20108840b0e5 grayscale only decoding
michaelni
parents: 465
diff changeset
420 s->flags= avctx->flags;
454
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
421
657
8de2081a39ab uninitialized var ...
michaelni
parents: 655
diff changeset
422 *data_size = 0;
8de2081a39ab uninitialized var ...
michaelni
parents: 655
diff changeset
423
8de2081a39ab uninitialized var ...
michaelni
parents: 655
diff changeset
424 /* no supplementary picture */
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
425 if (buf_size == 0) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
426 return 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
427 }
1026
d6ba0641cc36 cleanup
michaelni
parents: 1025
diff changeset
428
842
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
429 if(s->flags&CODEC_FLAG_TRUNCATED){
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
430 int next;
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
431
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
432 if(s->codec_id==CODEC_ID_MPEG4){
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
433 next= mpeg4_find_frame_end(s, buf, buf_size);
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
434 }else{
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
435 fprintf(stderr, "this codec doesnt support truncated bitstreams\n");
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
436 return -1;
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
437 }
1026
d6ba0641cc36 cleanup
michaelni
parents: 1025
diff changeset
438
d6ba0641cc36 cleanup
michaelni
parents: 1025
diff changeset
439 if( ff_combine_frame(s, next, &buf, &buf_size) < 0 )
842
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
440 return buf_size;
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
441 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
442
763
339db642859d fixing interlaced MC & edge-emu
michaelni
parents: 761
diff changeset
443 retry:
339db642859d fixing interlaced MC & edge-emu
michaelni
parents: 761
diff changeset
444
465
76c8afc9c1eb 100l divx501+ seeking bugfix
michaelni
parents: 454
diff changeset
445 if(s->bitstream_buffer_size && buf_size<20){ //divx 5.01+ frame reorder
1025
1f9afd8b9131 GetBitContext.size is allways multiplied by 8 -> use size_in_bits to avoid useless *8 in a few inner loops
michaelni
parents: 1004
diff changeset
446 init_get_bits(&s->gb, s->bitstream_buffer, s->bitstream_buffer_size*8);
353
386f430e93f4 freeze fix
michaelni
parents: 350
diff changeset
447 }else
1025
1f9afd8b9131 GetBitContext.size is allways multiplied by 8 -> use size_in_bits to avoid useless *8 in a few inner loops
michaelni
parents: 1004
diff changeset
448 init_get_bits(&s->gb, buf, buf_size*8);
465
76c8afc9c1eb 100l divx501+ seeking bugfix
michaelni
parents: 454
diff changeset
449 s->bitstream_buffer_size=0;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
450
718
16dab8296293 fixing custom quantizer matrix decoding
michaelni
parents: 717
diff changeset
451 if (!s->context_initialized) {
752
97077dd24bfa fixing alt_scan for the first frame (variable was reset)
michaelni
parents: 750
diff changeset
452 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
453 return -1;
16dab8296293 fixing custom quantizer matrix decoding
michaelni
parents: 717
diff changeset
454 }
936
caa77cd960c0 qpel encoding
michaelni
parents: 931
diff changeset
455
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
456 /* let's go :-) */
936
caa77cd960c0 qpel encoding
michaelni
parents: 931
diff changeset
457 if (s->msmpeg4_version==5) {
caa77cd960c0 qpel encoding
michaelni
parents: 931
diff changeset
458 ret= ff_wmv2_decode_picture_header(s);
caa77cd960c0 qpel encoding
michaelni
parents: 931
diff changeset
459 } else if (s->msmpeg4_version) {
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
460 ret = msmpeg4_decode_picture_header(s);
986e461dc072 Initial revision
glantau
parents:
diff changeset
461 } 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
462 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
463 GetBitContext gb;
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
464
1025
1f9afd8b9131 GetBitContext.size is allways multiplied by 8 -> use size_in_bits to avoid useless *8 in a few inner loops
michaelni
parents: 1004
diff changeset
465 init_get_bits(&gb, s->avctx->extradata, s->avctx->extradata_size*8);
747
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
466 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
467 }
3d4377531f6c mpeg4 header parser clenup (needed for parsing of VOL header in avctx->extradata)
michaelni
parents: 745
diff changeset
468 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
469
831
14f4598ec793 support forcing low_delay during decoding
michaelni
parents: 824
diff changeset
470 if(s->flags& CODEC_FLAG_LOW_DELAY)
14f4598ec793 support forcing low_delay during decoding
michaelni
parents: 824
diff changeset
471 s->low_delay=1;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
472 } else if (s->h263_intel) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
473 ret = intel_h263_decode_picture_header(s);
986e461dc072 Initial revision
glantau
parents:
diff changeset
474 } else {
986e461dc072 Initial revision
glantau
parents:
diff changeset
475 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
476 }
924
3814e9115672 cleanup / messup?
michaelni
parents: 921
diff changeset
477 avctx->has_b_frames= !s->low_delay;
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
478
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
479 if(s->workaround_bugs&FF_BUG_AUTODETECT){
1004
3b9c2ac59ec4 padding bug autodetection improvement 2nd try
michaelni
parents: 1003
diff changeset
480 if(s->padding_bug_score > -2 && !s->data_partitioning)
3b9c2ac59ec4 padding bug autodetection improvement 2nd try
michaelni
parents: 1003
diff changeset
481 s->workaround_bugs |= FF_BUG_NO_PADDING;
3b9c2ac59ec4 padding bug autodetection improvement 2nd try
michaelni
parents: 1003
diff changeset
482 else
3b9c2ac59ec4 padding bug autodetection improvement 2nd try
michaelni
parents: 1003
diff changeset
483 s->workaround_bugs &= ~FF_BUG_NO_PADDING;
3b9c2ac59ec4 padding bug autodetection improvement 2nd try
michaelni
parents: 1003
diff changeset
484
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
485 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
486 s->workaround_bugs|= FF_BUG_XVID_ILACE;
921
f633377858b6 ump4 decoding fixed
michaelni
parents: 907
diff changeset
487 #if 0
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
488 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
489 s->workaround_bugs|= FF_BUG_AC_VLC;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
490
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
491 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
492 s->workaround_bugs|= FF_BUG_AC_VLC;
921
f633377858b6 ump4 decoding fixed
michaelni
parents: 907
diff changeset
493 #endif
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
494 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
495 s->workaround_bugs|= FF_BUG_UMP4;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
496 s->workaround_bugs|= FF_BUG_AC_VLC;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
497 }
760
e858fe220ce0 xvid qpel bug workaround
michaelni
parents: 758
diff changeset
498
e858fe220ce0 xvid qpel bug workaround
michaelni
parents: 758
diff changeset
499 if(s->divx_version){
e858fe220ce0 xvid qpel bug workaround
michaelni
parents: 758
diff changeset
500 s->workaround_bugs|= FF_BUG_QPEL_CHROMA;
e858fe220ce0 xvid qpel bug workaround
michaelni
parents: 758
diff changeset
501 }
761
7f4cc2f6d642 xvid qpel bug autodetect
michaelni
parents: 760
diff changeset
502
1048
75a659fae7e0 divx503 decoding fix
michaelni
parents: 1035
diff changeset
503 if(s->divx_version>502){
75a659fae7e0 divx503 decoding fix
michaelni
parents: 1035
diff changeset
504 s->workaround_bugs|= FF_BUG_QPEL_CHROMA2;
75a659fae7e0 divx503 decoding fix
michaelni
parents: 1035
diff changeset
505 }
75a659fae7e0 divx503 decoding fix
michaelni
parents: 1035
diff changeset
506
761
7f4cc2f6d642 xvid qpel bug autodetect
michaelni
parents: 760
diff changeset
507 if(s->avctx->fourcc == ff_get_fourcc("XVID") && s->xvid_build==0)
7f4cc2f6d642 xvid qpel bug autodetect
michaelni
parents: 760
diff changeset
508 s->workaround_bugs|= FF_BUG_QPEL_CHROMA;
7f4cc2f6d642 xvid qpel bug autodetect
michaelni
parents: 760
diff changeset
509
907
b3ae2aba4b24 workaround old xvid bug
michaelni
parents: 903
diff changeset
510 if(s->avctx->fourcc == ff_get_fourcc("XVID") && s->xvid_build==0)
b3ae2aba4b24 workaround old xvid bug
michaelni
parents: 903
diff changeset
511 s->padding_bug_score= 256*256*256*64;
b3ae2aba4b24 workaround old xvid bug
michaelni
parents: 903
diff changeset
512
938
1e22655551b9 xvid build 3 still has the padding wrong in 1/8 of the cases :(((((
michaelni
parents: 936
diff changeset
513 if(s->xvid_build && s->xvid_build<=3)
1e22655551b9 xvid build 3 still has the padding wrong in 1/8 of the cases :(((((
michaelni
parents: 936
diff changeset
514 s->padding_bug_score= 256*256*256*64;
1e22655551b9 xvid build 3 still has the padding wrong in 1/8 of the cases :(((((
michaelni
parents: 936
diff changeset
515
761
7f4cc2f6d642 xvid qpel bug autodetect
michaelni
parents: 760
diff changeset
516 if(s->xvid_build && s->xvid_build<=1)
7f4cc2f6d642 xvid qpel bug autodetect
michaelni
parents: 760
diff changeset
517 s->workaround_bugs|= FF_BUG_QPEL_CHROMA;
7f4cc2f6d642 xvid qpel bug autodetect
michaelni
parents: 760
diff changeset
518
984
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
519 #define SET_QPEL_FUNC(postfix1, postfix2) \
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
520 s->dsp.put_ ## postfix1 = ff_put_ ## postfix2;\
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
521 s->dsp.put_no_rnd_ ## postfix1 = ff_put_no_rnd_ ## postfix2;\
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
522 s->dsp.avg_ ## postfix1 = ff_avg_ ## postfix2;
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
523
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
524 if(s->lavc_build && s->lavc_build<4653)
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
525 s->workaround_bugs|= FF_BUG_STD_QPEL;
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
526
1053
f07fd48c23d4 direct blocksize in bframes fix (might fix qpel+bframe bug)
michaelni
parents: 1048
diff changeset
527 if(s->lavc_build && s->lavc_build<4655)
f07fd48c23d4 direct blocksize in bframes fix (might fix qpel+bframe bug)
michaelni
parents: 1048
diff changeset
528 s->workaround_bugs|= FF_BUG_DIRECT_BLOCKSIZE;
f07fd48c23d4 direct blocksize in bframes fix (might fix qpel+bframe bug)
michaelni
parents: 1048
diff changeset
529
f07fd48c23d4 direct blocksize in bframes fix (might fix qpel+bframe bug)
michaelni
parents: 1048
diff changeset
530 if(s->divx_version)
f07fd48c23d4 direct blocksize in bframes fix (might fix qpel+bframe bug)
michaelni
parents: 1048
diff changeset
531 s->workaround_bugs|= FF_BUG_DIRECT_BLOCKSIZE;
750
4adadf210b3b better padding bug detection
michaelni
parents: 747
diff changeset
532 //printf("padding_bug_score: %d\n", s->padding_bug_score);
1088
bb27c685fc72 fixing padding bug autodetection for some rare files, closes bug #647941
michaelni
parents: 1064
diff changeset
533 if(s->divx_version==501 && s->divx_build==20020416)
bb27c685fc72 fixing padding bug autodetection for some rare files, closes bug #647941
michaelni
parents: 1064
diff changeset
534 s->padding_bug_score= 256*256*256*64;
750
4adadf210b3b better padding bug detection
michaelni
parents: 747
diff changeset
535 #if 0
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
536 if(s->divx_version==500)
1088
bb27c685fc72 fixing padding bug autodetection for some rare files, closes bug #647941
michaelni
parents: 1064
diff changeset
537 s->padding_bug_score= 256*256*256*64;
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
538
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
539 /* 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
540 * lets hope this at least works
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
541 */
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
542 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
543 && 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
544 s->workaround_bugs|= FF_BUG_NO_PADDING;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
545
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
546 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
547 s->workaround_bugs|= FF_BUG_NO_PADDING;
750
4adadf210b3b better padding bug detection
michaelni
parents: 747
diff changeset
548 #endif
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
549 }
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
550
984
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
551 if(s->workaround_bugs& FF_BUG_STD_QPEL){
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
552 SET_QPEL_FUNC(qpel_pixels_tab[0][ 5], qpel16_mc11_old_c)
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
553 SET_QPEL_FUNC(qpel_pixels_tab[0][ 7], qpel16_mc31_old_c)
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
554 SET_QPEL_FUNC(qpel_pixels_tab[0][ 9], qpel16_mc12_old_c)
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
555 SET_QPEL_FUNC(qpel_pixels_tab[0][11], qpel16_mc32_old_c)
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
556 SET_QPEL_FUNC(qpel_pixels_tab[0][13], qpel16_mc13_old_c)
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
557 SET_QPEL_FUNC(qpel_pixels_tab[0][15], qpel16_mc33_old_c)
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
558
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
559 SET_QPEL_FUNC(qpel_pixels_tab[1][ 5], qpel8_mc11_old_c)
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
560 SET_QPEL_FUNC(qpel_pixels_tab[1][ 7], qpel8_mc31_old_c)
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
561 SET_QPEL_FUNC(qpel_pixels_tab[1][ 9], qpel8_mc12_old_c)
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
562 SET_QPEL_FUNC(qpel_pixels_tab[1][11], qpel8_mc32_old_c)
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
563 SET_QPEL_FUNC(qpel_pixels_tab[1][13], qpel8_mc13_old_c)
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
564 SET_QPEL_FUNC(qpel_pixels_tab[1][15], qpel8_mc33_old_c)
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
565 }
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
566
585
86ebb02c6693 dump bits per frame / qp / frame complexity support
michaelni
parents: 562
diff changeset
567 #if 0 // dump bits per frame / qp / complexity
86ebb02c6693 dump bits per frame / qp / frame complexity support
michaelni
parents: 562
diff changeset
568 {
86ebb02c6693 dump bits per frame / qp / frame complexity support
michaelni
parents: 562
diff changeset
569 static FILE *f=NULL;
86ebb02c6693 dump bits per frame / qp / frame complexity support
michaelni
parents: 562
diff changeset
570 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
571 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
572 }
86ebb02c6693 dump bits per frame / qp / frame complexity support
michaelni
parents: 562
diff changeset
573 #endif
553
18ad513d92fe direct rendering method 1 support
michaelni
parents: 543
diff changeset
574
274
d0c186bcf075 use the width & height from the mpeg4 header ... in the case that its complete
michaelni
parents: 273
diff changeset
575 /* After H263 & mpeg4 header decode we have the height, width,*/
160
1bf8c111691d - Bug fixed on H.263 decoder initialization.
pulento
parents: 154
diff changeset
576 /* and other parameters. So then we could init the picture */
1bf8c111691d - Bug fixed on H.263 decoder initialization.
pulento
parents: 154
diff changeset
577 /* FIXME: By the way H263 decoder is evolving it should have */
1bf8c111691d - Bug fixed on H.263 decoder initialization.
pulento
parents: 154
diff changeset
578 /* an H263EncContext */
880
1c32039e7215 aspect ratio cleanup
michaelni
parents: 853
diff changeset
579 if(s->aspected_height)
887
19f5b8b7c6d5 fixing aspect
michaelni
parents: 885
diff changeset
580 new_aspect= s->aspected_width*s->width / (float)(s->height*s->aspected_height);
880
1c32039e7215 aspect ratio cleanup
michaelni
parents: 853
diff changeset
581 else
1c32039e7215 aspect ratio cleanup
michaelni
parents: 853
diff changeset
582 new_aspect=0;
887
19f5b8b7c6d5 fixing aspect
michaelni
parents: 885
diff changeset
583
718
16dab8296293 fixing custom quantizer matrix decoding
michaelni
parents: 717
diff changeset
584 if ( s->width != avctx->width || s->height != avctx->height
880
1c32039e7215 aspect ratio cleanup
michaelni
parents: 853
diff changeset
585 || ABS(new_aspect - avctx->aspect_ratio) > 0.001) {
553
18ad513d92fe direct rendering method 1 support
michaelni
parents: 543
diff changeset
586 /* H.263 could change picture size any time */
18ad513d92fe direct rendering method 1 support
michaelni
parents: 543
diff changeset
587 MPV_common_end(s);
18ad513d92fe direct rendering method 1 support
michaelni
parents: 543
diff changeset
588 s->context_initialized=0;
18ad513d92fe direct rendering method 1 support
michaelni
parents: 543
diff changeset
589 }
274
d0c186bcf075 use the width & height from the mpeg4 header ... in the case that its complete
michaelni
parents: 273
diff changeset
590 if (!s->context_initialized) {
888
michaelni
parents: 887
diff changeset
591 avctx->width = s->width;
michaelni
parents: 887
diff changeset
592 avctx->height = s->height;
880
1c32039e7215 aspect ratio cleanup
michaelni
parents: 853
diff changeset
593 avctx->aspect_ratio= new_aspect;
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
594
763
339db642859d fixing interlaced MC & edge-emu
michaelni
parents: 761
diff changeset
595 goto retry;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
596 }
758
cca620e89cf0 fixing h263 slice decoding (again)
michaelni
parents: 756
diff changeset
597
cca620e89cf0 fixing h263 slice decoding (again)
michaelni
parents: 756
diff changeset
598 if((s->codec_id==CODEC_ID_H263 || s->codec_id==CODEC_ID_H263P))
cca620e89cf0 fixing h263 slice decoding (again)
michaelni
parents: 756
diff changeset
599 s->gob_index = ff_h263_get_gob_height(s);
cca620e89cf0 fixing h263 slice decoding (again)
michaelni
parents: 756
diff changeset
600
655
0018e190cc4c m4v input support
michaelni
parents: 589
diff changeset
601 if(ret==FRAME_SKIPED) return get_consumed_bytes(s, buf_size);
454
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
602 /* skip if the header was thrashed */
498
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 485
diff changeset
603 if (ret < 0){
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 485
diff changeset
604 fprintf(stderr, "header damaged\n");
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
605 return -1;
498
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 485
diff changeset
606 }
845
32de034be20e hurry_up>=5 -> skip everything except header & set pict_type&key_frame
michaelni
parents: 842
diff changeset
607
903
22ee74da2cd3 cleanup
michaelni
parents: 888
diff changeset
608 // for hurry_up==5
22ee74da2cd3 cleanup
michaelni
parents: 888
diff changeset
609 s->current_picture.pict_type= s->pict_type;
22ee74da2cd3 cleanup
michaelni
parents: 888
diff changeset
610 s->current_picture.key_frame= s->pict_type == I_TYPE;
845
32de034be20e hurry_up>=5 -> skip everything except header & set pict_type&key_frame
michaelni
parents: 842
diff changeset
611
341
bf26081c373c avcodec_flush_buffers()
michaelni
parents: 336
diff changeset
612 /* skip b frames if we dont have reference frames */
924
3814e9115672 cleanup / messup?
michaelni
parents: 921
diff changeset
613 if(s->last_picture.data[0]==NULL && 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
614 /* skip b frames if we are in a hurry */
885
35d28522a1c5 moving init of some variables (hurry_up,...) to MPV_frame_start()
michaelni
parents: 880
diff changeset
615 if(avctx->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
616 /* skip everything if we are in a hurry>=5 */
885
35d28522a1c5 moving init of some variables (hurry_up,...) to MPV_frame_start()
michaelni
parents: 880
diff changeset
617 if(avctx->hurry_up>=5) return get_consumed_bytes(s, buf_size);
454
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
618
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
619 if(s->next_p_frame_damaged){
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
620 if(s->pict_type==B_TYPE)
655
0018e190cc4c m4v input support
michaelni
parents: 589
diff changeset
621 return get_consumed_bytes(s, buf_size);
454
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
622 else
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
623 s->next_p_frame_damaged=0;
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
624 }
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
625
771
d4cc92144266 handle direct rendering buffer allocation failure
michaelni
parents: 763
diff changeset
626 if(MPV_frame_start(s, avctx) < 0)
d4cc92144266 handle direct rendering buffer allocation failure
michaelni
parents: 763
diff changeset
627 return -1;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
628
986e461dc072 Initial revision
glantau
parents:
diff changeset
629 #ifdef DEBUG
986e461dc072 Initial revision
glantau
parents:
diff changeset
630 printf("qscale=%d\n", s->qscale);
986e461dc072 Initial revision
glantau
parents:
diff changeset
631 #endif
986e461dc072 Initial revision
glantau
parents:
diff changeset
632
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
633 if(s->error_resilience)
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1053
diff changeset
634 memset(s->error_status_table, MV_ERROR|AC_ERROR|DC_ERROR|VP_START|AC_END|DC_END|MV_END, s->mb_num*sizeof(uint8_t));
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
635
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
636 /* decode each macroblock */
266
252444e5259b optimization
michaelni
parents: 262
diff changeset
637 s->block_wrap[0]=
252444e5259b optimization
michaelni
parents: 262
diff changeset
638 s->block_wrap[1]=
252444e5259b optimization
michaelni
parents: 262
diff changeset
639 s->block_wrap[2]=
252444e5259b optimization
michaelni
parents: 262
diff changeset
640 s->block_wrap[3]= s->mb_width*2 + 2;
252444e5259b optimization
michaelni
parents: 262
diff changeset
641 s->block_wrap[4]=
252444e5259b optimization
michaelni
parents: 262
diff changeset
642 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
643 s->mb_x=0;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
644 s->mb_y=0;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
645
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
646 decode_slice(s);
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
647 s->error_status_table[0]|= VP_START;
1025
1f9afd8b9131 GetBitContext.size is allways multiplied by 8 -> use size_in_bits to avoid useless *8 in a few inner loops
michaelni
parents: 1004
diff changeset
648 while(s->mb_y<s->mb_height && s->gb.size_in_bits - get_bits_count(&s->gb)>16){
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
649 if(s->msmpeg4_version){
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
650 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
651 break;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
652 }else{
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
653 if(ff_h263_resync(s)<0)
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
654 break;
454
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
655 }
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
656
983
ca2a303ea039 fixed wmv2 slices
michaelni
parents: 939
diff changeset
657 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
658 ff_mpeg4_clean_buffers(s);
454
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
659
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
660 decode_slice(s);
756
f2644bb12a43 fixing h263 decoding (did segfault)
michaelni
parents: 752
diff changeset
661
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
662 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
663 }
756
f2644bb12a43 fixing h263 decoding (did segfault)
michaelni
parents: 752
diff changeset
664
311
ac677a84d5df wmv1 header parser (unfinished)
michaelni
parents: 308
diff changeset
665 if (s->h263_msmpeg4 && s->msmpeg4_version<4 && s->pict_type==I_TYPE)
903
22ee74da2cd3 cleanup
michaelni
parents: 888
diff changeset
666 if(msmpeg4_decode_ext_header(s, buf_size) < 0){
22ee74da2cd3 cleanup
michaelni
parents: 888
diff changeset
667 s->error_status_table[s->mb_num-1]= AC_ERROR|DC_ERROR|MV_ERROR;
22ee74da2cd3 cleanup
michaelni
parents: 888
diff changeset
668 }
333
8aa87f1dfc52 divx 5.01 support
michaelni
parents: 311
diff changeset
669
8aa87f1dfc52 divx 5.01 support
michaelni
parents: 311
diff changeset
670 /* divx 5.01+ bistream reorder stuff */
655
0018e190cc4c m4v input support
michaelni
parents: 589
diff changeset
671 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
672 int current_pos= get_bits_count(&s->gb)>>3;
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
673
333
8aa87f1dfc52 divx 5.01 support
michaelni
parents: 311
diff changeset
674 if( buf_size - current_pos > 5
8aa87f1dfc52 divx 5.01 support
michaelni
parents: 311
diff changeset
675 && buf_size - current_pos < BITSTREAM_BUFFER_SIZE){
454
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
676 int i;
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
677 int startcode_found=0;
655
0018e190cc4c m4v input support
michaelni
parents: 589
diff changeset
678 for(i=current_pos; i<buf_size-3; i++){
454
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
679 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
680 startcode_found=1;
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
681 break;
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
682 }
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
683 }
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
684 if(startcode_found){
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
685 memcpy(s->bitstream_buffer, buf + current_pos, buf_size - current_pos);
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
686 s->bitstream_buffer_size= buf_size - current_pos;
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
687 }
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
688 }
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
689 }
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
690
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
691 if(s->error_resilience){
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
692 int error=0, num_end_markers=0;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
693 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
694 int status= s->error_status_table[i];
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
695 #if 0
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
696 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
697 printf("%2X ", status);
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
698 #endif
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
699 if(status==0) continue;
454
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
700
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
701 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
702 error=1;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
703 if(status&VP_START){
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
704 if(num_end_markers)
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
705 error=1;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
706 num_end_markers=3;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
707 }
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
708 if(status&AC_END)
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
709 num_end_markers--;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
710 if(status&DC_END)
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
711 num_end_markers--;
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
712 if(status&MV_END)
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
713 num_end_markers--;
454
eda22d628b2d error concealment / error resilience
michaelni
parents: 429
diff changeset
714 }
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
715 if(num_end_markers || error){
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
716 fprintf(stderr, "concealing errors\n");
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
717 ff_error_resilience(s);
333
8aa87f1dfc52 divx 5.01 support
michaelni
parents: 311
diff changeset
718 }
353
386f430e93f4 freeze fix
michaelni
parents: 350
diff changeset
719 }
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 718
diff changeset
720
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
721 MPV_frame_end(s);
984
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
722
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
723 if((avctx->debug&FF_DEBUG_VIS_MV) && s->last_picture.data[0]){
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
724 const int shift= 1 + s->quarter_sample;
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
725 int mb_y;
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
726 uint8_t *ptr= s->last_picture.data[0];
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
727 s->low_delay=0; //needed to see the vectors without trashing the buffers
361
dc2fb310008d MV visualisation support
michaelni
parents: 353
diff changeset
728
984
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
729 for(mb_y=0; mb_y<s->mb_height; mb_y++){
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
730 int mb_x;
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
731 for(mb_x=0; mb_x<s->mb_width; mb_x++){
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
732 const int mb_index= mb_x + mb_y*s->mb_width;
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
733 if(s->co_located_type_table[mb_index] == MV_TYPE_8X8){
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
734 int i;
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
735 for(i=0; i<4; i++){
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
736 int sx= mb_x*16 + 4 + 8*(i&1);
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
737 int sy= mb_y*16 + 4 + 8*(i>>1);
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
738 int xy= 1 + mb_x*2 + (i&1) + (mb_y*2 + 1 + (i>>1))*(s->mb_width*2 + 2);
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
739 int mx= (s->motion_val[xy][0]>>shift) + sx;
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
740 int my= (s->motion_val[xy][1]>>shift) + sy;
1035
9fbad5cf7e9e drawing cute arrows instead of lame lines for motion vector visualization
michaelni
parents: 1026
diff changeset
741 draw_arrow(ptr, sx, sy, mx, my, s->width, s->height, s->linesize, 100);
984
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
742 }
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
743 }else{
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
744 int sx= mb_x*16 + 8;
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
745 int sy= mb_y*16 + 8;
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
746 int xy= 1 + mb_x*2 + (mb_y*2 + 1)*(s->mb_width*2 + 2);
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
747 int mx= (s->motion_val[xy][0]>>shift) + sx;
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
748 int my= (s->motion_val[xy][1]>>shift) + sy;
1035
9fbad5cf7e9e drawing cute arrows instead of lame lines for motion vector visualization
michaelni
parents: 1026
diff changeset
749 draw_arrow(ptr, sx, sy, mx, my, s->width, s->height, s->linesize, 100);
984
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
750 }
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
751 s->mbskip_table[mb_index]=0;
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
752 }
e162c09efbe7 qpel fix
michaelni
parents: 983
diff changeset
753 }
361
dc2fb310008d MV visualisation support
michaelni
parents: 353
diff changeset
754 }
dc2fb310008d MV visualisation support
michaelni
parents: 353
diff changeset
755
931
5bc072934017 support dumping the qscale stuff to the screen
michaelni
parents: 928
diff changeset
756
924
3814e9115672 cleanup / messup?
michaelni
parents: 921
diff changeset
757 if(s->pict_type==B_TYPE || s->low_delay){
925
7fccaa0d699d AVVideoFrame -> AVFrame
michaelni
parents: 924
diff changeset
758 *pict= *(AVFrame*)&s->current_picture;
262
7d941b8c4e84 mpeg4 b-frames :)
michaelni
parents: 251
diff changeset
759 } else {
925
7fccaa0d699d AVVideoFrame -> AVFrame
michaelni
parents: 924
diff changeset
760 *pict= *(AVFrame*)&s->last_picture;
262
7d941b8c4e84 mpeg4 b-frames :)
michaelni
parents: 251
diff changeset
761 }
231
840cd25bf259 - Fixes on RTP and GOB headers for H.263.
pulento
parents: 208
diff changeset
762
931
5bc072934017 support dumping the qscale stuff to the screen
michaelni
parents: 928
diff changeset
763 if(avctx->debug&FF_DEBUG_QP){
5bc072934017 support dumping the qscale stuff to the screen
michaelni
parents: 928
diff changeset
764 int8_t *qtab= pict->qscale_table;
5bc072934017 support dumping the qscale stuff to the screen
michaelni
parents: 928
diff changeset
765 int x,y;
5bc072934017 support dumping the qscale stuff to the screen
michaelni
parents: 928
diff changeset
766
5bc072934017 support dumping the qscale stuff to the screen
michaelni
parents: 928
diff changeset
767 for(y=0; y<s->mb_height; y++){
5bc072934017 support dumping the qscale stuff to the screen
michaelni
parents: 928
diff changeset
768 for(x=0; x<s->mb_width; x++){
5bc072934017 support dumping the qscale stuff to the screen
michaelni
parents: 928
diff changeset
769 printf("%2d ", qtab[x + y*s->mb_width]);
5bc072934017 support dumping the qscale stuff to the screen
michaelni
parents: 928
diff changeset
770 }
5bc072934017 support dumping the qscale stuff to the screen
michaelni
parents: 928
diff changeset
771 printf("\n");
5bc072934017 support dumping the qscale stuff to the screen
michaelni
parents: 928
diff changeset
772 }
5bc072934017 support dumping the qscale stuff to the screen
michaelni
parents: 928
diff changeset
773 printf("\n");
5bc072934017 support dumping the qscale stuff to the screen
michaelni
parents: 928
diff changeset
774 }
5bc072934017 support dumping the qscale stuff to the screen
michaelni
parents: 928
diff changeset
775
231
840cd25bf259 - Fixes on RTP and GOB headers for H.263.
pulento
parents: 208
diff changeset
776 /* Return the Picture timestamp as the frame number */
840cd25bf259 - Fixes on RTP and GOB headers for H.263.
pulento
parents: 208
diff changeset
777 /* 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
778 avctx->frame_number = s->picture_number - 1;
840cd25bf259 - Fixes on RTP and GOB headers for H.263.
pulento
parents: 208
diff changeset
779
924
3814e9115672 cleanup / messup?
michaelni
parents: 921
diff changeset
780 /* dont output the last pic after seeking */
3814e9115672 cleanup / messup?
michaelni
parents: 921
diff changeset
781 if(s->last_picture.data[0] || s->low_delay)
925
7fccaa0d699d AVVideoFrame -> AVFrame
michaelni
parents: 924
diff changeset
782 *data_size = sizeof(AVFrame);
384
d442918c4698 print frame decoding time support (x86 only)
michaelni
parents: 361
diff changeset
783 #ifdef PRINT_FRAME_TIME
d442918c4698 print frame decoding time support (x86 only)
michaelni
parents: 361
diff changeset
784 printf("%Ld\n", rdtsc()-time);
d442918c4698 print frame decoding time support (x86 only)
michaelni
parents: 361
diff changeset
785 #endif
655
0018e190cc4c m4v input support
michaelni
parents: 589
diff changeset
786 return get_consumed_bytes(s, buf_size);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
787 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
788
67
cdd89f96cbe1 added draw_horiz_band test
glantau
parents: 60
diff changeset
789 AVCodec mpeg4_decoder = {
cdd89f96cbe1 added draw_horiz_band test
glantau
parents: 60
diff changeset
790 "mpeg4",
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
791 CODEC_TYPE_VIDEO,
67
cdd89f96cbe1 added draw_horiz_band test
glantau
parents: 60
diff changeset
792 CODEC_ID_MPEG4,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
793 sizeof(MpegEncContext),
936
caa77cd960c0 qpel encoding
michaelni
parents: 931
diff changeset
794 ff_h263_decode_init,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
795 NULL,
936
caa77cd960c0 qpel encoding
michaelni
parents: 931
diff changeset
796 ff_h263_decode_end,
caa77cd960c0 qpel encoding
michaelni
parents: 931
diff changeset
797 ff_h263_decode_frame,
842
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 831
diff changeset
798 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
799 };
986e461dc072 Initial revision
glantau
parents:
diff changeset
800
986e461dc072 Initial revision
glantau
parents:
diff changeset
801 AVCodec h263_decoder = {
986e461dc072 Initial revision
glantau
parents:
diff changeset
802 "h263",
986e461dc072 Initial revision
glantau
parents:
diff changeset
803 CODEC_TYPE_VIDEO,
986e461dc072 Initial revision
glantau
parents:
diff changeset
804 CODEC_ID_H263,
986e461dc072 Initial revision
glantau
parents:
diff changeset
805 sizeof(MpegEncContext),
936
caa77cd960c0 qpel encoding
michaelni
parents: 931
diff changeset
806 ff_h263_decode_init,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
807 NULL,
936
caa77cd960c0 qpel encoding
michaelni
parents: 931
diff changeset
808 ff_h263_decode_end,
caa77cd960c0 qpel encoding
michaelni
parents: 931
diff changeset
809 ff_h263_decode_frame,
553
18ad513d92fe direct rendering method 1 support
michaelni
parents: 543
diff changeset
810 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
811 };
986e461dc072 Initial revision
glantau
parents:
diff changeset
812
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
813 AVCodec msmpeg4v1_decoder = {
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
814 "msmpeg4v1",
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
815 CODEC_TYPE_VIDEO,
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
816 CODEC_ID_MSMPEG4V1,
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
817 sizeof(MpegEncContext),
936
caa77cd960c0 qpel encoding
michaelni
parents: 931
diff changeset
818 ff_h263_decode_init,
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
819 NULL,
936
caa77cd960c0 qpel encoding
michaelni
parents: 931
diff changeset
820 ff_h263_decode_end,
caa77cd960c0 qpel encoding
michaelni
parents: 931
diff changeset
821 ff_h263_decode_frame,
553
18ad513d92fe direct rendering method 1 support
michaelni
parents: 543
diff changeset
822 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1,
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
823 };
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
824
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
825 AVCodec msmpeg4v2_decoder = {
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
826 "msmpeg4v2",
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
827 CODEC_TYPE_VIDEO,
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
828 CODEC_ID_MSMPEG4V2,
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
829 sizeof(MpegEncContext),
936
caa77cd960c0 qpel encoding
michaelni
parents: 931
diff changeset
830 ff_h263_decode_init,
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
831 NULL,
936
caa77cd960c0 qpel encoding
michaelni
parents: 931
diff changeset
832 ff_h263_decode_end,
caa77cd960c0 qpel encoding
michaelni
parents: 931
diff changeset
833 ff_h263_decode_frame,
553
18ad513d92fe direct rendering method 1 support
michaelni
parents: 543
diff changeset
834 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1,
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
835 };
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
836
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
837 AVCodec msmpeg4v3_decoder = {
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
838 "msmpeg4",
986e461dc072 Initial revision
glantau
parents:
diff changeset
839 CODEC_TYPE_VIDEO,
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
840 CODEC_ID_MSMPEG4V3,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
841 sizeof(MpegEncContext),
936
caa77cd960c0 qpel encoding
michaelni
parents: 931
diff changeset
842 ff_h263_decode_init,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
843 NULL,
936
caa77cd960c0 qpel encoding
michaelni
parents: 931
diff changeset
844 ff_h263_decode_end,
caa77cd960c0 qpel encoding
michaelni
parents: 931
diff changeset
845 ff_h263_decode_frame,
553
18ad513d92fe direct rendering method 1 support
michaelni
parents: 543
diff changeset
846 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
847 };
986e461dc072 Initial revision
glantau
parents:
diff changeset
848
311
ac677a84d5df wmv1 header parser (unfinished)
michaelni
parents: 308
diff changeset
849 AVCodec wmv1_decoder = {
ac677a84d5df wmv1 header parser (unfinished)
michaelni
parents: 308
diff changeset
850 "wmv1",
ac677a84d5df wmv1 header parser (unfinished)
michaelni
parents: 308
diff changeset
851 CODEC_TYPE_VIDEO,
ac677a84d5df wmv1 header parser (unfinished)
michaelni
parents: 308
diff changeset
852 CODEC_ID_WMV1,
ac677a84d5df wmv1 header parser (unfinished)
michaelni
parents: 308
diff changeset
853 sizeof(MpegEncContext),
936
caa77cd960c0 qpel encoding
michaelni
parents: 931
diff changeset
854 ff_h263_decode_init,
311
ac677a84d5df wmv1 header parser (unfinished)
michaelni
parents: 308
diff changeset
855 NULL,
936
caa77cd960c0 qpel encoding
michaelni
parents: 931
diff changeset
856 ff_h263_decode_end,
caa77cd960c0 qpel encoding
michaelni
parents: 931
diff changeset
857 ff_h263_decode_frame,
553
18ad513d92fe direct rendering method 1 support
michaelni
parents: 543
diff changeset
858 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1,
498
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 485
diff changeset
859 };
0b4450c15067 dc scale simplification/optimization
michaelni
parents: 485
diff changeset
860
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
861 AVCodec h263i_decoder = {
986e461dc072 Initial revision
glantau
parents:
diff changeset
862 "h263i",
986e461dc072 Initial revision
glantau
parents:
diff changeset
863 CODEC_TYPE_VIDEO,
986e461dc072 Initial revision
glantau
parents:
diff changeset
864 CODEC_ID_H263I,
986e461dc072 Initial revision
glantau
parents:
diff changeset
865 sizeof(MpegEncContext),
936
caa77cd960c0 qpel encoding
michaelni
parents: 931
diff changeset
866 ff_h263_decode_init,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
867 NULL,
936
caa77cd960c0 qpel encoding
michaelni
parents: 931
diff changeset
868 ff_h263_decode_end,
caa77cd960c0 qpel encoding
michaelni
parents: 931
diff changeset
869 ff_h263_decode_frame,
553
18ad513d92fe direct rendering method 1 support
michaelni
parents: 543
diff changeset
870 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
871 };
986e461dc072 Initial revision
glantau
parents:
diff changeset
872