Mercurial > libavcodec.hg
annotate wmv2.c @ 4846:841ecebff8c8 libavcodec
timestamps generation improvement when parsing avi
patch by Joakim \ elupus chez ecce dot se /
original thread:
date: 03/19/2007 01:47 AM
subject: [Ffmpeg-devel] [RFC] Improvement for the odd timestamp generation when parser is in use.
author | benoit |
---|---|
date | Fri, 13 Apr 2007 07:50:04 +0000 |
parents | a96d905dcbaa |
children | 6a4e8b52dc7b |
rev | line source |
---|---|
936 | 1 /* |
2 * Copyright (c) 2002 The FFmpeg Project. | |
3 * | |
3947
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3741
diff
changeset
|
4 * This file is part of FFmpeg. |
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3741
diff
changeset
|
5 * |
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3741
diff
changeset
|
6 * FFmpeg is free software; you can redistribute it and/or |
936 | 7 * modify it under the terms of the GNU Lesser General Public |
8 * License as published by the Free Software Foundation; either | |
3947
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3741
diff
changeset
|
9 * version 2.1 of the License, or (at your option) any later version. |
936 | 10 * |
3947
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3741
diff
changeset
|
11 * FFmpeg is distributed in the hope that it will be useful, |
936 | 12 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
14 * Lesser General Public License for more details. | |
15 * | |
16 * You should have received a copy of the GNU Lesser General Public | |
3947
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3741
diff
changeset
|
17 * License along with FFmpeg; if not, write to the Free Software |
3036
0b546eab515d
Update licensing information: The FSF changed postal address.
diego
parents:
2979
diff
changeset
|
18 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
936 | 19 * |
20 */ | |
21 | |
1106 | 22 /** |
23 * @file wmv2.c | |
24 * wmv2 codec. | |
25 */ | |
2967 | 26 |
936 | 27 #include "simple_idct.h" |
2967 | 28 |
936 | 29 #define SKIP_TYPE_NONE 0 |
30 #define SKIP_TYPE_MPEG 1 | |
31 #define SKIP_TYPE_ROW 2 | |
32 #define SKIP_TYPE_COL 3 | |
33 | |
34 | |
35 typedef struct Wmv2Context{ | |
36 MpegEncContext s; | |
37 int j_type_bit; | |
38 int j_type; | |
39 int flag3; | |
40 int flag63; | |
41 int abt_flag; | |
42 int abt_type; | |
43 int abt_type_table[6]; | |
44 int per_mb_abt; | |
45 int per_block_abt; | |
46 int mspel_bit; | |
47 int cbp_table_index; | |
48 int top_left_mv_flag; | |
49 int per_mb_rl_bit; | |
50 int skip_type; | |
51 int hshift; | |
2967 | 52 |
936 | 53 ScanTable abt_scantable[2]; |
3089 | 54 DECLARE_ALIGNED_8(DCTELEM, abt_block2[6][64]); |
936 | 55 }Wmv2Context; |
56 | |
57 static void wmv2_common_init(Wmv2Context * w){ | |
58 MpegEncContext * const s= &w->s; | |
2967 | 59 |
1273 | 60 ff_init_scantable(s->dsp.idct_permutation, &w->abt_scantable[0], wmv2_scantableA); |
61 ff_init_scantable(s->dsp.idct_permutation, &w->abt_scantable[1], wmv2_scantableB); | |
936 | 62 } |
63 | |
2024
f65d87bfdd5a
some of the warning fixes by (Michael Roitzsch <mroi at users dot sourceforge dot net>)
michael
parents:
1943
diff
changeset
|
64 #ifdef CONFIG_ENCODERS |
f65d87bfdd5a
some of the warning fixes by (Michael Roitzsch <mroi at users dot sourceforge dot net>)
michael
parents:
1943
diff
changeset
|
65 |
936 | 66 static int encode_ext_header(Wmv2Context *w){ |
67 MpegEncContext * const s= &w->s; | |
68 PutBitContext pb; | |
69 int code; | |
2967 | 70 |
1524 | 71 init_put_bits(&pb, s->avctx->extradata, s->avctx->extradata_size); |
936 | 72 |
2637 | 73 put_bits(&pb, 5, s->avctx->time_base.den / s->avctx->time_base.num); //yes 29.97 -> 29 |
936 | 74 put_bits(&pb, 11, FFMIN(s->bit_rate/1024, 2047)); |
2967 | 75 |
936 | 76 put_bits(&pb, 1, w->mspel_bit=1); |
77 put_bits(&pb, 1, w->flag3=1); | |
78 put_bits(&pb, 1, w->abt_flag=1); | |
79 put_bits(&pb, 1, w->j_type_bit=1); | |
80 put_bits(&pb, 1, w->top_left_mv_flag=0); | |
81 put_bits(&pb, 1, w->per_mb_rl_bit=1); | |
82 put_bits(&pb, 3, code=1); | |
2967 | 83 |
936 | 84 flush_put_bits(&pb); |
85 | |
86 s->slice_height = s->mb_height / code; | |
2967 | 87 |
936 | 88 return 0; |
89 } | |
90 | |
91 static int wmv2_encode_init(AVCodecContext *avctx){ | |
92 Wmv2Context * const w= avctx->priv_data; | |
2967 | 93 |
936 | 94 if(MPV_encode_init(avctx) < 0) |
95 return -1; | |
2967 | 96 |
936 | 97 wmv2_common_init(w); |
98 | |
99 avctx->extradata_size= 4; | |
100 avctx->extradata= av_mallocz(avctx->extradata_size + 10); | |
101 encode_ext_header(w); | |
2967 | 102 |
936 | 103 return 0; |
104 } | |
105 | |
2522
e25782262d7d
kill warnings patch by (Mns Rullgrd <mru inprovide com>)
michael
parents:
2474
diff
changeset
|
106 #if 0 /* unused, remove? */ |
936 | 107 static int wmv2_encode_end(AVCodecContext *avctx){ |
2967 | 108 |
936 | 109 if(MPV_encode_end(avctx) < 0) |
110 return -1; | |
2967 | 111 |
936 | 112 avctx->extradata_size= 0; |
113 av_freep(&avctx->extradata); | |
2967 | 114 |
936 | 115 return 0; |
116 } | |
2522
e25782262d7d
kill warnings patch by (Mns Rullgrd <mru inprovide com>)
michael
parents:
2474
diff
changeset
|
117 #endif |
936 | 118 |
119 int ff_wmv2_encode_picture_header(MpegEncContext * s, int picture_number) | |
120 { | |
121 Wmv2Context * const w= (Wmv2Context*)s; | |
122 | |
123 put_bits(&s->pb, 1, s->pict_type - 1); | |
124 if(s->pict_type == I_TYPE){ | |
125 put_bits(&s->pb, 7, 0); | |
126 } | |
127 put_bits(&s->pb, 5, s->qscale); | |
128 | |
129 s->dc_table_index = 1; | |
130 s->mv_table_index = 1; /* only if P frame */ | |
131 // s->use_skip_mb_code = 1; /* only if P frame */ | |
132 s->per_mb_rl_table = 0; | |
133 s->mspel= 0; | |
134 w->per_mb_abt=0; | |
135 w->abt_type=0; | |
136 w->j_type=0; | |
137 | |
1163 | 138 assert(s->flipflop_rounding); |
139 | |
936 | 140 if (s->pict_type == I_TYPE) { |
1163 | 141 assert(s->no_rounding==1); |
936 | 142 if(w->j_type_bit) put_bits(&s->pb, 1, w->j_type); |
2967 | 143 |
936 | 144 if(w->per_mb_rl_bit) put_bits(&s->pb, 1, s->per_mb_rl_table); |
2967 | 145 |
936 | 146 if(!s->per_mb_rl_table){ |
147 code012(&s->pb, s->rl_chroma_table_index); | |
148 code012(&s->pb, s->rl_table_index); | |
149 } | |
150 | |
151 put_bits(&s->pb, 1, s->dc_table_index); | |
152 | |
153 s->inter_intra_pred= 0; | |
154 }else{ | |
155 int cbp_index; | |
156 | |
157 put_bits(&s->pb, 2, SKIP_TYPE_NONE); | |
2967 | 158 |
936 | 159 code012(&s->pb, cbp_index=0); |
160 if(s->qscale <= 10){ | |
161 int map[3]= {0,2,1}; | |
162 w->cbp_table_index= map[cbp_index]; | |
163 }else if(s->qscale <= 20){ | |
164 int map[3]= {1,0,2}; | |
165 w->cbp_table_index= map[cbp_index]; | |
166 }else{ | |
167 int map[3]= {2,1,0}; | |
168 w->cbp_table_index= map[cbp_index]; | |
169 } | |
170 | |
171 if(w->mspel_bit) put_bits(&s->pb, 1, s->mspel); | |
2967 | 172 |
936 | 173 if(w->abt_flag){ |
174 put_bits(&s->pb, 1, w->per_mb_abt^1); | |
175 if(!w->per_mb_abt){ | |
176 code012(&s->pb, w->abt_type); | |
177 } | |
178 } | |
179 | |
180 if(w->per_mb_rl_bit) put_bits(&s->pb, 1, s->per_mb_rl_table); | |
2967 | 181 |
936 | 182 if(!s->per_mb_rl_table){ |
183 code012(&s->pb, s->rl_table_index); | |
184 s->rl_chroma_table_index = s->rl_table_index; | |
185 } | |
186 put_bits(&s->pb, 1, s->dc_table_index); | |
187 put_bits(&s->pb, 1, s->mv_table_index); | |
2967 | 188 |
1943 | 189 s->inter_intra_pred= 0;//(s->width*s->height < 320*240 && s->bit_rate<=II_BITRATE); |
936 | 190 } |
191 s->esc3_level_length= 0; | |
192 s->esc3_run_length= 0; | |
193 | |
194 return 0; | |
195 } | |
196 | |
197 // nearly idential to wmv1 but thats just because we dont use the useless M$ crap features | |
198 // its duplicated here in case someone wants to add support for these carp features | |
2967 | 199 void ff_wmv2_encode_mb(MpegEncContext * s, |
936 | 200 DCTELEM block[6][64], |
201 int motion_x, int motion_y) | |
202 { | |
203 Wmv2Context * const w= (Wmv2Context*)s; | |
204 int cbp, coded_cbp, i; | |
205 int pred_x, pred_y; | |
1064 | 206 uint8_t *coded_block; |
936 | 207 |
208 handle_slices(s); | |
2967 | 209 |
936 | 210 if (!s->mb_intra) { |
2979 | 211 /* compute cbp */ |
212 cbp = 0; | |
213 for (i = 0; i < 6; i++) { | |
214 if (s->block_last_index[i] >= 0) | |
215 cbp |= 1 << (5 - i); | |
216 } | |
2967 | 217 |
218 put_bits(&s->pb, | |
219 wmv2_inter_table[w->cbp_table_index][cbp + 64][1], | |
936 | 220 wmv2_inter_table[w->cbp_table_index][cbp + 64][0]); |
221 | |
222 /* motion vector */ | |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1668
diff
changeset
|
223 h263_pred_motion(s, 0, 0, &pred_x, &pred_y); |
2967 | 224 msmpeg4_encode_motion(s, motion_x - pred_x, |
936 | 225 motion_y - pred_y); |
226 } else { | |
2979 | 227 /* compute cbp */ |
228 cbp = 0; | |
936 | 229 coded_cbp = 0; |
2979 | 230 for (i = 0; i < 6; i++) { |
936 | 231 int val, pred; |
232 val = (s->block_last_index[i] >= 1); | |
233 cbp |= val << (5 - i); | |
234 if (i < 4) { | |
235 /* predict value for close blocks only for luma */ | |
236 pred = coded_block_pred(s, i, &coded_block); | |
237 *coded_block = val; | |
238 val = val ^ pred; | |
239 } | |
240 coded_cbp |= val << (5 - i); | |
2979 | 241 } |
936 | 242 #if 0 |
243 if (coded_cbp) | |
244 printf("cbp=%x %x\n", cbp, coded_cbp); | |
245 #endif | |
246 | |
247 if (s->pict_type == I_TYPE) { | |
2967 | 248 put_bits(&s->pb, |
2474 | 249 ff_msmp4_mb_i_table[coded_cbp][1], ff_msmp4_mb_i_table[coded_cbp][0]); |
936 | 250 } else { |
2967 | 251 put_bits(&s->pb, |
252 wmv2_inter_table[w->cbp_table_index][cbp][1], | |
936 | 253 wmv2_inter_table[w->cbp_table_index][cbp][0]); |
254 } | |
2979 | 255 put_bits(&s->pb, 1, 0); /* no AC prediction yet */ |
936 | 256 if(s->inter_intra_pred){ |
257 s->h263_aic_dir=0; | |
258 put_bits(&s->pb, table_inter_intra[s->h263_aic_dir][1], table_inter_intra[s->h263_aic_dir][0]); | |
259 } | |
260 } | |
261 | |
262 for (i = 0; i < 6; i++) { | |
263 msmpeg4_encode_block(s, block[i], i); | |
264 } | |
265 } | |
1070
6da5ae9ee199
more #ifdef CONFIG_ENCODERS patch by (Wolfgang Hesseler <qv at multimediaware dot com>) with modifications by me (s/WOLFGANG/CONFIG_ENCODERS/ and some other fixes)
michaelni
parents:
1064
diff
changeset
|
266 #endif //CONFIG_ENCODERS |
936 | 267 |
268 static void parse_mb_skip(Wmv2Context * w){ | |
269 int mb_x, mb_y; | |
270 MpegEncContext * const s= &w->s; | |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1163
diff
changeset
|
271 uint32_t * const mb_type= s->current_picture_ptr->mb_type; |
936 | 272 |
273 w->skip_type= get_bits(&s->gb, 2); | |
274 switch(w->skip_type){ | |
275 case SKIP_TYPE_NONE: | |
276 for(mb_y=0; mb_y<s->mb_height; mb_y++){ | |
277 for(mb_x=0; mb_x<s->mb_width; mb_x++){ | |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1163
diff
changeset
|
278 mb_type[mb_y*s->mb_stride + mb_x]= MB_TYPE_16x16 | MB_TYPE_L0; |
936 | 279 } |
280 } | |
281 break; | |
282 case SKIP_TYPE_MPEG: | |
283 for(mb_y=0; mb_y<s->mb_height; mb_y++){ | |
284 for(mb_x=0; mb_x<s->mb_width; mb_x++){ | |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1163
diff
changeset
|
285 mb_type[mb_y*s->mb_stride + mb_x]= (get_bits1(&s->gb) ? MB_TYPE_SKIP : 0) | MB_TYPE_16x16 | MB_TYPE_L0; |
936 | 286 } |
287 } | |
288 break; | |
289 case SKIP_TYPE_ROW: | |
290 for(mb_y=0; mb_y<s->mb_height; mb_y++){ | |
291 if(get_bits1(&s->gb)){ | |
292 for(mb_x=0; mb_x<s->mb_width; mb_x++){ | |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1163
diff
changeset
|
293 mb_type[mb_y*s->mb_stride + mb_x]= MB_TYPE_SKIP | MB_TYPE_16x16 | MB_TYPE_L0; |
936 | 294 } |
295 }else{ | |
296 for(mb_x=0; mb_x<s->mb_width; mb_x++){ | |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1163
diff
changeset
|
297 mb_type[mb_y*s->mb_stride + mb_x]= (get_bits1(&s->gb) ? MB_TYPE_SKIP : 0) | MB_TYPE_16x16 | MB_TYPE_L0; |
936 | 298 } |
299 } | |
300 } | |
301 break; | |
302 case SKIP_TYPE_COL: | |
303 for(mb_x=0; mb_x<s->mb_width; mb_x++){ | |
304 if(get_bits1(&s->gb)){ | |
305 for(mb_y=0; mb_y<s->mb_height; mb_y++){ | |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1163
diff
changeset
|
306 mb_type[mb_y*s->mb_stride + mb_x]= MB_TYPE_SKIP | MB_TYPE_16x16 | MB_TYPE_L0; |
936 | 307 } |
308 }else{ | |
309 for(mb_y=0; mb_y<s->mb_height; mb_y++){ | |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1163
diff
changeset
|
310 mb_type[mb_y*s->mb_stride + mb_x]= (get_bits1(&s->gb) ? MB_TYPE_SKIP : 0) | MB_TYPE_16x16 | MB_TYPE_L0; |
936 | 311 } |
312 } | |
313 } | |
314 break; | |
315 } | |
316 } | |
317 | |
318 static int decode_ext_header(Wmv2Context *w){ | |
319 MpegEncContext * const s= &w->s; | |
320 GetBitContext gb; | |
321 int fps; | |
322 int code; | |
323 | |
324 if(s->avctx->extradata_size<4) return -1; | |
2967 | 325 |
1025
1f9afd8b9131
GetBitContext.size is allways multiplied by 8 -> use size_in_bits to avoid useless *8 in a few inner loops
michaelni
parents:
983
diff
changeset
|
326 init_get_bits(&gb, s->avctx->extradata, s->avctx->extradata_size*8); |
936 | 327 |
328 fps = get_bits(&gb, 5); | |
329 s->bit_rate = get_bits(&gb, 11)*1024; | |
330 w->mspel_bit = get_bits1(&gb); | |
331 w->flag3 = get_bits1(&gb); | |
332 w->abt_flag = get_bits1(&gb); | |
333 w->j_type_bit = get_bits1(&gb); | |
334 w->top_left_mv_flag= get_bits1(&gb); | |
335 w->per_mb_rl_bit = get_bits1(&gb); | |
336 code = get_bits(&gb, 3); | |
2967 | 337 |
936 | 338 if(code==0) return -1; |
1092 | 339 |
936 | 340 s->slice_height = s->mb_height / code; |
341 | |
342 if(s->avctx->debug&FF_DEBUG_PICT_INFO){ | |
2967 | 343 av_log(s->avctx, AV_LOG_DEBUG, "fps:%d, br:%d, qpbit:%d, abt_flag:%d, j_type_bit:%d, tl_mv_flag:%d, mbrl_bit:%d, code:%d, flag3:%d, slices:%d\n", |
344 fps, s->bit_rate, w->mspel_bit, w->abt_flag, w->j_type_bit, w->top_left_mv_flag, w->per_mb_rl_bit, code, w->flag3, | |
983 | 345 code); |
936 | 346 } |
347 return 0; | |
348 } | |
349 | |
350 int ff_wmv2_decode_picture_header(MpegEncContext * s) | |
351 { | |
352 Wmv2Context * const w= (Wmv2Context*)s; | |
1183 | 353 int code; |
936 | 354 |
355 #if 0 | |
356 { | |
357 int i; | |
358 for(i=0; i<s->gb.size*8; i++) | |
359 printf("%d", get_bits1(&s->gb)); | |
360 // get_bits1(&s->gb); | |
361 printf("END\n"); | |
362 return -1; | |
363 } | |
364 #endif | |
365 if(s->picture_number==0) | |
366 decode_ext_header(w); | |
367 | |
368 s->pict_type = get_bits(&s->gb, 1) + 1; | |
369 if(s->pict_type == I_TYPE){ | |
370 code = get_bits(&s->gb, 7); | |
2810 | 371 av_log(s->avctx, AV_LOG_DEBUG, "I7:%X/\n", code); |
936 | 372 } |
1651 | 373 s->chroma_qscale= s->qscale = get_bits(&s->gb, 5); |
1183 | 374 if(s->qscale < 0) |
375 return -1; | |
2967 | 376 |
1183 | 377 return 0; |
378 } | |
379 | |
380 int ff_wmv2_decode_secondary_picture_header(MpegEncContext * s) | |
381 { | |
382 Wmv2Context * const w= (Wmv2Context*)s; | |
936 | 383 |
384 if (s->pict_type == I_TYPE) { | |
385 if(w->j_type_bit) w->j_type= get_bits1(&s->gb); | |
386 else w->j_type= 0; //FIXME check | |
2967 | 387 |
936 | 388 if(!w->j_type){ |
389 if(w->per_mb_rl_bit) s->per_mb_rl_table= get_bits1(&s->gb); | |
390 else s->per_mb_rl_table= 0; | |
2967 | 391 |
936 | 392 if(!s->per_mb_rl_table){ |
393 s->rl_chroma_table_index = decode012(&s->gb); | |
394 s->rl_table_index = decode012(&s->gb); | |
395 } | |
396 | |
397 s->dc_table_index = get_bits1(&s->gb); | |
398 } | |
399 s->inter_intra_pred= 0; | |
400 s->no_rounding = 1; | |
401 if(s->avctx->debug&FF_DEBUG_PICT_INFO){ | |
2979 | 402 av_log(s->avctx, AV_LOG_DEBUG, "qscale:%d rlc:%d rl:%d dc:%d mbrl:%d j_type:%d \n", |
403 s->qscale, | |
404 s->rl_chroma_table_index, | |
405 s->rl_table_index, | |
406 s->dc_table_index, | |
936 | 407 s->per_mb_rl_table, |
408 w->j_type); | |
409 } | |
410 }else{ | |
411 int cbp_index; | |
412 w->j_type=0; | |
413 | |
414 parse_mb_skip(w); | |
415 cbp_index= decode012(&s->gb); | |
416 if(s->qscale <= 10){ | |
417 int map[3]= {0,2,1}; | |
418 w->cbp_table_index= map[cbp_index]; | |
419 }else if(s->qscale <= 20){ | |
420 int map[3]= {1,0,2}; | |
421 w->cbp_table_index= map[cbp_index]; | |
422 }else{ | |
423 int map[3]= {2,1,0}; | |
424 w->cbp_table_index= map[cbp_index]; | |
425 } | |
426 | |
427 if(w->mspel_bit) s->mspel= get_bits1(&s->gb); | |
428 else s->mspel= 0; //FIXME check | |
2967 | 429 |
936 | 430 if(w->abt_flag){ |
431 w->per_mb_abt= get_bits1(&s->gb)^1; | |
432 if(!w->per_mb_abt){ | |
433 w->abt_type= decode012(&s->gb); | |
434 } | |
435 } | |
436 | |
437 if(w->per_mb_rl_bit) s->per_mb_rl_table= get_bits1(&s->gb); | |
438 else s->per_mb_rl_table= 0; | |
2967 | 439 |
936 | 440 if(!s->per_mb_rl_table){ |
441 s->rl_table_index = decode012(&s->gb); | |
442 s->rl_chroma_table_index = s->rl_table_index; | |
443 } | |
444 | |
445 s->dc_table_index = get_bits1(&s->gb); | |
446 s->mv_table_index = get_bits1(&s->gb); | |
2967 | 447 |
1943 | 448 s->inter_intra_pred= 0;//(s->width*s->height < 320*240 && s->bit_rate<=II_BITRATE); |
936 | 449 s->no_rounding ^= 1; |
2967 | 450 |
936 | 451 if(s->avctx->debug&FF_DEBUG_PICT_INFO){ |
2967 | 452 av_log(s->avctx, AV_LOG_DEBUG, "rl:%d rlc:%d dc:%d mv:%d mbrl:%d qp:%d mspel:%d per_mb_abt:%d abt_type:%d cbp:%d ii:%d\n", |
2979 | 453 s->rl_table_index, |
454 s->rl_chroma_table_index, | |
455 s->dc_table_index, | |
456 s->mv_table_index, | |
936 | 457 s->per_mb_rl_table, |
458 s->qscale, | |
459 s->mspel, | |
460 w->per_mb_abt, | |
461 w->abt_type, | |
462 w->cbp_table_index, | |
463 s->inter_intra_pred); | |
464 } | |
465 } | |
466 s->esc3_level_length= 0; | |
467 s->esc3_run_length= 0; | |
2967 | 468 |
936 | 469 s->picture_number++; //FIXME ? |
470 | |
471 | |
472 // if(w->j_type) | |
473 // return wmv2_decode_j_picture(w); //FIXME | |
474 | |
475 if(w->j_type){ | |
2628
511e3afc43e1
Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents:
2522
diff
changeset
|
476 av_log(s->avctx, AV_LOG_ERROR, "J-type picture is not supported\n"); |
936 | 477 return -1; |
478 } | |
479 | |
480 return 0; | |
481 } | |
482 | |
483 static inline int wmv2_decode_motion(Wmv2Context *w, int *mx_ptr, int *my_ptr){ | |
484 MpegEncContext * const s= &w->s; | |
485 int ret; | |
2967 | 486 |
936 | 487 ret= msmpeg4_decode_motion(s, mx_ptr, my_ptr); |
2967 | 488 |
936 | 489 if(ret<0) return -1; |
2967 | 490 |
936 | 491 if((((*mx_ptr)|(*my_ptr)) & 1) && s->mspel) |
492 w->hshift= get_bits1(&s->gb); | |
2967 | 493 else |
936 | 494 w->hshift= 0; |
495 | |
496 //printf("%d %d ", *mx_ptr, *my_ptr); | |
2967 | 497 |
936 | 498 return 0; |
499 } | |
500 | |
501 static int16_t *wmv2_pred_motion(Wmv2Context *w, int *px, int *py){ | |
502 MpegEncContext * const s= &w->s; | |
503 int xy, wrap, diff, type; | |
1064 | 504 int16_t *A, *B, *C, *mot_val; |
936 | 505 |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1668
diff
changeset
|
506 wrap = s->b8_stride; |
936 | 507 xy = s->block_index[0]; |
508 | |
1668
30746f429df6
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1651
diff
changeset
|
509 mot_val = s->current_picture.motion_val[0][xy]; |
936 | 510 |
1668
30746f429df6
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1651
diff
changeset
|
511 A = s->current_picture.motion_val[0][xy - 1]; |
30746f429df6
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1651
diff
changeset
|
512 B = s->current_picture.motion_val[0][xy - wrap]; |
30746f429df6
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1651
diff
changeset
|
513 C = s->current_picture.motion_val[0][xy + 2 - wrap]; |
2967 | 514 |
2818 | 515 if(s->mb_x && !s->first_slice_line && !s->mspel && w->top_left_mv_flag) |
4001 | 516 diff= FFMAX(FFABS(A[0] - B[0]), FFABS(A[1] - B[1])); |
2967 | 517 else |
2818 | 518 diff=0; |
2967 | 519 |
2818 | 520 if(diff >= 8) |
936 | 521 type= get_bits1(&s->gb); |
522 else | |
523 type= 2; | |
2967 | 524 |
936 | 525 if(type == 0){ |
526 *px= A[0]; | |
527 *py= A[1]; | |
528 }else if(type == 1){ | |
529 *px= B[0]; | |
530 *py= B[1]; | |
531 }else{ | |
532 /* special case for first (slice) line */ | |
533 if (s->first_slice_line) { | |
534 *px = A[0]; | |
535 *py = A[1]; | |
536 } else { | |
537 *px = mid_pred(A[0], B[0], C[0]); | |
538 *py = mid_pred(A[1], B[1], C[1]); | |
539 } | |
540 } | |
541 | |
542 return mot_val; | |
543 } | |
544 | |
545 static inline int wmv2_decode_inter_block(Wmv2Context *w, DCTELEM *block, int n, int cbp){ | |
546 MpegEncContext * const s= &w->s; | |
547 static const int sub_cbp_table[3]= {2,3,1}; | |
548 int sub_cbp; | |
549 | |
2967 | 550 if(!cbp){ |
936 | 551 s->block_last_index[n] = -1; |
552 | |
553 return 0; | |
554 } | |
2967 | 555 |
936 | 556 if(w->per_block_abt) |
557 w->abt_type= decode012(&s->gb); | |
558 #if 0 | |
559 if(w->per_block_abt) | |
560 printf("B%d", w->abt_type); | |
561 #endif | |
562 w->abt_type_table[n]= w->abt_type; | |
563 | |
564 if(w->abt_type){ | |
565 // const uint8_t *scantable= w->abt_scantable[w->abt_type-1].permutated; | |
566 const uint8_t *scantable= w->abt_scantable[w->abt_type-1].scantable; | |
567 // const uint8_t *scantable= w->abt_type-1 ? w->abt_scantable[1].permutated : w->abt_scantable[0].scantable; | |
568 | |
569 sub_cbp= sub_cbp_table[ decode012(&s->gb) ]; | |
570 // printf("S%d", sub_cbp); | |
571 | |
572 if(sub_cbp&1){ | |
573 if (msmpeg4_decode_block(s, block, n, 1, scantable) < 0) | |
574 return -1; | |
575 } | |
2967 | 576 |
936 | 577 if(sub_cbp&2){ |
578 if (msmpeg4_decode_block(s, w->abt_block2[n], n, 1, scantable) < 0) | |
579 return -1; | |
580 } | |
581 s->block_last_index[n] = 63; | |
582 | |
583 return 0; | |
584 }else{ | |
585 return msmpeg4_decode_block(s, block, n, 1, s->inter_scantable.permutated); | |
586 } | |
587 } | |
588 | |
589 static void wmv2_add_block(Wmv2Context *w, DCTELEM *block1, uint8_t *dst, int stride, int n){ | |
590 MpegEncContext * const s= &w->s; | |
1064 | 591 |
2655
ab7bd4722cef
fix block corruption caused by clear_blocks() optimization
michael
parents:
2637
diff
changeset
|
592 if (s->block_last_index[n] >= 0) { |
936 | 593 switch(w->abt_type_table[n]){ |
594 case 0: | |
2655
ab7bd4722cef
fix block corruption caused by clear_blocks() optimization
michael
parents:
2637
diff
changeset
|
595 s->dsp.idct_add (dst, stride, block1); |
936 | 596 break; |
597 case 1: | |
598 simple_idct84_add(dst , stride, block1); | |
599 simple_idct84_add(dst + 4*stride, stride, w->abt_block2[n]); | |
600 memset(w->abt_block2[n], 0, 64*sizeof(DCTELEM)); | |
601 break; | |
602 case 2: | |
603 simple_idct48_add(dst , stride, block1); | |
604 simple_idct48_add(dst + 4 , stride, w->abt_block2[n]); | |
605 memset(w->abt_block2[n], 0, 64*sizeof(DCTELEM)); | |
606 break; | |
607 default: | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1524
diff
changeset
|
608 av_log(s->avctx, AV_LOG_ERROR, "internal error in WMV2 abt\n"); |
936 | 609 } |
2655
ab7bd4722cef
fix block corruption caused by clear_blocks() optimization
michael
parents:
2637
diff
changeset
|
610 } |
936 | 611 } |
612 | |
613 void ff_wmv2_add_mb(MpegEncContext *s, DCTELEM block1[6][64], uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr){ | |
614 Wmv2Context * const w= (Wmv2Context*)s; | |
615 | |
616 wmv2_add_block(w, block1[0], dest_y , s->linesize, 0); | |
617 wmv2_add_block(w, block1[1], dest_y + 8 , s->linesize, 1); | |
618 wmv2_add_block(w, block1[2], dest_y + 8*s->linesize, s->linesize, 2); | |
619 wmv2_add_block(w, block1[3], dest_y + 8 + 8*s->linesize, s->linesize, 3); | |
2967 | 620 |
936 | 621 if(s->flags&CODEC_FLAG_GRAY) return; |
2967 | 622 |
936 | 623 wmv2_add_block(w, block1[4], dest_cb , s->uvlinesize, 4); |
624 wmv2_add_block(w, block1[5], dest_cr , s->uvlinesize, 5); | |
625 } | |
626 | |
627 void ff_mspel_motion(MpegEncContext *s, | |
1064 | 628 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr, |
629 uint8_t **ref_picture, op_pixels_func (*pix_op)[4], | |
936 | 630 int motion_x, int motion_y, int h) |
631 { | |
632 Wmv2Context * const w= (Wmv2Context*)s; | |
1064 | 633 uint8_t *ptr; |
936 | 634 int dxy, offset, mx, my, src_x, src_y, v_edge_pos, linesize, uvlinesize; |
635 int emu=0; | |
2967 | 636 |
936 | 637 dxy = ((motion_y & 1) << 1) | (motion_x & 1); |
638 dxy = 2*dxy + w->hshift; | |
639 src_x = s->mb_x * 16 + (motion_x >> 1); | |
640 src_y = s->mb_y * 16 + (motion_y >> 1); | |
2967 | 641 |
936 | 642 /* WARNING: do no forget half pels */ |
643 v_edge_pos = s->v_edge_pos; | |
4594 | 644 src_x = av_clip(src_x, -16, s->width); |
645 src_y = av_clip(src_y, -16, s->height); | |
4333 | 646 |
647 if(src_x<=-16 || src_x >= s->width) | |
648 dxy &= ~3; | |
649 if(src_y<=-16 || src_y >= s->height) | |
650 dxy &= ~4; | |
651 | |
936 | 652 linesize = s->linesize; |
653 uvlinesize = s->uvlinesize; | |
654 ptr = ref_picture[0] + (src_y * linesize) + src_x; | |
655 | |
656 if(s->flags&CODEC_FLAG_EMU_EDGE){ | |
657 if(src_x<1 || src_y<1 || src_x + 17 >= s->h_edge_pos | |
658 || src_y + h+1 >= v_edge_pos){ | |
2967 | 659 ff_emulated_edge_mc(s->edge_emu_buffer, ptr - 1 - s->linesize, s->linesize, 19, 19, |
936 | 660 src_x-1, src_y-1, s->h_edge_pos, s->v_edge_pos); |
661 ptr= s->edge_emu_buffer + 1 + s->linesize; | |
662 emu=1; | |
663 } | |
664 } | |
665 | |
666 s->dsp.put_mspel_pixels_tab[dxy](dest_y , ptr , linesize); | |
667 s->dsp.put_mspel_pixels_tab[dxy](dest_y+8 , ptr+8 , linesize); | |
668 s->dsp.put_mspel_pixels_tab[dxy](dest_y +8*linesize, ptr +8*linesize, linesize); | |
669 s->dsp.put_mspel_pixels_tab[dxy](dest_y+8+8*linesize, ptr+8+8*linesize, linesize); | |
670 | |
671 if(s->flags&CODEC_FLAG_GRAY) return; | |
672 | |
673 if (s->out_format == FMT_H263) { | |
674 dxy = 0; | |
675 if ((motion_x & 3) != 0) | |
676 dxy |= 1; | |
677 if ((motion_y & 3) != 0) | |
678 dxy |= 2; | |
679 mx = motion_x >> 2; | |
680 my = motion_y >> 2; | |
681 } else { | |
682 mx = motion_x / 2; | |
683 my = motion_y / 2; | |
684 dxy = ((my & 1) << 1) | (mx & 1); | |
685 mx >>= 1; | |
686 my >>= 1; | |
687 } | |
2967 | 688 |
936 | 689 src_x = s->mb_x * 8 + mx; |
690 src_y = s->mb_y * 8 + my; | |
4594 | 691 src_x = av_clip(src_x, -8, s->width >> 1); |
936 | 692 if (src_x == (s->width >> 1)) |
693 dxy &= ~1; | |
4594 | 694 src_y = av_clip(src_y, -8, s->height >> 1); |
936 | 695 if (src_y == (s->height >> 1)) |
696 dxy &= ~2; | |
697 offset = (src_y * uvlinesize) + src_x; | |
698 ptr = ref_picture[1] + offset; | |
699 if(emu){ | |
2967 | 700 ff_emulated_edge_mc(s->edge_emu_buffer, ptr, s->uvlinesize, 9, 9, |
936 | 701 src_x, src_y, s->h_edge_pos>>1, s->v_edge_pos>>1); |
702 ptr= s->edge_emu_buffer; | |
703 } | |
704 pix_op[1][dxy](dest_cb, ptr, uvlinesize, h >> 1); | |
705 | |
706 ptr = ref_picture[2] + offset; | |
707 if(emu){ | |
2967 | 708 ff_emulated_edge_mc(s->edge_emu_buffer, ptr, s->uvlinesize, 9, 9, |
936 | 709 src_x, src_y, s->h_edge_pos>>1, s->v_edge_pos>>1); |
710 ptr= s->edge_emu_buffer; | |
711 } | |
712 pix_op[1][dxy](dest_cr, ptr, uvlinesize, h >> 1); | |
713 } | |
714 | |
715 | |
716 static int wmv2_decode_mb(MpegEncContext *s, DCTELEM block[6][64]) | |
717 { | |
718 Wmv2Context * const w= (Wmv2Context*)s; | |
719 int cbp, code, i; | |
1064 | 720 uint8_t *coded_val; |
936 | 721 |
722 if(w->j_type) return 0; | |
2967 | 723 |
936 | 724 if (s->pict_type == P_TYPE) { |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1163
diff
changeset
|
725 if(IS_SKIP(s->current_picture.mb_type[s->mb_y * s->mb_stride + s->mb_x])){ |
936 | 726 /* skip mb */ |
727 s->mb_intra = 0; | |
728 for(i=0;i<6;i++) | |
729 s->block_last_index[i] = -1; | |
730 s->mv_dir = MV_DIR_FORWARD; | |
731 s->mv_type = MV_TYPE_16X16; | |
732 s->mv[0][0][0] = 0; | |
733 s->mv[0][0][1] = 0; | |
2628
511e3afc43e1
Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents:
2522
diff
changeset
|
734 s->mb_skipped = 1; |
1185 | 735 w->hshift=0; |
936 | 736 return 0; |
737 } | |
738 | |
739 code = get_vlc2(&s->gb, mb_non_intra_vlc[w->cbp_table_index].table, MB_NON_INTRA_VLC_BITS, 3); | |
740 if (code < 0) | |
741 return -1; | |
2979 | 742 s->mb_intra = (~code & 0x40) >> 6; |
2967 | 743 |
936 | 744 cbp = code & 0x3f; |
745 } else { | |
746 s->mb_intra = 1; | |
2474 | 747 code = get_vlc2(&s->gb, ff_msmp4_mb_i_vlc.table, MB_INTRA_VLC_BITS, 2); |
936 | 748 if (code < 0){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1524
diff
changeset
|
749 av_log(s->avctx, AV_LOG_ERROR, "II-cbp illegal at %d %d\n", s->mb_x, s->mb_y); |
936 | 750 return -1; |
751 } | |
752 /* predict coded block pattern */ | |
753 cbp = 0; | |
754 for(i=0;i<6;i++) { | |
755 int val = ((code >> (5 - i)) & 1); | |
756 if (i < 4) { | |
757 int pred = coded_block_pred(s, i, &coded_val); | |
758 val = val ^ pred; | |
759 *coded_val = val; | |
760 } | |
761 cbp |= val << (5 - i); | |
762 } | |
763 } | |
764 | |
765 if (!s->mb_intra) { | |
766 int mx, my; | |
767 //printf("P at %d %d\n", s->mb_x, s->mb_y); | |
768 wmv2_pred_motion(w, &mx, &my); | |
2967 | 769 |
936 | 770 if(cbp){ |
2632 | 771 s->dsp.clear_blocks(s->block[0]); |
936 | 772 if(s->per_mb_rl_table){ |
773 s->rl_table_index = decode012(&s->gb); | |
774 s->rl_chroma_table_index = s->rl_table_index; | |
775 } | |
776 | |
777 if(w->abt_flag && w->per_mb_abt){ | |
778 w->per_block_abt= get_bits1(&s->gb); | |
779 if(!w->per_block_abt) | |
780 w->abt_type= decode012(&s->gb); | |
781 }else | |
782 w->per_block_abt=0; | |
783 } | |
2967 | 784 |
936 | 785 if (wmv2_decode_motion(w, &mx, &my) < 0) |
786 return -1; | |
787 | |
788 s->mv_dir = MV_DIR_FORWARD; | |
789 s->mv_type = MV_TYPE_16X16; | |
790 s->mv[0][0][0] = mx; | |
791 s->mv[0][0][1] = my; | |
792 | |
793 for (i = 0; i < 6; i++) { | |
794 if (wmv2_decode_inter_block(w, block[i], i, (cbp >> (5 - i)) & 1) < 0) | |
2979 | 795 { |
796 av_log(s->avctx, AV_LOG_ERROR, "\nerror while decoding inter block: %d x %d (%d)\n", s->mb_x, s->mb_y, i); | |
797 return -1; | |
798 } | |
2967 | 799 } |
936 | 800 } else { |
801 //if(s->pict_type==P_TYPE) | |
802 // printf("%d%d ", s->inter_intra_pred, cbp); | |
803 //printf("I at %d %d %d %06X\n", s->mb_x, s->mb_y, ((cbp&3)? 1 : 0) +((cbp&0x3C)? 2 : 0), show_bits(&s->gb, 24)); | |
804 s->ac_pred = get_bits1(&s->gb); | |
805 if(s->inter_intra_pred){ | |
806 s->h263_aic_dir= get_vlc2(&s->gb, inter_intra_vlc.table, INTER_INTRA_VLC_BITS, 1); | |
807 // printf("%d%d %d %d/", s->ac_pred, s->h263_aic_dir, s->mb_x, s->mb_y); | |
808 } | |
809 if(s->per_mb_rl_table && cbp){ | |
810 s->rl_table_index = decode012(&s->gb); | |
811 s->rl_chroma_table_index = s->rl_table_index; | |
812 } | |
2967 | 813 |
2632 | 814 s->dsp.clear_blocks(s->block[0]); |
936 | 815 for (i = 0; i < 6; i++) { |
816 if (msmpeg4_decode_block(s, block[i], i, (cbp >> (5 - i)) & 1, NULL) < 0) | |
2979 | 817 { |
818 av_log(s->avctx, AV_LOG_ERROR, "\nerror while decoding intra block: %d x %d (%d)\n", s->mb_x, s->mb_y, i); | |
819 return -1; | |
820 } | |
2967 | 821 } |
936 | 822 } |
823 | |
824 return 0; | |
825 } | |
826 | |
827 static int wmv2_decode_init(AVCodecContext *avctx){ | |
828 Wmv2Context * const w= avctx->priv_data; | |
2967 | 829 |
936 | 830 if(ff_h263_decode_init(avctx) < 0) |
831 return -1; | |
2967 | 832 |
936 | 833 wmv2_common_init(w); |
2967 | 834 |
936 | 835 return 0; |
836 } | |
837 | |
838 AVCodec wmv2_decoder = { | |
839 "wmv2", | |
840 CODEC_TYPE_VIDEO, | |
841 CODEC_ID_WMV2, | |
842 sizeof(Wmv2Context), | |
843 wmv2_decode_init, | |
844 NULL, | |
845 ff_h263_decode_end, | |
846 ff_h263_decode_frame, | |
847 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, | |
848 }; | |
849 | |
1070
6da5ae9ee199
more #ifdef CONFIG_ENCODERS patch by (Wolfgang Hesseler <qv at multimediaware dot com>) with modifications by me (s/WOLFGANG/CONFIG_ENCODERS/ and some other fixes)
michaelni
parents:
1064
diff
changeset
|
850 #ifdef CONFIG_ENCODERS |
936 | 851 AVCodec wmv2_encoder = { |
852 "wmv2", | |
853 CODEC_TYPE_VIDEO, | |
854 CODEC_ID_WMV2, | |
855 sizeof(Wmv2Context), | |
856 wmv2_encode_init, | |
857 MPV_encode_picture, | |
858 MPV_encode_end, | |
3741 | 859 .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, -1}, |
936 | 860 }; |
1070
6da5ae9ee199
more #ifdef CONFIG_ENCODERS patch by (Wolfgang Hesseler <qv at multimediaware dot com>) with modifications by me (s/WOLFGANG/CONFIG_ENCODERS/ and some other fixes)
michaelni
parents:
1064
diff
changeset
|
861 #endif |