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