[FFmpeg-cvslog] wav: Fix DTS detection
Michael Niedermayer
git at videolan.org
Sun Sep 23 01:28:03 CEST 2012
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Sep 23 01:16:57 2012 +0200| [697b476c075a0330c9ea058b5e74e970d1095adb] | committer: Michael Niedermayer
wav: Fix DTS detection
Fixes Ticket1474
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=697b476c075a0330c9ea058b5e74e970d1095adb
---
libavformat/wav.c | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/libavformat/wav.c b/libavformat/wav.c
index 5518ff3..f58bcb3 100644
--- a/libavformat/wav.c
+++ b/libavformat/wav.c
@@ -276,6 +276,14 @@ static int wav_probe(AVProbeData *p)
return 0;
}
+static void handle_stream_probing(AVStream *st)
+{
+ if (st->codec->codec_id == AV_CODEC_ID_PCM_S16LE) {
+ st->request_probe = AVPROBE_SCORE_MAX/2;
+ st->probe_packets = FFMIN(st->probe_packets, 4);
+ }
+}
+
static int wav_parse_fmt_tag(AVFormatContext *s, int64_t size, AVStream **st)
{
AVIOContext *pb = s->pb;
@@ -289,6 +297,8 @@ static int wav_parse_fmt_tag(AVFormatContext *s, int64_t size, AVStream **st)
ret = ff_get_wav_header(pb, (*st)->codec, size);
if (ret < 0)
return ret;
+ handle_stream_probing(*st);
+
(*st)->need_parsing = AVSTREAM_PARSE_FULL_RAW;
avpriv_set_pts_info(*st, 64, 1, (*st)->codec->sample_rate);
@@ -771,6 +781,7 @@ static int w64_read_header(AVFormatContext *s)
return ret;
avio_skip(pb, FFALIGN(size, INT64_C(8)) - size);
+ handle_stream_probing(st);
st->need_parsing = AVSTREAM_PARSE_FULL_RAW;
avpriv_set_pts_info(st, 64, 1, st->codec->sample_rate);
More information about the ffmpeg-cvslog
mailing list