From: Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>
Date: Wed, 16 Jun 2010 13:40:34 +0000 (+0200)
Subject: avidemux: improve audio vbr detection
X-Git-Tag: RELEASE-0.10.24~54
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a69e419c8eaf61b66c5889f5b635bfe8e97d3f71;p=platform%2Fupstream%2Fgst-plugins-good.git

avidemux: improve audio vbr detection

Subsequent entry time calculations use blockalign value to determine
number of frames per chunk, and blockalign == 1 is then most unlikely to result
in reasonable values (which also aligns with "spec").
---

diff --git a/gst/avi/gstavidemux.c b/gst/avi/gstavidemux.c
index e2c5c16..e7fe2c3 100644
--- a/gst/avi/gstavidemux.c
+++ b/gst/avi/gstavidemux.c
@@ -1988,11 +1988,12 @@ gst_avi_demux_parse_stream (GstAviDemux * avi, GstBuffer * buf)
             GST_DEBUG_OBJECT (element, "marking video as VBR, res %d", res);
             break;
           case GST_RIFF_FCC_auds:
-            stream->is_vbr = (stream->strh->samplesize == 0)
-                && stream->strh->scale > 1;
             res =
                 gst_riff_parse_strf_auds (element, sub, &stream->strf.auds,
                 &stream->extradata);
+            stream->is_vbr = (stream->strh->samplesize == 0)
+                && stream->strh->scale > 1
+                && stream->strf.auds->blockalign != 1;
             sub = NULL;
             GST_DEBUG_OBJECT (element, "marking audio as VBR:%d, res %d",
                 stream->is_vbr, res);