virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

lavf: remove unreliable timestamp guessing heuristic

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Anton Khirnov 2013-10-27 21:04:20 +01:00 committed by Michael Niedermayer
parent e166b82dd4
commit 4eb49fdde8
3 changed files with 0 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavformat/seek.c
View File

@ -428,13 +428,11 @@ AVParserState *ff_store_parser_state(AVFormatContext *s)
ss->parser = st->parser; ss->parser = st->parser;
ss->last_IP_pts = st->last_IP_pts; ss->last_IP_pts = st->last_IP_pts;
ss->cur_dts = st->cur_dts; ss->cur_dts = st->cur_dts;
ss->reference_dts = st->reference_dts;
ss->probe_packets = st->probe_packets; ss->probe_packets = st->probe_packets;
st->parser = NULL; st->parser = NULL;
st->last_IP_pts = AV_NOPTS_VALUE; st->last_IP_pts = AV_NOPTS_VALUE;
st->cur_dts = AV_NOPTS_VALUE; st->cur_dts = AV_NOPTS_VALUE;
st->reference_dts = AV_NOPTS_VALUE;
st->probe_packets = MAX_PROBE_PACKETS; st->probe_packets = MAX_PROBE_PACKETS;
} }
@ -467,7 +465,6 @@ void ff_restore_parser_state(AVFormatContext *s, AVParserState *state)
st->parser = ss->parser; st->parser = ss->parser;
st->last_IP_pts = ss->last_IP_pts; st->last_IP_pts = ss->last_IP_pts;
st->cur_dts = ss->cur_dts; st->cur_dts = ss->cur_dts;
st->reference_dts = ss->reference_dts;
st->probe_packets = ss->probe_packets; st->probe_packets = ss->probe_packets;
} }

1
libavformat/seek.h
View File

@ -33,7 +33,6 @@ typedef struct AVParserStreamState {
AVCodecParserContext *parser; AVCodecParserContext *parser;
int64_t last_IP_pts; int64_t last_IP_pts;
int64_t cur_dts; int64_t cur_dts;
int64_t reference_dts;
int probe_packets; int probe_packets;
} AVParserStreamState; } AVParserStreamState;

24
libavformat/utils.c
View File

@ -1091,27 +1091,6 @@ static void compute_pkt_fields(AVFormatContext *s, AVStream *st,
pkt->dts += offset; pkt->dts += offset;
} }
if (pc && pc->dts_sync_point >= 0) {
// we have synchronization info from the parser
int64_t den = st->codec->time_base.den * (int64_t) st->time_base.num;
if (den > 0) {
int64_t num = st->codec->time_base.num * (int64_t) st->time_base.den;
if (pkt->dts != AV_NOPTS_VALUE) {
// got DTS from the stream, update reference timestamp
st->reference_dts = pkt->dts - pc->dts_ref_dts_delta * num / den;
} else if (st->reference_dts != AV_NOPTS_VALUE) {
// compute DTS based on reference timestamp
pkt->dts = st->reference_dts + pc->dts_ref_dts_delta * num / den;
}
if (st->reference_dts != AV_NOPTS_VALUE && pkt->pts == AV_NOPTS_VALUE)
pkt->pts = pkt->dts + pc->pts_dts_delta * num / den;
if (pc->dts_sync_point > 0)
st->reference_dts = pkt->dts; // new reference
}
}
/* This may be redundant, but it should not hurt. */ /* This may be redundant, but it should not hurt. */
if(pkt->dts != AV_NOPTS_VALUE && pkt->pts != AV_NOPTS_VALUE && pkt->pts > pkt->dts) if(pkt->dts != AV_NOPTS_VALUE && pkt->pts != AV_NOPTS_VALUE && pkt->pts > pkt->dts)
presentation_delayed = 1; presentation_delayed = 1;
@ -1581,7 +1560,6 @@ void ff_read_frame_flush(AVFormatContext *s)
st->last_IP_pts = AV_NOPTS_VALUE; st->last_IP_pts = AV_NOPTS_VALUE;
if(st->first_dts == AV_NOPTS_VALUE) st->cur_dts = RELATIVE_TS_BASE; if(st->first_dts == AV_NOPTS_VALUE) st->cur_dts = RELATIVE_TS_BASE;
else st->cur_dts = AV_NOPTS_VALUE; /* we set the current DTS to an unspecified origin */ else st->cur_dts = AV_NOPTS_VALUE; /* we set the current DTS to an unspecified origin */
st->reference_dts = AV_NOPTS_VALUE;
st->probe_packets = MAX_PROBE_PACKETS; st->probe_packets = MAX_PROBE_PACKETS;
@ -2365,7 +2343,6 @@ static void estimate_timings_from_pts(AVFormatContext *ic, int64_t old_offset)
st= ic->streams[i]; st= ic->streams[i];
st->cur_dts= st->first_dts; st->cur_dts= st->first_dts;
st->last_IP_pts = AV_NOPTS_VALUE; st->last_IP_pts = AV_NOPTS_VALUE;
st->reference_dts = AV_NOPTS_VALUE;
} }
} }
@ -3388,7 +3365,6 @@ AVStream *avformat_new_stream(AVFormatContext *s, const AVCodec *c)
st->last_IP_pts = AV_NOPTS_VALUE; st->last_IP_pts = AV_NOPTS_VALUE;
for(i=0; i<MAX_REORDER_DELAY+1; i++) for(i=0; i<MAX_REORDER_DELAY+1; i++)
st->pts_buffer[i]= AV_NOPTS_VALUE; st->pts_buffer[i]= AV_NOPTS_VALUE;
st->reference_dts = AV_NOPTS_VALUE;
st->sample_aspect_ratio = (AVRational){0,1}; st->sample_aspect_ratio = (AVRational){0,1};