Commit cd614494 authored by Michael Niedermayer's avatar Michael Niedermayer

Factorize fetch_timestamp() into its own function

Originally committed as revision 13621 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 47917785
...@@ -76,6 +76,21 @@ AVCodecParserContext *av_parser_init(int codec_id) ...@@ -76,6 +76,21 @@ AVCodecParserContext *av_parser_init(int codec_id)
return s; return s;
} }
void ff_fetch_timestamp(AVCodecParserContext *s){
int i;
s->dts= s->pts= AV_NOPTS_VALUE;
s->offset= 0;
for(i = 0; i < AV_PARSER_PTS_NB; i++) {
if ( s->next_frame_offset >= s->cur_frame_offset[i]
&&(s-> frame_offset < s->cur_frame_offset[i] || !s->frame_offset)
&& s->next_frame_offset < s->cur_frame_end[i]){
s->dts= s->cur_frame_dts[i];
s->pts= s->cur_frame_pts[i];
s->offset = s->next_frame_offset - s->cur_frame_offset[i];
}
}
}
/** /**
* *
* @param buf input * @param buf input
...@@ -127,17 +142,7 @@ int av_parser_parse(AVCodecParserContext *s, ...@@ -127,17 +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;
s->dts= s->pts= AV_NOPTS_VALUE; ff_fetch_timestamp(s);
s->offset= 0;
for(i = 0; i < AV_PARSER_PTS_NB; i++) {
if ( s->next_frame_offset >= s->cur_frame_offset[i]
&&(s-> frame_offset < s->cur_frame_offset[i] || !s->frame_offset)
&& s->next_frame_offset < s->cur_frame_end[i]){
s->dts= s->cur_frame_dts[i];
s->pts= s->cur_frame_pts[i];
s->offset = s->next_frame_offset - s->cur_frame_offset[i];
}
}
} }
/* 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