[gst-devel] Re: [gst-cvs] ds gst-plugins: gst-plugins/ gst-plugins/examples/capsfilter/ gst-plugins/examples/dynparams/ gst-plugins/examples/seeking/ gst-plugins/examples/switch/ gst-plugins/ext/dv/ gst-plugins/ext/faad/ gst-plugins/ext/mad/ gst-plugins/ext/smoothwave/ gst-plugins/

[Ronald S. Bultje]

Hey Dave,

On Wed, 2005-02-02 at 09:14, David Schleef wrote:
> * ext/faad/gstfaad.c: (gst_faad_change_state):
> * ext/mad/gstmad.c: (gst_mad_chain):
[..]
> Index: gstfaad.c
> RCS file: /cvs/gstreamer/gst-plugins/ext/faad/gstfaad.c,v
> retrieving revision 1.25
> retrieving revision 1.26
> diff -u -d -r1.25 -r1.26
> --- gstfaad.c	17 Jan 2005 23:34:45 -0000	1.25
> +++ gstfaad.c	2 Feb 2005 08:14:00 -0000	1.26
> @@ -692,7 +692,7 @@
>          conf = faacDecGetCurrentConfiguration (faad->handle);
>          conf->defObjectType = LC;
> -        conf->dontUpSampleImplicitSBR = 1;
> +        //conf->dontUpSampleImplicitSBR = 1;
>          faacDecSetConfiguration (faad->handle, conf);
>        }
>        break;
> Index: gstmad.c
> RCS file: /cvs/gstreamer/gst-plugins/ext/mad/gstmad.c,v
> retrieving revision 1.113
> retrieving revision 1.114
> diff -u -d -r1.113 -r1.114
> --- gstmad.c	27 Jan 2005 10:14:22 -0000	1.113
> +++ gstmad.c	2 Feb 2005 08:14:00 -0000	1.114
> @@ -1441,8 +1441,9 @@
>                &mad->total_samples);
>            mad->last_ts = GST_CLOCK_TIME_NONE;
>          }
> -        time_offset = mad->total_samples * GST_SECOND / mad->rate;
> -        time_duration = (nsamples * GST_SECOND / mad->rate);
> +        time_offset =
> +            mad->total_samples * GST_SECOND / mad->frame.header.samplerate;
> +        time_duration = (nsamples * GST_SECOND / mad->frame.header.samplerate);
>        if (mad->index) {

I assume those two were accidents: the first implies a workaround for an
old version of faad; detection is fixed in CVS already, the second is
your proposed fix for a bug in mad that I fixed a while ago
(differently).

Ronald

-- 
Ronald S. Bultje <rbultje at ronald.bitfreak.net>