From: Sebastian Dröge <sebastian.droege@collabora.co.uk>
Date: Mon, 28 Nov 2011 18:29:13 +0000 (+0100)
Subject: basevideoencoder: Don't push an upstream force-keyunit event downstream
X-Git-Tag: 1.19.3~507^2~15897^2~112
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=209ea84ef4c8127b48f6fafe1e554d1a4d219b66;p=platform%2Fupstream%2Fgstreamer.git

basevideoencoder: Don't push an upstream force-keyunit event downstream
---

diff --git a/gst-libs/gst/video/gstbasevideoencoder.c b/gst-libs/gst/video/gstbasevideoencoder.c
index 6f09327..d36f7a9 100644
--- a/gst-libs/gst/video/gstbasevideoencoder.c
+++ b/gst-libs/gst/video/gstbasevideoencoder.c
@@ -184,10 +184,6 @@ gst_base_video_encoder_reset (GstBaseVideoEncoder * base_video_encoder)
   base_video_encoder->min_latency = 0;
   base_video_encoder->max_latency = 0;
 
-  if (base_video_encoder->force_keyunit_event) {
-    gst_event_unref (base_video_encoder->force_keyunit_event);
-    base_video_encoder->force_keyunit_event = NULL;
-  }
   gst_buffer_replace (&base_video_encoder->headers, NULL);
 
   g_list_foreach (base_video_encoder->current_frame_events,
@@ -534,9 +530,6 @@ gst_base_video_encoder_sink_eventfunc (GstBaseVideoEncoder * base_video_encoder,
                 &base_video_encoder->force_keyframe_headers))
           base_video_encoder->force_keyframe_headers = FALSE;
 
-        if (base_video_encoder->force_keyunit_event)
-          gst_event_unref (base_video_encoder->force_keyunit_event);
-        base_video_encoder->force_keyunit_event = gst_event_copy (event);
         GST_DEBUG_OBJECT (base_video_encoder, "GstForceKeyUnit, all-headers %d",
             base_video_encoder->force_keyframe_headers);
         GST_OBJECT_UNLOCK (base_video_encoder);
@@ -919,17 +912,8 @@ gst_base_video_encoder_finish_frame (GstBaseVideoEncoder * base_video_encoder,
         (base_video_encoder)->segment, GST_FORMAT_TIME,
         frame->presentation_timestamp);
 
-    /* re-use upstream event if any so it also conveys any additional
-     * info upstream arranged in there */
-    GST_OBJECT_LOCK (base_video_encoder);
-    if (base_video_encoder->force_keyunit_event) {
-      ev = base_video_encoder->force_keyunit_event;
-      base_video_encoder->force_keyunit_event = NULL;
-    } else {
-      ev = gst_event_new_custom (GST_EVENT_CUSTOM_DOWNSTREAM,
-          gst_structure_new ("GstForceKeyUnit", NULL));
-    }
-    GST_OBJECT_UNLOCK (base_video_encoder);
+    ev = gst_event_new_custom (GST_EVENT_CUSTOM_DOWNSTREAM,
+        gst_structure_new ("GstForceKeyUnit", NULL));
 
     gst_structure_set (ev->structure,
         "timestamp", G_TYPE_UINT64, frame->presentation_timestamp,
diff --git a/gst-libs/gst/video/gstbasevideoencoder.h b/gst-libs/gst/video/gstbasevideoencoder.h
index 951863f..d8d578e 100644
--- a/gst-libs/gst/video/gstbasevideoencoder.h
+++ b/gst-libs/gst/video/gstbasevideoencoder.h
@@ -95,7 +95,6 @@ struct _GstBaseVideoEncoder
   gint64            min_latency;
   gint64            max_latency;
 
-  GstEvent         *force_keyunit_event;
   GList            *current_frame_events;
   GstBuffer        *headers;