gs: Fix indentation and make it consistent

Apparently this partially used clang-format's default settings, so let's
use that for everything now.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/934>

diff --git a/subprojects/gst-plugins-bad/ext/gs/gstgs.cpp b/subprojects/gst-plugins-bad/ext/gs/gstgs.cpp
index 94da7ee..3f0453b 100644 (file)
--- a/subprojects/gst-plugins-bad/ext/gs/gstgs.cpp
+++ b/subprojects/gst-plugins-bad/ext/gs/gstgs.cpp
@@ -34,20 +34,21 @@
 #include "gstgssink.h"
 #include "gstgssrc.h"
 
-static gboolean
-plugin_init (GstPlugin * plugin)
-{
+static gboolean plugin_init(GstPlugin* plugin) {
   gboolean ret = FALSE;
 
-  ret |= GST_ELEMENT_REGISTER (gssrc, plugin);
-  ret |= GST_ELEMENT_REGISTER (gssink, plugin);
+  ret |= GST_ELEMENT_REGISTER(gssrc, plugin);
+  ret |= GST_ELEMENT_REGISTER(gssink, plugin);
 
   return ret;
 }
 
-GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
-    GST_VERSION_MINOR,
-    gs,
-    "Read and write from and to a Google Cloud Storage",
-    plugin_init,
-    PACKAGE_VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)
+GST_PLUGIN_DEFINE(GST_VERSION_MAJOR,
+                  GST_VERSION_MINOR,
+                  gs,
+                  "Read and write from and to a Google Cloud Storage",
+                  plugin_init,
+                  PACKAGE_VERSION,
+                  GST_LICENSE,
+                  GST_PACKAGE_NAME,
+                  GST_PACKAGE_ORIGIN)

