virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Code Issues Releases Activity

change macroblock loop in inter frames so that after a

Browse Source 
slice header the skip count is always parsed first

Originally committed as revision 17558 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Stefan Gehrer 2009-02-24 15:54:51 +00:00
parent 760227633d
commit 88db5551cf
1 changed files with 29 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
libavcodec/cavsdec.c
View File

@ -432,18 +432,20 @@ static inline int decode_slice_header(AVSContext *h, GetBitContext *gb) {
return 0; return 0;
} }
static inline void check_for_slice(AVSContext *h) { static inline int check_for_slice(AVSContext *h) {
GetBitContext *gb = &h->s.gb; GetBitContext *gb = &h->s.gb;
int align; int align;
if(h->mbx) if(h->mbx)
return; return 0;
align = (-get_bits_count(gb)) & 7; align = (-get_bits_count(gb)) & 7;
if((show_bits_long(gb,24+align) & 0xFFFFFF) == 0x000001) { if((show_bits_long(gb,24+align) & 0xFFFFFF) == 0x000001) {
skip_bits_long(gb,24+align); skip_bits_long(gb,24+align);
h->stc = get_bits(gb,8); h->stc = get_bits(gb,8);
decode_slice_header(h,gb); decode_slice_header(h,gb);
return 1;
} }
return 0;
} }
/***************************************************************************** /*****************************************************************************
@ -454,7 +456,7 @@ static inline void check_for_slice(AVSContext *h) {
static int decode_pic(AVSContext *h) { static int decode_pic(AVSContext *h) {
MpegEncContext *s = &h->s; MpegEncContext *s = &h->s;
int skip_count; int skip_count = -1;
enum cavs_mb mb_type; enum cavs_mb mb_type;
if (!s->context_initialized) { if (!s->context_initialized) {
@ -539,44 +541,37 @@ static int decode_pic(AVSContext *h) {
} while(ff_cavs_next_mb(h)); } while(ff_cavs_next_mb(h));
} else if(h->pic_type == FF_P_TYPE) { } else if(h->pic_type == FF_P_TYPE) {
do { do {
check_for_slice(h); if(check_for_slice(h))
if(h->skip_mode_flag) { skip_count = -1;
if(h->skip_mode_flag && (skip_count < 0))
skip_count = get_ue_golomb(&s->gb); skip_count = get_ue_golomb(&s->gb);
while(skip_count--) { if(h->skip_mode_flag && skip_count--) {
decode_mb_p(h,P_SKIP); decode_mb_p(h,P_SKIP);
if(!ff_cavs_next_mb(h)) } else {
goto done; mb_type = get_ue_golomb(&s->gb) + P_SKIP + h->skip_mode_flag;
} if(mb_type > P_8X8)
check_for_slice(h); decode_mb_i(h, mb_type - P_8X8 - 1);
mb_type = get_ue_golomb(&s->gb) + P_16X16; else
} else decode_mb_p(h,mb_type);
mb_type = get_ue_golomb(&s->gb) + P_SKIP; }
if(mb_type > P_8X8) {
decode_mb_i(h, mb_type - P_8X8 - 1);
} else
decode_mb_p(h,mb_type);
} while(ff_cavs_next_mb(h)); } while(ff_cavs_next_mb(h));
} else { /* FF_B_TYPE */ } else { /* FF_B_TYPE */
do { do {
check_for_slice(h); if(check_for_slice(h))
if(h->skip_mode_flag) { skip_count = -1;
if(h->skip_mode_flag && (skip_count < 0))
skip_count = get_ue_golomb(&s->gb); skip_count = get_ue_golomb(&s->gb);
while(skip_count--) { if(h->skip_mode_flag && skip_count--) {
decode_mb_b(h,B_SKIP); decode_mb_b(h,B_SKIP);
if(!ff_cavs_next_mb(h)) } else {
goto done; mb_type = get_ue_golomb(&s->gb) + B_SKIP + h->skip_mode_flag;
} if(mb_type > B_8X8)
check_for_slice(h); decode_mb_i(h, mb_type - B_8X8 - 1);
mb_type = get_ue_golomb(&s->gb) + B_DIRECT; else
} else decode_mb_b(h,mb_type);
mb_type = get_ue_golomb(&s->gb) + B_SKIP; }
if(mb_type > B_8X8) {
decode_mb_i(h, mb_type - B_8X8 - 1);
} else
decode_mb_b(h,mb_type);
} while(ff_cavs_next_mb(h)); } while(ff_cavs_next_mb(h));
} }
done:
if(h->pic_type != FF_B_TYPE) { if(h->pic_type != FF_B_TYPE) {
if(h->DPB[1].data[0]) if(h->DPB[1].data[0])
s->avctx->release_buffer(s->avctx, (AVFrame *)&h->DPB[1]); s->avctx->release_buffer(s->avctx, (AVFrame *)&h->DPB[1]);