Merge branch 'develop' into signals-kvssink

awslabs · Mar 24, 2023 · 66f6a9e · 66f6a9e
2 parents 5866b62 + 9923075
commit 66f6a9e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/src/gstreamer/gstkvssink.cpp b/src/gstreamer/gstkvssink.cpp
@@ -136,7 +136,6 @@ namespace KvsSinkSignals {
     guint errSignalId;
     guint ack_signal_id;
     guint metric_signal_id;
-    guint errSignalId;
 };
 
 enum {
@@ -659,7 +658,6 @@ gst_kvs_sink_class_init(GstKvsSinkClass *klass) {
     KvsSinkSignals::metric_signal_id = g_signal_new("stream-client-metric", G_TYPE_FROM_CLASS(gobject_class),
                                                (GSignalFlags)(G_SIGNAL_ACTION), G_STRUCT_OFFSET (GstKvsSinkClass, sink_stream_metric),
                                                NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_POINTER);
-    KvsSinkSignals::errSignalId = g_signal_new("stream-error", G_TYPE_FROM_CLASS(gobject_class), (GSignalFlags)(G_SIGNAL_RUN_LAST), G_STRUCT_OFFSET (GstKvsSinkClass, sink_stream_error), NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_UINT64);
 }
 
 static void
@@ -719,6 +717,9 @@ gst_kvs_sink_init(GstKvsSink *kvssink) {
     kvssink->data->ack_signal_id = KvsSinkSignals::ack_signal_id;
     kvssink->data->metric_signal_id = KvsSinkSignals::metric_signal_id;
 
+    kvssink->data->ack_signal_id = KvsSinkSignals::ack_signal_id;
+    kvssink->data->metric_signal_id = KvsSinkSignals::metric_signal_id;
+
     // Mark plugin as sink
     GST_OBJECT_FLAG_SET (kvssink, GST_ELEMENT_FLAG_SINK);
 

diff --git a/src/gstreamer/gstkvssink.h b/src/gstreamer/gstkvssink.h
@@ -141,7 +141,6 @@ struct _GstKvsSinkClass {
     void (*sink_fragment_ack)              (GstKvsSink *kvssink, gpointer user_data);
     void (*sink_stream_error)              (GstKvsSink *kvssink, gpointer user_data);
     void (*sink_stream_metric)             (GstKvsSink *kvssink, gpointer user_data);
-    void (*sink_stream_error)              (GstKvsSink *kvssink, gpointer user_data);
 };
 
 GType gst_kvs_sink_get_type (void);
@@ -158,7 +157,6 @@ struct _KvsSinkCustomData {
             first_video_frame(true),
             use_original_pts(false),
             onFirstFrame(true),
-            use_original_pts(false),
             frame_count(0),
             first_pts(GST_CLOCK_TIME_NONE),
             producer_start_time(GST_CLOCK_TIME_NONE) {}
@@ -181,7 +179,6 @@ struct _KvsSinkCustomData {
     uint64_t producer_start_time;
     guint errSignalId = 0;
     uint64_t startTime;  // [nanoSeconds]
-    guint errSignalId = 0;
     guint ack_signal_id = 0;
     guint metric_signal_id = 0;