generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lavf: factorize timestamp shift in update_initial_timestamps()

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2012-09-26 22:52:33 +02:00
parent cddbafb56a
commit a8e3815db5
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libavformat/utils.c
View File

@@ -940,24 +940,26 @@ static void update_initial_timestamps(AVFormatContext *s, int stream_index,
{ {
AVStream *st= s->streams[stream_index]; AVStream *st= s->streams[stream_index];
AVPacketList *pktl= s->parse_queue ? s->parse_queue : s->packet_buffer; AVPacketList *pktl= s->parse_queue ? s->parse_queue : s->packet_buffer;
int64_t shift;
if(st->first_dts != AV_NOPTS_VALUE || dts == AV_NOPTS_VALUE || st->cur_dts == AV_NOPTS_VALUE || is_relative(dts)) if(st->first_dts != AV_NOPTS_VALUE || dts == AV_NOPTS_VALUE || st->cur_dts == AV_NOPTS_VALUE || is_relative(dts))
return; return;
st->first_dts= dts - (st->cur_dts - RELATIVE_TS_BASE); st->first_dts= dts - (st->cur_dts - RELATIVE_TS_BASE);
st->cur_dts= dts; st->cur_dts= dts;
shift = st->first_dts - RELATIVE_TS_BASE;
if (is_relative(pts)) if (is_relative(pts))
pts += st->first_dts - RELATIVE_TS_BASE; pts += shift;
for(; pktl; pktl= get_next_pkt(s, st, pktl)){ for(; pktl; pktl= get_next_pkt(s, st, pktl)){
if(pktl->pkt.stream_index != stream_index) if(pktl->pkt.stream_index != stream_index)
continue; continue;
if(is_relative(pktl->pkt.pts)) if(is_relative(pktl->pkt.pts))
pktl->pkt.pts += st->first_dts - RELATIVE_TS_BASE; pktl->pkt.pts += shift;
if(is_relative(pktl->pkt.dts)) if(is_relative(pktl->pkt.dts))
pktl->pkt.dts += st->first_dts - RELATIVE_TS_BASE; pktl->pkt.dts += shift;
if(st->start_time == AV_NOPTS_VALUE && pktl->pkt.pts != AV_NOPTS_VALUE) if(st->start_time == AV_NOPTS_VALUE && pktl->pkt.pts != AV_NOPTS_VALUE)
st->start_time= pktl->pkt.pts; st->start_time= pktl->pkt.pts;