ds gst-plugins-bad: gst-plugins-bad/ gst-plugins-bad/gst/mpegdemux/

CVS Root:       /cvs/gstreamer
Module:         gst-plugins-bad
Changes by:     ds
Date:           Wed Nov 26 2008  04:57:37 UTC

Log message:
* gst/mpegdemux/gstmpegtsdemux.c:
* gst/mpegdemux/gstmpegtsdemux.h:
Enable latency code, since we're definitely after 0.10.12

Modified files:
    .               : ChangeLog
    gst/mpegdemux   : gstmpegtsdemux.c gstmpegtsdemux.h

Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/ChangeLog.diff?r1=1.3744&r2=1.3745
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/gst/mpegdemux/gstmpegtsdemux.c.diff?r1=1.12&r2=1.13
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/gst/mpegdemux/gstmpegtsdemux.h.diff?r1=1.4&r2=1.5

====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-bad/ChangeLog,v
retrieving revision 1.3744
retrieving revision 1.3745
diff -u -d -r1.3744 -r1.3745
--- ChangeLog	25 Nov 2008 18:28:16 -0000	1.3744
+++ ChangeLog	26 Nov 2008 04:57:21 -0000	1.3745
@@ -1,3 +1,9 @@
+2008-11-25  David Schleef  <[email protected]>
+
+	* gst/mpegdemux/gstmpegtsdemux.c:
+	* gst/mpegdemux/gstmpegtsdemux.h:
+	  Enable latency code, since we're definitely after 0.10.12
 2008-11-25  Wim Taymans  <[email protected]>
 
 	Patch by: Jonathan Matthew <notverysmart at gmail dot com>
Index: gstmpegtsdemux.c
RCS file: /cvs/gstreamer/gst-plugins-bad/gst/mpegdemux/gstmpegtsdemux.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- gstmpegtsdemux.c	6 Nov 2008 12:17:08 -0000	1.12
+++ gstmpegtsdemux.c	26 Nov 2008 04:57:22 -0000	1.13
@@ -192,10 +192,8 @@
 static GstFlowReturn gst_fluts_demux_chain (GstPad * pad, GstBuffer * buffer);
 static gboolean gst_fluts_demux_sink_setcaps (GstPad * pad, GstCaps * caps);
-#ifdef HAVE_LATENCY
 static GstClock *gst_fluts_demux_provide_clock (GstElement * element);
 static gboolean gst_fluts_demux_src_pad_query (GstPad * pad, GstQuery * query);
-#endif
 static GstStateChangeReturn gst_fluts_demux_change_state (GstElement * element,
     GstStateChange transition);
@@ -305,9 +303,7 @@
           "or Blue-Ray Format ie .m2ts(192 bytes).", FALSE, G_PARAM_READWRITE));
   gstelement_class->change_state = gst_fluts_demux_change_state;
   gstelement_class->provide_clock = gst_fluts_demux_provide_clock;
 }
 static void
@@ -382,12 +378,10 @@
     }
   }
   if (demux->clock) {
     g_object_unref (demux->clock);
     demux->clock = NULL;
 #if 0
@@ -669,10 +663,8 @@
   gst_pad_use_fixed_caps (stream->pad);
   gst_pad_set_caps (stream->pad, caps);
   gst_caps_unref (caps);
   gst_pad_set_query_function (stream->pad,
       GST_DEBUG_FUNCPTR (gst_fluts_demux_src_pad_query));
   g_free (name);
   return TRUE;
@@ -740,13 +732,11 @@
   GST_DEBUG_OBJECT (demux, "segment PTS to (%" G_GUINT64_FORMAT ") time: %"
       G_GUINT64_FORMAT, base_PCR, time);
   if (demux->clock && demux->clock_base == GST_CLOCK_TIME_NONE) {
     demux->clock_base = gst_clock_get_time (demux->clock);
     gst_clock_set_calibration (demux->clock,
         gst_clock_get_internal_time (demux->clock), demux->clock_base, 1, 1);
   gst_pad_push_event (stream->pad,
       gst_event_new_new_segment (FALSE, 1.0, GST_FORMAT_TIME, time, -1, 0));
@@ -1686,7 +1676,6 @@
         stream->last_PCR = pcr;
         if (demux->clock && demux->clock_base != GST_CLOCK_TIME_NONE) {
           gdouble r_squared;
           GstFluTSStream *PMT_stream;
@@ -1710,7 +1699,6 @@
                 MPEGTIME_TO_GSTTIME (stream->base_PCR), &r_squared);
           }
         }
       }
       data += 6;
@@ -2387,7 +2375,6 @@
 static gboolean
 gst_fluts_demux_provides_clock (GstElement * element)
 {
@@ -2464,7 +2451,6 @@
   return res;
 static FORCE_INLINE gint
Index: gstmpegtsdemux.h
RCS file: /cvs/gstreamer/gst-plugins-bad/gst/mpegdemux/gstmpegtsdemux.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- gstmpegtsdemux.h	6 Nov 2008 10:42:59 -0000	1.4
+++ gstmpegtsdemux.h	26 Nov 2008 04:57:22 -0000	1.5
@@ -53,10 +53,6 @@
 G_BEGIN_DECLS
-#if (POST_10_12)
-#define HAVE_LATENCY
-
 #define FLUTS_MIN_PES_BUFFER_SIZE     4 * 1024
 #define FLUTS_MAX_PES_BUFFER_SIZE   256 * 1024
@@ -207,11 +203,9 @@
   gboolean          need_no_more_pads;
   guint16           packetsize;
   gboolean          m2ts_mode;
   /* clocking */
   GstClock          * clock;
   GstClockTime      clock_base;
 };
 struct _GstFluTSDemuxClass {

-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/