From 112211ace9a8e97c5b21c92489e267d0989330c1 Mon Sep 17 00:00:00 2001 From: Fabian Orccon Date: Tue, 29 Oct 2024 10:33:22 +0100 Subject: [PATCH] fixup! fixup! fixup! fixup! Add webdownload element --- .../gst-plugins-web/gst-libs/gst/web/gstwebutils.c | 2 +- .../gst-plugins-web/gst-libs/gst/web/gstwebutils.h | 2 +- .../gst-libs/gst/web/gstwebvideoframe.cpp | 2 -- .../gst-plugins-web/gst/web/gstwebdownload.c | 12 ++++++------ 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/gst.wasm/subprojects/gst-plugins-web/gst-libs/gst/web/gstwebutils.c b/gst.wasm/subprojects/gst-plugins-web/gst-libs/gst/web/gstwebutils.c index 64ebc95..1ce1fd4 100644 --- a/gst.wasm/subprojects/gst-plugins-web/gst-libs/gst/web/gstwebutils.c +++ b/gst.wasm/subprojects/gst-plugins-web/gst-libs/gst/web/gstwebutils.c @@ -376,7 +376,7 @@ gst_web_utils_element_set_context ( } GstVideoFormat -gst_web_utils_convert_video_frame_format (const char *vf_format) +gst_web_utils_video_format_from_web_format (const char *vf_format) { GstVideoFormat format = GST_VIDEO_FORMAT_UNKNOWN; diff --git a/gst.wasm/subprojects/gst-plugins-web/gst-libs/gst/web/gstwebutils.h b/gst.wasm/subprojects/gst-plugins-web/gst-libs/gst/web/gstwebutils.h index 47e5375..d2ca42c 100644 --- a/gst.wasm/subprojects/gst-plugins-web/gst-libs/gst/web/gstwebutils.h +++ b/gst.wasm/subprojects/gst-plugins-web/gst-libs/gst/web/gstwebutils.h @@ -38,7 +38,7 @@ gboolean gst_web_utils_element_handle_context_query ( GstElement *element, GstQuery *query, GstWebCanvas *canvas); gboolean gst_web_utils_element_set_context ( GstElement *element, GstContext *context, GstWebCanvas **canvas); -GstVideoFormat gst_web_utils_convert_video_frame_format ( +GstVideoFormat gst_web_utils_video_format_from_web_format ( const char *vf_format); const char *gst_web_utils_convert_video_format (GstVideoFormat format); diff --git a/gst.wasm/subprojects/gst-plugins-web/gst-libs/gst/web/gstwebvideoframe.cpp b/gst.wasm/subprojects/gst-plugins-web/gst-libs/gst/web/gstwebvideoframe.cpp index 45594ad..f893f6f 100644 --- a/gst.wasm/subprojects/gst-plugins-web/gst-libs/gst/web/gstwebvideoframe.cpp +++ b/gst.wasm/subprojects/gst-plugins-web/gst-libs/gst/web/gstwebvideoframe.cpp @@ -165,7 +165,6 @@ gst_web_video_frame_allocator_map_cpu_access (gpointer data) self, cdata->info, cdata->data, cdata->size); } -// #if 0 gboolean gst_web_video_frame_copy_to ( GstWebVideoFrame *self, GstVideoInfo *info, guint8 *data, gsize size) @@ -184,7 +183,6 @@ gst_web_video_frame_copy_to ( return cdata.result; } -// #endif static gpointer gst_web_video_frame_allocator_map_full ( diff --git a/gst.wasm/subprojects/gst-plugins-web/gst/web/gstwebdownload.c b/gst.wasm/subprojects/gst-plugins-web/gst/web/gstwebdownload.c index 4833b67..fa950ab 100644 --- a/gst.wasm/subprojects/gst-plugins-web/gst/web/gstwebdownload.c +++ b/gst.wasm/subprojects/gst-plugins-web/gst/web/gstwebdownload.c @@ -66,12 +66,6 @@ static GstStaticPadTemplate gst_web_download_src_pad_template = GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, GST_PAD_ALWAYS, GST_STATIC_CAPS (DEFAULT_STATIC_CAPS)); -static void -gst_web_download_init (GstWebDownload *self) -{ - gst_base_transform_set_prefer_passthrough (GST_BASE_TRANSFORM (self), TRUE); -} - static GstCaps * gst_web_download_transform_caps (GstBaseTransform *bt, GstPadDirection direction, GstCaps *caps, GstCaps *filter) @@ -165,6 +159,12 @@ gst_web_download_transform ( return GST_FLOW_OK; } +static void +gst_web_download_init (GstWebDownload *self) +{ + gst_base_transform_set_prefer_passthrough (GST_BASE_TRANSFORM (self), TRUE); +} + static void gst_web_download_class_init (GstWebDownloadClass *klass) {