Skip to content

Commit

Permalink
cleanup -3
Browse files Browse the repository at this point in the history
  • Loading branch information
niyatim23 committed May 12, 2024
1 parent 456af89 commit 47d702d
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
6 changes: 3 additions & 3 deletions samples/kvssink_gstreamer_sample.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -281,13 +281,13 @@ void determine_credentials(GstElement *kvssink, CustomData *data) {
/*
This function creates a GstStructure and uses it to trigger the GST_EVENT_CUSTOM_DOWNSTREAM for put_fragment_metadata
*/
static bool put_fragment_metadata(GstElement* element, const std::string name, const std::string value, bool persistent) {
bool 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);
LOG_TRACE("Emit the put_fragment_metadata event with name: " << name << " , value: " << value << " , persistent: " << persistent);
LOG_TRACE("Emit the put_fragment_metadata event with structure: " << std::string(gst_structure_to_string (metadata)));
return gst_element_send_event(element, event);
}

Expand Down Expand Up @@ -330,7 +330,7 @@ static void put_metadata(GstElement* element) {
LOG_WARN("Removing the put_metadata timer as the the max capacity for metadata in a fragment is reached");
}
}

if (!put_fragment_metadata(element, metadata_name_stream.str(), metadata_value_stream.str(), data_global.persist_flag)) {
LOG_WARN("Failed to put fragment metadata with name:" << metadata_name_stream.str() << " and value:" << metadata_value_stream.str());
}
Expand Down
7 changes: 3 additions & 4 deletions src/gstreamer/gstkvssink.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1165,21 +1165,20 @@ gst_kvs_sink_handle_sink_event (GstCollectPads *pads,
LOG_WARN("Event structure is invalid or it contains invalid field: " << std::string(gst_structure_to_string (structure)) << " for " << kvssink->stream_name);
goto CleanUp;
}

LOG_INFO("received kvs-add-metadata event for " << kvssink->stream_name);
LOG_TRACE("Received kvs-add-metadata event for " << kvssink->stream_name);

metadata_name = std::string(gst_structure_get_string(structure, KVS_ADD_METADATA_NAME));
metadata_value = std::string(gst_structure_get_string(structure, KVS_ADD_METADATA_VALUE));
is_persist = persistent;

bool result = data->kinesis_video_stream->putFragmentMetadata(metadata_name, metadata_value, is_persist);

gst_event_unref (event);
event = NULL;

if (!result) {
ret = FALSE;
LOG_WARN("Failed to putFragmentMetadata. name: " << metadata_name << ", value: " << metadata_value << ", persistent: " << is_persist << " for " << kvssink->stream_name);
LOG_WARN("Failed to putFragmentMetadata for name: " << metadata_name << ", value: " << metadata_value << ", persistent: " << is_persist << " for " << kvssink->stream_name);
}

break;
Expand Down

0 comments on commit 47d702d

Please sign in to comment.