mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-27 16:36:39 +00:00
Code Issues 1 Projects Releases Wiki Activity

gs: Fix indentation and make it consistent

Browse source 
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>
This commit is contained in:
Sebastian Dröge 2021-09-27 14:56:21 +03:00 committed by GStreamer Marge Bot
parent 6d4d4edfcc
commit c514f939c9
7 changed files with 68 additions and 77 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
subprojects/gst-plugins-bad/ext/gs/gstgs.cpp
View file

@ -34,20 +34,21 @@
#include "gstgssink.h" #include "gstgssink.h"
#include "gstgssrc.h" #include "gstgssrc.h"
static gboolean static gboolean plugin_init(GstPlugin* plugin) {
plugin_init (GstPlugin * plugin)
{
gboolean ret = FALSE; gboolean ret = FALSE;
ret |= GST_ELEMENT_REGISTER (gssrc, plugin); ret |= GST_ELEMENT_REGISTER(gssrc, plugin);
ret |= GST_ELEMENT_REGISTER (gssink, plugin); ret |= GST_ELEMENT_REGISTER(gssink, plugin);
return ret; return ret;
} }
GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, GST_PLUGIN_DEFINE(GST_VERSION_MAJOR,
GST_VERSION_MINOR, GST_VERSION_MINOR,
gs, gs,
"Read and write from and to a Google Cloud Storage", "Read and write from and to a Google Cloud Storage",
plugin_init, plugin_init,
PACKAGE_VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) PACKAGE_VERSION,
GST_LICENSE,
GST_PACKAGE_NAME,
GST_PACKAGE_ORIGIN)

108
subprojects/gst-plugins-bad/ext/gs/gstgscommon.cpp
View file

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

2
subprojects/gst-plugins-bad/ext/gs/gstgscommon.h
View file

@ -36,4 +36,4 @@ gboolean gst_gs_get_buffer_date(GstBuffer* buffer,
GDateTime* start_date, GDateTime* start_date,
gchar** buffer_date_str_ptr); gchar** buffer_date_str_ptr);
#endif // __GST_GS_COMMON_H__ #endif // __GST_GS_COMMON_H__

2
subprojects/gst-plugins-bad/ext/gs/gstgssink.cpp
View file

@ -168,7 +168,7 @@ static GType gst_gs_sink_next_get_type(void) {
#define gst_gs_sink_parent_class parent_class #define gst_gs_sink_parent_class parent_class
G_DEFINE_TYPE(GstGsSink, gst_gs_sink, GST_TYPE_BASE_SINK); 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 { class GSWriteStream {
public: public:

4
subprojects/gst-plugins-bad/ext/gs/gstgssink.h
View file

@ -43,7 +43,7 @@ typedef enum {
GST_GS_SINK_NEXT_NONE, GST_GS_SINK_NEXT_NONE,
} GstGsSinkNext; } GstGsSinkNext;
GST_ELEMENT_REGISTER_DECLARE (gssink); GST_ELEMENT_REGISTER_DECLARE(gssink);
G_END_DECLS G_END_DECLS
#endif // __GST_GS_SINK_H__ #endif // __GST_GS_SINK_H__

2
subprojects/gst-plugins-bad/ext/gs/gstgssrc.cpp
View file

@ -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"); GST_DEBUG_CATEGORY_INIT(gst_gs_src_debug, "gssrc", 0, "gssrc element");
#define gst_gs_src_parent_class parent_class #define gst_gs_src_parent_class parent_class
G_DEFINE_TYPE_WITH_CODE(GstGsSrc, gst_gs_src, GST_TYPE_BASE_SRC, _do_init); 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; namespace gcs = google::cloud::storage;

4
subprojects/gst-plugins-bad/ext/gs/gstgssrc.h
View file

@ -29,7 +29,7 @@ G_BEGIN_DECLS
#define GST_TYPE_GS_SRC (gst_gs_src_get_type()) #define GST_TYPE_GS_SRC (gst_gs_src_get_type())
G_DECLARE_FINAL_TYPE(GstGsSrc, gst_gs_src, GST, GS_SRC, GstBaseSrc) 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 G_END_DECLS
#endif // __GST_GS_SRC_H__ #endif // __GST_GS_SRC_H__