From 57347c7c37fc2888080ed61adabf080c540838fe Mon Sep 17 00:00:00 2001 From: Jeffery Wilson Date: Thu, 27 Jun 2024 13:05:08 -0400 Subject: [PATCH 1/3] [chore] meson: address meson warnings --- meson.build | 1 - tests/check/meson.build | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 26841d2..d70c848 100644 --- a/meson.build +++ b/meson.build @@ -19,7 +19,6 @@ endif apiversion = '1.0' -glib_dep = dependency('glib-2.0') gst_dep = dependency('gstreamer-1.0', version : gst_req, fallback : ['gstreamer', 'gst_dep']) gst_base_dep = dependency('gstreamer-base-1.0', version : gst_req, diff --git a/tests/check/meson.build b/tests/check/meson.build index f9395b7..4aa7412 100644 --- a/tests/check/meson.build +++ b/tests/check/meson.build @@ -17,7 +17,7 @@ foreach test_file : element_tests ) env = environment() - env.set('GST_PLUGIN_PATH_1_0', meson.build_root()) + env.set('GST_PLUGIN_PATH_1_0', meson.project_build_root()) env.set('GST_DEBUG', 'check:TRACE,s3sink:TRACE') test(test_name, exe, timeout: 3 * 60, env: env) endforeach From 192352fb355e14ea1fa9a0e6da711d905dbffb6e Mon Sep 17 00:00:00 2001 From: Jeffery Wilson Date: Thu, 27 Jun 2024 13:05:53 -0400 Subject: [PATCH 2/3] [fix] config: (VIDEO-2901) only use default credential provider when no credentials provided --- src/gsts3sink.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/gsts3sink.c b/src/gsts3sink.c index 19c138f..9291052 100644 --- a/src/gsts3sink.c +++ b/src/gsts3sink.c @@ -306,7 +306,6 @@ static void gst_s3_sink_init (GstS3Sink * s3sink) { s3sink->config = GST_S3_UPLOADER_CONFIG_INIT; - s3sink->config.credentials = gst_aws_credentials_new_default (); s3sink->uploader = NULL; s3sink->downloader = NULL; s3sink->is_started = FALSE; @@ -328,7 +327,8 @@ gst_s3_sink_release_config (GstS3UploaderConfig * config) g_free (config->content_type); g_free (config->ca_file); g_free (config->aws_sdk_endpoint); - gst_aws_credentials_free (config->credentials); + if (config->credentials) + gst_aws_credentials_free (config->credentials); *config = GST_S3_UPLOADER_CONFIG_INIT; } @@ -533,6 +533,9 @@ gst_s3_sink_start (GstBaseSink * basesink) || gst_s3_sink_is_null_or_empty (sink->config.key))) goto no_destination; + if (!sink->config.credentials) + sink->config.credentials = gst_aws_credentials_new_default (); + if (sink->uploader == NULL) { sink->uploader = GST_S3_SINK_GET_CLASS((gpointer*) sink)->uploader_new (&sink->config); } From ed1bd787b04395cf9495accd5229cd03fa042415 Mon Sep 17 00:00:00 2001 From: Jeffery Wilson Date: Thu, 27 Jun 2024 13:10:09 -0400 Subject: [PATCH 3/3] [chore] meson: bump version to 0.2.1-lldc.9 --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index d70c848..5241d05 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ project('amazon-s3-gst-plugin', 'c', 'cpp', - version : '0.2.1-lldc.8', + version : '0.2.1-lldc.9', default_options : [ 'warning_level=2', 'buildtype=debugoptimized' ])