Mercurial > libavcodec.hg
comparison wmv2.c @ 983:ca2a303ea039 libavcodec
fixed wmv2 slices
author | michaelni |
---|---|
date | Thu, 09 Jan 2003 11:37:08 +0000 |
parents | caa77cd960c0 |
children | 1f9afd8b9131 |
comparison
equal
deleted
inserted
replaced
982:a1866d06df1e | 983:ca2a303ea039 |
---|---|
328 if(code==0) return -1; | 328 if(code==0) return -1; |
329 | 329 |
330 s->slice_height = s->mb_height / code; | 330 s->slice_height = s->mb_height / code; |
331 | 331 |
332 if(s->avctx->debug&FF_DEBUG_PICT_INFO){ | 332 if(s->avctx->debug&FF_DEBUG_PICT_INFO){ |
333 printf("fps:%d, br:%d, qpbit:%d, abt_flag:%d, j_type_bit:%d, tl_mv_flag:%d, mbrl_bit:%d, code:%d, flag3:%d\n", | 333 printf("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", |
334 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); | 334 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, |
335 code); | |
335 } | 336 } |
336 return 0; | 337 return 0; |
337 } | 338 } |
338 | 339 |
339 int ff_wmv2_decode_picture_header(MpegEncContext * s) | 340 int ff_wmv2_decode_picture_header(MpegEncContext * s) |
575 | 576 |
576 static void wmv2_add_block(Wmv2Context *w, DCTELEM *block1, uint8_t *dst, int stride, int n){ | 577 static void wmv2_add_block(Wmv2Context *w, DCTELEM *block1, uint8_t *dst, int stride, int n){ |
577 MpegEncContext * const s= &w->s; | 578 MpegEncContext * const s= &w->s; |
578 uint8_t temp[2][64]; | 579 uint8_t temp[2][64]; |
579 int i; | 580 int i; |
580 | 581 |
581 if(w->abt_type_table[n] && 0){ | |
582 int a,b; | |
583 | |
584 a= block1[0]; | |
585 b= w->abt_block2[n][0]; | |
586 block1[0]= a+b; | |
587 w->abt_block2[n][0]= a-b; | |
588 } | |
589 | |
590 switch(w->abt_type_table[n]){ | 582 switch(w->abt_type_table[n]){ |
591 case 0: | 583 case 0: |
592 if (s->block_last_index[n] >= 0) { | 584 if (s->block_last_index[n] >= 0) { |
593 s->idct_add (dst, stride, block1); | 585 s->idct_add (dst, stride, block1); |
594 } | 586 } |