[gst-devel] Re: [gst-cvs] rbultje gst-plugins: gst-plugins/gst/matroska/

[Thomas Vander Stichele]

make sure you check if this patch made it into fdo or not.

t

El vie, 19-12-2003 a las 17:07, Ronald Bultje escribió:
> CVS Root:       /cvsroot/gstreamer
> Module:         gst-plugins
> Changes by:     rbultje
> Date:           Fri Dec 19 2003  08:07:12 PST
> 
> Log message:
> Quickfix for wrong timestamps... No final solution yet
> 
> Modified files:
>     gst/matroska    : matroska-demux.c
> 
> Links:
> http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/gst/matroska/matroska-demux.c.diff?r1=1.3&r2=1.4
> 
> ====Begin Diffs====
> Index: matroska-demux.c
> ===================================================================
> RCS file: /cvsroot/gstreamer/gst-plugins/gst/matroska/matroska-demux.c,v
> retrieving revision 1.3
> retrieving revision 1.4
> diff -u -d -r1.3 -r1.4
> --- matroska-demux.c	18 Dec 2003 09:31:49 -0000	1.3
> +++ matroska-demux.c	19 Dec 2003 16:07:00 -0000	1.4
> @@ -1652,6 +1652,8 @@
>  
>          /* time (relative to cluster time) */
>          time = (* (gint16 *) data) * demux->time_scale;
> +        /* I think this is mis-documented in the matroska sources, we should
> +         * probably shift values (EBML-style) on this value... */
>          time = GINT16_FROM_BE (time);
>          data += 2; size -= 2;
>          flags = * (guint8 *) data;
> @@ -1734,9 +1736,12 @@
>  						    GST_BUFFER_SIZE (buf) - size,
>  						    lace_size[n]);
>  
> -            if (cluster_time != GST_CLOCK_TIME_NONE)
> -              GST_BUFFER_TIMESTAMP (sub) = cluster_time + time;
> -
> +            if (cluster_time != GST_CLOCK_TIME_NONE) {
> +              if (time < 0 && (-time) > cluster_time)
> +                GST_BUFFER_TIMESTAMP (sub) = cluster_time;
> +              else
> +                GST_BUFFER_TIMESTAMP (sub) = cluster_time + time;
> +            }
>              /* FIXME: duration */
>  
>              gst_pad_push (demux->src[stream]->pad, GST_DATA (sub));
> 
> 
> -------------------------------------------------------
> This SF.net email is sponsored by: IBM Linux Tutorials.
> Become an expert in LINUX or just sharpen your skills.  Sign up for IBM's
> Free Linux Tutorials.  Learn everything from the bash shell to sys admin.
> Click now! http://ads.osdn.com/?ad_id=1278&alloc_id=3371&op=click
> _______________________________________________
> gstreamer-cvs-verbose mailing list
> gstreamer-cvs-verbose at lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/gstreamer-cvs-verbose

Dave/Dina : future TV today ! - http://davedina.apestaart.org/
<-*- thomas (dot) apestaart (dot) org -*->
I'd like to tell you how I feel
I'll probably keep it till a Saturday
<-*- thomas (at) apestaart (dot) org -*->
URGent, best radio on the net - 24/7 ! - http://urgent.fm/