Drop the whole frame if a packet is lost.

Fixes #582575

diff --git a/gst/rtp/gstrtph263depay.c b/gst/rtp/gstrtph263depay.c
index f27109b8c8a6d343759cdcac65cae26c107fa3ae..2398aa286b836f1b3c48700d2ae10875bc395031 100644 (file)
--- a/gst/rtp/gstrtph263depay.c
+++ b/gst/rtp/gstrtph263depay.c
@@ -127,6 +127,7 @@ gst_rtp_h263_depay_init (GstRtpH263Depay * rtph263depay,
 
   rtph263depay->offset = 0;
   rtph263depay->leftover = 0;
+  rtph263depay->start = TRUE;
 }
 
 static void
@@ -182,6 +183,7 @@ gst_rtp_h263_depay_process (GstBaseRTPDepayload * depayload, GstBuffer * buf)
     gst_adapter_clear (rtph263depay->adapter);
     rtph263depay->offset = 0;
     rtph263depay->leftover = 0;
+    rtph263depay->start = FALSE;
   }
 
   payload_len = gst_rtp_buffer_get_payload_len (buf);
@@ -272,53 +274,60 @@ gst_rtp_h263_depay_process (GstBaseRTPDepayload * depayload, GstBuffer * buf)
   }
 
   if (!EBIT) {
-    GstBuffer *tmp = gst_buffer_new_and_alloc (payload_len);
+    if(rtph263depay->start){
+      GstBuffer *tmp = gst_buffer_new_and_alloc (payload_len);
 
-    /* Copy the entire buffer */
-    memcpy (GST_BUFFER_DATA (tmp), payload, payload_len);
-    gst_adapter_push (rtph263depay->adapter, tmp);
+      /* Copy the entire buffer */
+      memcpy (GST_BUFFER_DATA (tmp), payload, payload_len);
+      gst_adapter_push (rtph263depay->adapter, tmp);
+    }
   } else {
-    GstBuffer *tmp = gst_buffer_new_and_alloc (payload_len - 1);
-
-    /* Copy the entire buffer except for the last byte */
-    memcpy (GST_BUFFER_DATA (tmp), payload, payload_len - 1);
-    gst_adapter_push (rtph263depay->adapter, tmp);
-
-    /* Put the last byte into the leftover */
-    GST_DEBUG ("payload[payload_len - 1] : 0x%x", payload[payload_len - 1]);
-    GST_DEBUG ("mask : 0x%x", 0xFF << EBIT);
-    rtph263depay->leftover = (payload[payload_len - 1] >> EBIT) << EBIT;
-    rtph263depay->offset = 1;
-    GST_DEBUG ("leftover : 0x%x", rtph263depay->leftover);
+    if(rtph263depay->start){
+      GstBuffer *tmp = gst_buffer_new_and_alloc (payload_len - 1);
+
+      /* Copy the entire buffer except for the last byte */
+      memcpy (GST_BUFFER_DATA (tmp), payload, payload_len - 1);
+      gst_adapter_push (rtph263depay->adapter, tmp);
+
+      /* Put the last byte into the leftover */
+      GST_DEBUG ("payload[payload_len - 1] : 0x%x", payload[payload_len - 1]);
+      GST_DEBUG ("mask : 0x%x", 0xFF << EBIT);
+      rtph263depay->leftover = (payload[payload_len - 1] >> EBIT) << EBIT;
+      rtph263depay->offset = 1;
+      GST_DEBUG ("leftover : 0x%x", rtph263depay->leftover);
+    }
   }
 
   if (M) {
-    /* frame is completed */
-    guint avail;
-    guint32 timestamp;
-
-    if (rtph263depay->offset) {
-      /* push in the leftover */
-      GstBuffer *buf = gst_buffer_new_and_alloc (1);
-
-      GST_DEBUG ("Pushing leftover in adapter");
-      GST_BUFFER_DATA (buf)[0] = rtph263depay->leftover;
-      gst_adapter_push (rtph263depay->adapter, buf);
+    if(rtph263depay->start){
+      /* frame is completed */
+      guint avail;
+      guint32 timestamp;
+
+      if (rtph263depay->offset) {
+        /* push in the leftover */
+        GstBuffer *buf = gst_buffer_new_and_alloc (1);
+
+        GST_DEBUG ("Pushing leftover in adapter");
+        GST_BUFFER_DATA (buf)[0] = rtph263depay->leftover;
+        gst_adapter_push (rtph263depay->adapter, buf);
+      }
+
+      avail = gst_adapter_available (rtph263depay->adapter);
+      outbuf = gst_adapter_take_buffer (rtph263depay->adapter, avail);
+
+      if (I)
+        GST_BUFFER_FLAG_SET (outbuf, GST_BUFFER_FLAG_DELTA_UNIT);
+
+      GST_DEBUG ("Pushing out a buffer of %d bytes", avail);
+
+      timestamp = gst_rtp_buffer_get_timestamp (buf);
+      gst_base_rtp_depayload_push_ts (depayload, timestamp, outbuf);
+      rtph263depay->offset = 0;
+      rtph263depay->leftover = 0;
+    }else{
+      rtph263depay->start = TRUE;
     }
-
-    avail = gst_adapter_available (rtph263depay->adapter);
-    outbuf = gst_adapter_take_buffer (rtph263depay->adapter, avail);
-
-    if (I)
-      GST_BUFFER_FLAG_SET (outbuf, GST_BUFFER_FLAG_DELTA_UNIT);
-
-    GST_DEBUG ("Pushing out a buffer of %d bytes", avail);
-
-    timestamp = gst_rtp_buffer_get_timestamp (buf);
-    gst_base_rtp_depayload_push_ts (depayload, timestamp, outbuf);
-    rtph263depay->offset = 0;
-    rtph263depay->leftover = 0;
-
   }
 
   return NULL;

diff --git a/gst/rtp/gstrtph263depay.h b/gst/rtp/gstrtph263depay.h
index ab5a6d00168dd54f46d5744557dc7a5dfc5eebba..169196b51d877232e07dcefb2e0a4b7115505562 100644 (file)
--- a/gst/rtp/gstrtph263depay.h
+++ b/gst/rtp/gstrtph263depay.h
@@ -47,6 +47,7 @@ struct _GstRtpH263Depay
   guint8 offset;       /* offset to apply to next payload */
   guint8 leftover;     /* leftover from previous payload (if offset != 0) */
   GstAdapter *adapter;
+  gboolean start;
 };
 
 struct _GstRtpH263DepayClass