Commit 450d3099 authored by michael's avatar michael

Add off argument so that fetch_timestamp can search for timestamps

not associated with the first byte of access units.


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@13622 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent d4efa812
...@@ -76,14 +76,14 @@ AVCodecParserContext *av_parser_init(int codec_id) ...@@ -76,14 +76,14 @@ AVCodecParserContext *av_parser_init(int codec_id)
return s; return s;
} }
void ff_fetch_timestamp(AVCodecParserContext *s){ void ff_fetch_timestamp(AVCodecParserContext *s, int off){
int i; int i;
s->dts= s->pts= AV_NOPTS_VALUE; s->dts= s->pts= AV_NOPTS_VALUE;
s->offset= 0; s->offset= 0;
for(i = 0; i < AV_PARSER_PTS_NB; i++) { for(i = 0; i < AV_PARSER_PTS_NB; i++) {
if ( s->next_frame_offset >= s->cur_frame_offset[i] if ( s->next_frame_offset + off >= s->cur_frame_offset[i]
&&(s-> frame_offset < s->cur_frame_offset[i] || !s->frame_offset) &&(s-> frame_offset < s->cur_frame_offset[i] || !s->frame_offset)
&& s->next_frame_offset < s->cur_frame_end[i]){ && s->next_frame_offset + off < s->cur_frame_end[i]){
s->dts= s->cur_frame_dts[i]; s->dts= s->cur_frame_dts[i];
s->pts= s->cur_frame_pts[i]; s->pts= s->cur_frame_pts[i];
s->offset = s->next_frame_offset - s->cur_frame_offset[i]; s->offset = s->next_frame_offset - s->cur_frame_offset[i];
...@@ -142,7 +142,7 @@ int av_parser_parse(AVCodecParserContext *s, ...@@ -142,7 +142,7 @@ int av_parser_parse(AVCodecParserContext *s,
s->fetch_timestamp=0; s->fetch_timestamp=0;
s->last_pts = s->pts; s->last_pts = s->pts;
s->last_dts = s->dts; s->last_dts = s->dts;
ff_fetch_timestamp(s); ff_fetch_timestamp(s, 0);
} }
/* WARNING: the returned index can be negative */ /* WARNING: the returned index can be negative */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment