annotate h263dec.c @ 984:e162c09efbe7 libavcodec

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