diff --git a/subprojects/gst-plugins-bad/ext/gs/gstgscommon.cpp b/subprojects/gst-plugins-bad/ext/gs/gstgscommon.cpp
index b0f5760..41f1060 100644 (file)
--- a/subprojects/gst-plugins-bad/ext/gs/gstgscommon.cpp
+++ b/subprojects/gst-plugins-bad/ext/gs/gstgscommon.cpp
@@ -28,101 +28,91 @@ namespace gcs = google::cloud::storage;
 namespace {
 
 #if !GLIB_CHECK_VERSION(2, 62, 0)
-  static inline gchar *
-  g_date_time_format_iso8601 (GDateTime * datetime)
-  {
-    GString *
-        outstr = NULL;
-    gchar *
-        main_date = NULL;
-    gint64 offset;
-
-    // Main date and time.
-    main_date = g_date_time_format (datetime, "%Y-%m-%dT%H:%M:%S");
-    outstr = g_string_new (main_date);
-    g_free (main_date);
-
-    // Timezone. Format it as `%:::z` unless the offset is zero, in which case
-    // we can simply use `Z`.
-    offset = g_date_time_get_utc_offset (datetime);
-
-    if (offset == 0) {
-      g_string_append_c (outstr, 'Z');
-    } else {
-      gchar *
-          time_zone = g_date_time_format (datetime, "%:::z");
-      g_string_append (outstr, time_zone);
-      g_free (time_zone);
-    }
-
-    return g_string_free (outstr, FALSE);
+static inline gchar* g_date_time_format_iso8601(GDateTime* datetime) {
+  GString* outstr = NULL;
+  gchar* main_date = NULL;
+  gint64 offset;
+
+  // Main date and time.
+  main_date = g_date_time_format(datetime, "%Y-%m-%dT%H:%M:%S");
+  outstr = g_string_new(main_date);
+  g_free(main_date);
+
+  // Timezone. Format it as `%:::z` unless the offset is zero, in which case
+  // we can simply use `Z`.
+  offset = g_date_time_get_utc_offset(datetime);
+
+  if (offset == 0) {
+    g_string_append_c(outstr, 'Z');
+  } else {
+    gchar* time_zone = g_date_time_format(datetime, "%:::z");
+    g_string_append(outstr, time_zone);
+    g_free(time_zone);
   }
+
+  return g_string_free(outstr, FALSE);
+}
 #endif
 
 }  // namespace
 
-std::unique_ptr <
-    google::cloud::storage::Client >
-gst_gs_create_client (const gchar * service_account_email, GError ** error)
-{
+std::unique_ptr<google::cloud::storage::Client> gst_gs_create_client(
+    const gchar* service_account_email,
+    GError** error) {
   if (service_account_email) {
     // Meant to be used from a container running in the Cloud.
 
-    google::cloud::StatusOr < std::shared_ptr <
-        gcs::oauth2::Credentials >> creds (std::make_shared <
-        gcs::oauth2::ComputeEngineCredentials <>> (service_account_email));
+    google::cloud::StatusOr<std::shared_ptr<gcs::oauth2::Credentials>> creds(
+        std::make_shared<gcs::oauth2::ComputeEngineCredentials<>>(
+            service_account_email));
     if (!creds) {
-      g_set_error (error, GST_RESOURCE_ERROR,
-          GST_RESOURCE_ERROR_NOT_AUTHORIZED,
-          "Could not retrieve credentials for the given service account %s (%s)",
-          service_account_email, creds.status ().message ().c_str ());
+      g_set_error(error, GST_RESOURCE_ERROR, GST_RESOURCE_ERROR_NOT_AUTHORIZED,
+                  "Could not retrieve credentials for the given service "
+                  "account %s (%s)",
+                  service_account_email, creds.status().message().c_str());
       return nullptr;
     }
 
-    gcs::ClientOptions client_options (std::move (creds.value ()));
-    return std::make_unique < gcs::Client > (client_options,
-        gcs::StrictIdempotencyPolicy ());
+    gcs::ClientOptions client_options(std::move(creds.value()));
+    return std::make_unique<gcs::Client>(client_options,
+                                         gcs::StrictIdempotencyPolicy());
   }
   // Default account. This is meant to retrieve the credentials automatically
   // using diffrent methods.
-  google::cloud::StatusOr < gcs::ClientOptions > client_options =
-      gcs::ClientOptions::CreateDefaultClientOptions ();
+  google::cloud::StatusOr<gcs::ClientOptions> client_options =
+      gcs::ClientOptions::CreateDefaultClientOptions();
 
   if (!client_options) {
-    g_set_error (error, GST_RESOURCE_ERROR,
-        GST_RESOURCE_ERROR_NOT_AUTHORIZED,
-        "Could not create default client options (%s)",
-        client_options.status ().message ().c_str ());
+    g_set_error(error, GST_RESOURCE_ERROR, GST_RESOURCE_ERROR_NOT_AUTHORIZED,
+                "Could not create default client options (%s)",
+                client_options.status().message().c_str());
     return nullptr;
   }
-  return std::make_unique < gcs::Client > (client_options.value (),
-      gcs::StrictIdempotencyPolicy ());
+  return std::make_unique<gcs::Client>(client_options.value(),
+                                       gcs::StrictIdempotencyPolicy());
 }
 
-gboolean
-gst_gs_get_buffer_date (GstBuffer * buffer, GDateTime * start_date,
-    gchar ** buffer_date_str_ptr)
-{
-  gchar *
-      buffer_date_str = NULL;
+gboolean gst_gs_get_buffer_date(GstBuffer* buffer,
+                                GDateTime* start_date,
+                                gchar** buffer_date_str_ptr) {
+  gchar* buffer_date_str = NULL;
   GstClockTime buffer_timestamp = GST_CLOCK_TIME_NONE;
   GTimeSpan buffer_timespan = 0;
 
   if (!buffer || !start_date)
     return FALSE;
 
-  buffer_timestamp = GST_BUFFER_PTS (buffer);
+  buffer_timestamp = GST_BUFFER_PTS(buffer);
 
   // GTimeSpan is in micro seconds.
-  buffer_timespan = GST_TIME_AS_USECONDS (buffer_timestamp);
+  buffer_timespan = GST_TIME_AS_USECONDS(buffer_timestamp);
 
-  GDateTime *
-      buffer_date = g_date_time_add (start_date, buffer_timespan);
+  GDateTime* buffer_date = g_date_time_add(start_date, buffer_timespan);
   if (!buffer_date)
     return FALSE;
 
-  buffer_date_str = g_date_time_format_iso8601 (buffer_date);
-  g_date_time_unref (buffer_date);
+  buffer_date_str = g_date_time_format_iso8601(buffer_date);
+  g_date_time_unref(buffer_date);
 
   if (!buffer_date_str)
     return FALSE;

diff --git a/subprojects/gst-plugins-bad/ext/gs/gstgscommon.h b/subprojects/gst-plugins-bad/ext/gs/gstgscommon.h
index 8dd59f2..574212e 100644 (file)
--- a/subprojects/gst-plugins-bad/ext/gs/gstgscommon.h
+++ b/subprojects/gst-plugins-bad/ext/gs/gstgscommon.h
@@ -36,4 +36,4 @@ gboolean gst_gs_get_buffer_date(GstBuffer* buffer,
                                 GDateTime* start_date,
                                 gchar** buffer_date_str_ptr);
 
-#endif // __GST_GS_COMMON_H__
+#endif  // __GST_GS_COMMON_H__

diff --git a/subprojects/gst-plugins-bad/ext/gs/gstgssink.cpp b/subprojects/gst-plugins-bad/ext/gs/gstgssink.cpp
index 07e44c7..104ca62 100644 (file)
--- a/subprojects/gst-plugins-bad/ext/gs/gstgssink.cpp
+++ b/subprojects/gst-plugins-bad/ext/gs/gstgssink.cpp
@@ -168,7 +168,7 @@ static GType gst_gs_sink_next_get_type(void) {
 
 #define gst_gs_sink_parent_class parent_class
 G_DEFINE_TYPE(GstGsSink, gst_gs_sink, GST_TYPE_BASE_SINK);
-GST_ELEMENT_REGISTER_DEFINE (gssink, "gssink", GST_RANK_NONE, GST_TYPE_GS_SINK)
+GST_ELEMENT_REGISTER_DEFINE(gssink, "gssink", GST_RANK_NONE, GST_TYPE_GS_SINK)
 
 class GSWriteStream {
  public:

diff --git a/subprojects/gst-plugins-bad/ext/gs/gstgssink.h b/subprojects/gst-plugins-bad/ext/gs/gstgssink.h
index 2d61134..0984121 100644 (file)
--- a/subprojects/gst-plugins-bad/ext/gs/gstgssink.h
+++ b/subprojects/gst-plugins-bad/ext/gs/gstgssink.h
@@ -43,7 +43,7 @@ typedef enum {
   GST_GS_SINK_NEXT_NONE,
 } GstGsSinkNext;
 
-GST_ELEMENT_REGISTER_DECLARE (gssink);
+GST_ELEMENT_REGISTER_DECLARE(gssink);
 
 G_END_DECLS
-#endif // __GST_GS_SINK_H__
+#endif  // __GST_GS_SINK_H__

diff --git a/subprojects/gst-plugins-bad/ext/gs/gstgssrc.cpp b/subprojects/gst-plugins-bad/ext/gs/gstgssrc.cpp
index 7a8d36b..4636a91 100644 (file)
--- a/subprojects/gst-plugins-bad/ext/gs/gstgssrc.cpp
+++ b/subprojects/gst-plugins-bad/ext/gs/gstgssrc.cpp
@@ -109,7 +109,7 @@ static void gst_gs_src_uri_handler_init(gpointer g_iface, gpointer iface_data);
   GST_DEBUG_CATEGORY_INIT(gst_gs_src_debug, "gssrc", 0, "gssrc element");
 #define gst_gs_src_parent_class parent_class
 G_DEFINE_TYPE_WITH_CODE(GstGsSrc, gst_gs_src, GST_TYPE_BASE_SRC, _do_init);
-GST_ELEMENT_REGISTER_DEFINE (gssrc, "gssrc", GST_RANK_NONE, GST_TYPE_GS_SRC)
+GST_ELEMENT_REGISTER_DEFINE(gssrc, "gssrc", GST_RANK_NONE, GST_TYPE_GS_SRC)
 
 namespace gcs = google::cloud::storage;
 

diff --git a/subprojects/gst-plugins-bad/ext/gs/gstgssrc.h b/subprojects/gst-plugins-bad/ext/gs/gstgssrc.h
index 9a30cd9..efd953a 100644 (file)
--- a/subprojects/gst-plugins-bad/ext/gs/gstgssrc.h
+++ b/subprojects/gst-plugins-bad/ext/gs/gstgssrc.h
@@ -29,7 +29,7 @@ G_BEGIN_DECLS
 
 #define GST_TYPE_GS_SRC (gst_gs_src_get_type())
 G_DECLARE_FINAL_TYPE(GstGsSrc, gst_gs_src, GST, GS_SRC, GstBaseSrc)
-GST_ELEMENT_REGISTER_DECLARE (gssrc);
+GST_ELEMENT_REGISTER_DECLARE(gssrc);
 
 G_END_DECLS
-#endif // __GST_GS_SRC_H__
+#endif  // __GST_GS_SRC_H__