Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(73)

Side by Side Diff: patched-ffmpeg-mt/libavcodec/ituh263dec.c

Issue 789004: ffmpeg roll of source to mar 9 version... (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/ffmpeg/
Patch Set: '' Created 10 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * ITU H263 bitstream decoder 2 * ITU H263 bitstream decoder
3 * Copyright (c) 2000,2001 Fabrice Bellard 3 * Copyright (c) 2000,2001 Fabrice Bellard
4 * H263+ support. 4 * H263+ support.
5 * Copyright (c) 2001 Juan J. Sierralta P 5 * Copyright (c) 2001 Juan J. Sierralta P
6 * Copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at> 6 * Copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at>
7 * 7 *
8 * This file is part of FFmpeg. 8 * This file is part of FFmpeg.
9 * 9 *
10 * FFmpeg is free software; you can redistribute it and/or 10 * FFmpeg is free software; you can redistribute it and/or
(...skipping 545 matching lines...) Expand 10 before | Expand all | Expand 10 after
556 if (s->mb_intra && s->h263_aic) { 556 if (s->mb_intra && s->h263_aic) {
557 h263_pred_acdc(s, block, n); 557 h263_pred_acdc(s, block, n);
558 i = 63; 558 i = 63;
559 } 559 }
560 s->block_last_index[n] = i; 560 s->block_last_index[n] = i;
561 return 0; 561 return 0;
562 } 562 }
563 563
564 static int h263_skip_b_part(MpegEncContext *s, int cbp) 564 static int h263_skip_b_part(MpegEncContext *s, int cbp)
565 { 565 {
566 DECLARE_ALIGNED(16, DCTELEM, dblock)[64]; 566 LOCAL_ALIGNED_16(DCTELEM, dblock, [64]);
567 int i, mbi; 567 int i, mbi;
568 568
569 /* we have to set s->mb_intra to zero to decode B-part of PB-frame correctly 569 /* we have to set s->mb_intra to zero to decode B-part of PB-frame correctly
570 * but real value should be restored in order to be used later (in OBMC cond ition) 570 * but real value should be restored in order to be used later (in OBMC cond ition)
571 */ 571 */
572 mbi = s->mb_intra; 572 mbi = s->mb_intra;
573 s->mb_intra = 0; 573 s->mb_intra = 0;
574 for (i = 0; i < 6; i++) { 574 for (i = 0; i < 6; i++) {
575 if (h263_decode_block(s, dblock, i, cbp&32) < 0) 575 if (h263_decode_block(s, dblock, i, cbp&32) < 0)
576 return -1; 576 return -1;
(...skipping 545 matching lines...) Expand 10 before | Expand all | Expand 10 after
1122 v |= get_sbits(&s->gb, 8)<<8; 1122 v |= get_sbits(&s->gb, 8)<<8;
1123 av_log(s->avctx, AV_LOG_DEBUG, " %5d", v); 1123 av_log(s->avctx, AV_LOG_DEBUG, " %5d", v);
1124 } 1124 }
1125 av_log(s->avctx, AV_LOG_DEBUG, "\n"); 1125 av_log(s->avctx, AV_LOG_DEBUG, "\n");
1126 } 1126 }
1127 for(i=0; i<50; i++) av_log(s->avctx, AV_LOG_DEBUG, "%d", get_bits1(&s->g b)); 1127 for(i=0; i<50; i++) av_log(s->avctx, AV_LOG_DEBUG, "%d", get_bits1(&s->g b));
1128 } 1128 }
1129 1129
1130 return 0; 1130 return 0;
1131 } 1131 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698