RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

add heuristic to discern the old sample clips from streams encoded 

with rm52j encoder, a marker_bit has been added in the I-Frame syntax

Originally committed as revision 21836 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Stefan Gehrer 2010-02-15 16:43:45 +00:00
parent 026b9d3c5a
commit 35122bd93e
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavcodec/cavs.h
View File

@ -160,6 +160,7 @@ typedef struct {
int aspect_ratio;
int mb_width, mb_height;
int pic_type;
int stream_revision; ///<0 for samples from 2006, 1 for rm52j encoder
int progressive;
int pic_structure;
int skip_mode_flag; ///< select between skip_count or one skip_flag per MB

9
libavcodec/cavsdec.c
View File

@ -483,6 +483,15 @@ static int decode_pic(AVSContext *h) {
h->pic_type = FF_I_TYPE;
if(get_bits1(&s->gb))
skip_bits(&s->gb,24);//time_code
/* old sample clips were all progressive and no low_delay,
bump stream revision if detected otherwise */
if((s->low_delay) || !(show_bits(&s->gb,9) & 1))
h->stream_revision = 1;
/* similarly test top_field_first and repeat_first_field */
else if(show_bits(&s->gb,11) & 3)
h->stream_revision = 1;
if(h->stream_revision > 0)
skip_bits(&s->gb,1); //marker_bit
}
/* release last B frame */
if(h->picture.data[0])