remove fragment-metadata related things

Author: niyatim23

CMake/Dependencies/liblog4cplus-CMakeLists.txt

@@ -42,4 +42,4 @@ else()
       BUILD_ALWAYS      TRUE
       TEST_COMMAND      ""
   )
-endif()
+endif()

src/KinesisVideoStream.cpp

@@ -181,7 +181,6 @@ bool KinesisVideoStream::putFragmentMetadata(const std::string &name, const std:
         LOG_ERROR("Failed to insert fragment metadata with: " << status << " for " << this->stream_name_);
         return false;
     }
-    DLOGD("Successfully put the name: %s and value: %s in the metadata", pMetadataName, pMetadataValue);
     return true;
 }
 

src/gstreamer/gstkvssink.cpp

@@ -1239,15 +1239,14 @@ put_frame(std::shared_ptr<KvsSinkCustomData> data, void *frame_data, size_t len,
     create_kinesis_video_frame(&frame, pts, dts, flags, frame_data, len, track_id, index);
     bool ret = data->kinesis_video_stream->putFrame(frame);
 
-    if(CHECK_FRAME_FLAG_KEY_FRAME(flags)  || data->on_first_frame) {
-        data->fragment_metadata_count = data->persisted_fragment_metadata_count;
-        data->on_first_frame = false;
-        if(data->get_metrics && ret) {
+    if(data->get_metrics && ret) {
+        if(CHECK_FRAME_FLAG_KEY_FRAME(flags)  || data->on_first_frame){
             KvsSinkMetric *kvs_sink_metric = new KvsSinkMetric();
             kvs_sink_metric->stream_metrics = data->kinesis_video_stream->getMetrics();
             kvs_sink_metric->client_metrics = data->kinesis_video_producer->getMetrics();
             kvs_sink_metric->frame_pts = frame.presentationTs;
             kvs_sink_metric->on_first_frame = data->on_first_frame;
+            data->on_first_frame = false;
             g_signal_emit(G_OBJECT(data->kvs_sink), data->metric_signal_id, 0, kvs_sink_metric);
             delete kvs_sink_metric;
         }

src/gstreamer/gstkvssink.h

@@ -36,7 +36,6 @@
 #include <string.h>
 #include <mutex>
 #include <atomic>
-#include <tuple>
 #include <gst/base/gstcollectpads.h>
 #include <unordered_set>
 
@@ -74,8 +73,6 @@ typedef struct _GstKvsSinkClass GstKvsSinkClass;
 typedef struct _KvsSinkCustomData KvsSinkCustomData;
 typedef struct _KvsSinkMetric KvsSinkMetric;
 
-typedef std::tuple<std::string, std::string, bool> (*SupportImagesCallback)();
-
 /* all information needed for one track */
 typedef struct _GstKvsSinkTrackData {
     GstCollectData collect;       /* we extend the CollectData */
@@ -146,9 +143,6 @@ struct _GstKvsSink {
     guint                       num_streams;
     guint                       num_audio_streams;
     guint                       num_video_streams;
-    
-    SupportImagesCallback      support_images_callback;
-  
     std::unique_ptr<Credentials> credentials_;
     std::shared_ptr<KvsSinkCustomData> data;
 };
@@ -178,8 +172,6 @@ struct _KvsSinkCustomData {
             frame_count(0),
             first_pts(GST_CLOCK_TIME_NONE),
             producer_start_time(GST_CLOCK_TIME_NONE),
-            fragment_metadata_count(0),
-            persisted_fragment_metadata_count(0),
             streamingStopped(false) {}
     std::unique_ptr<KinesisVideoProducer> kinesis_video_producer;
     std::shared_ptr<KinesisVideoStream> kinesis_video_stream;
@@ -191,8 +183,6 @@ struct _KvsSinkCustomData {
     bool use_original_pts;
     bool get_metrics;
     uint32_t frame_count;
-    uint32_t fragment_metadata_count;
-    uint32_t persisted_fragment_metadata_count;
     bool on_first_frame;
     std::atomic<bool> streamingStopped;
     uint64_t frame_pts;
@@ -220,13 +210,4 @@ struct _KvsSinkMetric {
     bool on_first_frame;
 };
 
-static bool inline put_fragment_metadata(GstElement* element, const std::string name, const std::string value, bool persistent) {
-  GstStructure *metadata = gst_structure_new_empty(KVS_ADD_METADATA_G_STRUCT_NAME);
-  gst_structure_set(metadata, KVS_ADD_METADATA_NAME, G_TYPE_STRING, name.c_str(), 
-                  KVS_ADD_METADATA_VALUE, G_TYPE_STRING, value.c_str(), 
-                  KVS_ADD_METADATA_PERSISTENT, G_TYPE_BOOLEAN, persistent, NULL);
-  GstEvent* event = gst_event_new_custom(GST_EVENT_CUSTOM_DOWNSTREAM, metadata);
-  return gst_element_send_event(element, event);
-}
-
 #endif /* __GST_KVS_SINK_H__ */