ffmpeg | branch: master | Hendrik Leppkes <h.lepp...@gmail.com> | Tue Nov 17 00:28:58 2015 +0100| [2ea38a946dbd7c4528f5729f494758cfad491fa8] | committer: Hendrik Leppkes
avformat/mlpdec: consider all valid mlp access units when probing Fixes probing of truehd/mlp files with a lot of frames in between the major sync frames. The spec allows a distance of up to 128 frames in between major sync frames, which leads to the probing code not reaching the desired score. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2ea38a946dbd7c4528f5729f494758cfad491fa8 --- libavformat/mlpdec.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavformat/mlpdec.c b/libavformat/mlpdec.c index 2cce506..d82df21 100644 --- a/libavformat/mlpdec.c +++ b/libavformat/mlpdec.c @@ -29,16 +29,19 @@ static int av_always_inline mlp_thd_probe(AVProbeData *p, uint32_t sync) { const uint8_t *buf, *last_buf = p->buf, *end = p->buf + p->buf_size; int frames = 0, valid = 0, size = 0; + int nsubframes = 0; for (buf = p->buf; buf + 8 <= end; buf++) { if (AV_RB32(buf + 4) == sync) { frames++; if (last_buf + size == buf) { - valid++; + valid += 1 + nsubframes / 8; } + nsubframes = 0; last_buf = buf; size = (AV_RB16(buf) & 0xfff) * 2; } else if (buf - last_buf == size) { + nsubframes++; size += (AV_RB16(buf) & 0xfff) * 2; } } _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
