only update the DURATION field when appending buffers and both buffers have a valid...

Original commit message from CVS:
only update the DURATION field when appending buffers and both buffers
have a valid duration.

diff --git a/gst/gstbuffer.c b/gst/gstbuffer.c
index a0701de..6ffe635 100644 (file)
--- a/gst/gstbuffer.c
+++ b/gst/gstbuffer.c
@@ -452,8 +452,12 @@ gst_buffer_span (GstBuffer *buf1, guint32 offset, GstBuffer *buf2, guint32 len)
     }
   }
   /* if we completely merged the two buffers (appended), we can
-   * calculate the duration too */
-  if (offset == 0 && buf1->size + buf2->size == len) {
+   * calculate the duration too. Also make sure we's not messing with
+   * invalid DURATIONS */
+  if (offset == 0 && buf1->size + buf2->size == len &&
+      GST_BUFFER_DURATION_IS_VALID (buf1) &&
+      GST_BUFFER_DURATION_IS_VALID (buf2)) 
+  {
     /* add duration */
     GST_BUFFER_DURATION (newbuf) = GST_BUFFER_DURATION (buf1) + 
                                    GST_BUFFER_DURATION (buf2);

diff --git a/gst/gstbuffer.h b/gst/gstbuffer.h
index 8f8a6a8..aaa732b 100644 (file)
--- a/gst/gstbuffer.h
+++ b/gst/gstbuffer.h
@@ -69,6 +69,7 @@ extern GType _gst_buffer_pool_type;
 #define GST_BUFFER_OFFSET_NONE ((guint64)-1)
 #define GST_BUFFER_MAXSIZE_NONE        ((guint)0)
 
+#define GST_BUFFER_DURATION_IS_VALID(buffer)   (GST_CLOCK_TIME_IS_VALID (GST_BUFFER_DURATION (buffer)))
 #define GST_BUFFER_TIMESTAMP_IS_VALID(buffer)  (GST_CLOCK_TIME_IS_VALID (GST_BUFFER_TIMESTAMP (buffer)))
 #define GST_BUFFER_OFFSET_IS_VALID(buffer)     (GST_BUFFER_OFFSET (buffer) != GST_BUFFER_OFFSET_NONE)
 #define GST_BUFFER_MAXSIZE_IS_VALID(buffer)    (GST_BUFFER_MAXSIZE (buffer) != GST_BUFFER_MAXSIZE_NONE)