rtp: Update codes based on 1.18.4

[platform/upstream/gst-plugins-good.git] / gst / rtp / gstrtpvp8depay.c

diff --git a/gst/rtp/gstrtpvp8depay.c b/gst/rtp/gstrtpvp8depay.c
index 6da17e2..e71baf8 100644 (file)
--- a/gst/rtp/gstrtpvp8depay.c
+++ b/gst/rtp/gstrtpvp8depay.c
@@ -33,12 +33,10 @@ GST_DEBUG_CATEGORY_STATIC (gst_rtp_vp8_depay_debug);
 #define GST_CAT_DEFAULT gst_rtp_vp8_depay_debug
 
 static void gst_rtp_vp8_depay_dispose (GObject * object);
-#ifdef TIZEN_FEATURE_GST_UPSTREAM
 static void gst_rtp_vp8_depay_get_property (GObject * object, guint prop_id,
     GValue * value, GParamSpec * pspec);
 static void gst_rtp_vp8_depay_set_property (GObject * object, guint prop_id,
     const GValue * value, GParamSpec * pspec);
-#endif
 static GstBuffer *gst_rtp_vp8_depay_process (GstRTPBaseDepayload * depayload,
     GstRTPBuffer * rtp);
 static GstStateChangeReturn gst_rtp_vp8_depay_change_state (GstElement *
@@ -63,7 +61,6 @@ GST_STATIC_PAD_TEMPLATE ("sink",
         "media = (string) \"video\","
         "encoding-name = (string) { \"VP8\", \"VP8-DRAFT-IETF-01\" }"));
 
-#ifdef TIZEN_FEATURE_GST_UPSTREAM
 #define DEFAULT_WAIT_FOR_KEYFRAME FALSE
 
 enum
@@ -71,16 +68,13 @@ enum
   PROP_0,
   PROP_WAIT_FOR_KEYFRAME
 };
-#endif
 
 static void
 gst_rtp_vp8_depay_init (GstRtpVP8Depay * self)
 {
   self->adapter = gst_adapter_new ();
   self->started = FALSE;
-#ifdef TIZEN_FEATURE_GST_UPSTREAM
   self->wait_for_keyframe = DEFAULT_WAIT_FOR_KEYFRAME;
-#endif
 }
 
 static void
@@ -91,7 +85,6 @@ gst_rtp_vp8_depay_class_init (GstRtpVP8DepayClass * gst_rtp_vp8_depay_class)
   GstRTPBaseDepayloadClass *depay_class =
       (GstRTPBaseDepayloadClass *) (gst_rtp_vp8_depay_class);
 
-
   gst_element_class_add_static_pad_template (element_class,
       &gst_rtp_vp8_depay_sink_template);
   gst_element_class_add_static_pad_template (element_class,
@@ -103,7 +96,6 @@ gst_rtp_vp8_depay_class_init (GstRtpVP8DepayClass * gst_rtp_vp8_depay_class)
       "Sjoerd Simons <sjoerd@luon.net>");
 
   object_class->dispose = gst_rtp_vp8_depay_dispose;
-#ifdef TIZEN_FEATURE_GST_UPSTREAM
   object_class->set_property = gst_rtp_vp8_depay_set_property;
   object_class->get_property = gst_rtp_vp8_depay_get_property;
 
@@ -112,7 +104,7 @@ gst_rtp_vp8_depay_class_init (GstRtpVP8DepayClass * gst_rtp_vp8_depay_class)
           "Wait for the next keyframe after packet loss",
           DEFAULT_WAIT_FOR_KEYFRAME,
           G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-#endif
+
   element_class->change_state = gst_rtp_vp8_depay_change_state;
 
   depay_class->process_rtp_packet = gst_rtp_vp8_depay_process;
@@ -137,7 +129,6 @@ gst_rtp_vp8_depay_dispose (GObject * object)
     G_OBJECT_CLASS (gst_rtp_vp8_depay_parent_class)->dispose (object);
 }
 
-#ifdef TIZEN_FEATURE_GST_UPSTREAM
 static void
 gst_rtp_vp8_depay_set_property (GObject * object, guint prop_id,
     const GValue * value, GParamSpec * pspec)
@@ -169,7 +160,6 @@ gst_rtp_vp8_depay_get_property (GObject * object, guint prop_id,
       break;
   }
 }
-#endif
 
 static GstBuffer *
 gst_rtp_vp8_depay_process (GstRTPBaseDepayload * depay, GstRTPBuffer * rtp)
@@ -184,10 +174,9 @@ gst_rtp_vp8_depay_process (GstRTPBaseDepayload * depay, GstRTPBuffer * rtp)
     GST_LOG_OBJECT (self, "Discontinuity, flushing adapter");
     gst_adapter_clear (self->adapter);
     self->started = FALSE;
-#ifdef TIZEN_FEATURE_GST_UPSTREAM
+
     if (self->wait_for_keyframe)
       self->waiting_for_keyframe = TRUE;
-#endif
   }
 
   size = gst_rtp_buffer_get_payload_len (rtp);
@@ -256,11 +245,7 @@ gst_rtp_vp8_depay_process (GstRTPBaseDepayload * depay, GstRTPBuffer * rtp)
     if ((header[0] & 0x01)) {
       GST_BUFFER_FLAG_SET (out, GST_BUFFER_FLAG_DELTA_UNIT);
 
-#ifdef TIZEN_FEATURE_GST_UPSTREAM
       if (self->waiting_for_keyframe) {
-#else
-      if (!self->caps_sent) {
-#endif
         gst_buffer_unref (out);
         out = NULL;
         GST_INFO_OBJECT (self, "Dropping inter-frame before intra-frame");
@@ -291,16 +276,12 @@ gst_rtp_vp8_depay_process (GstRTPBaseDepayload * depay, GstRTPBuffer * rtp)
 
         gst_pad_set_caps (GST_RTP_BASE_DEPAYLOAD_SRCPAD (depay), srccaps);
         gst_caps_unref (srccaps);
-#ifndef TIZEN_FEATURE_GST_UPSTREAM
-        self->caps_sent = TRUE;
-#endif
+
         self->last_width = width;
         self->last_height = height;
         self->last_profile = profile;
       }
-#ifdef TIZEN_FEATURE_GST_UPSTREAM
       self->waiting_for_keyframe = FALSE;
-#endif
     }
 
     return out;
@@ -327,11 +308,7 @@ gst_rtp_vp8_depay_change_state (GstElement * element, GstStateChange transition)
       self->last_profile = -1;
       self->last_height = -1;
       self->last_width = -1;
-#ifdef TIZEN_FEATURE_GST_UPSTREAM
       self->waiting_for_keyframe = TRUE;
-#else
-      self->caps_sent = FALSE;
-#endif
       break;
     default:
       break;