From 106a8d40c33ce0bf927054a7ea4e9c6fe6f341d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Fri, 3 Nov 2023 14:20:07 +0000 Subject: [PATCH] escape url passed to gstreamer Change-Id: I3c93ee34800cc8563370f75ef3ef6f8a9220e6ec Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158894 Tested-by: Jenkins Reviewed-by: Michael Stahl (cherry picked from commit f41dcadf6492a6ffd32696d50f818e44355b9ad9) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159583 erAck: backported to 7.1.8.1 erAck: backported to 6.0.6.1 --- avmedia/source/gstreamer/gstframegrabber.cxx | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/avmedia/source/gstreamer/gstframegrabber.cxx b/avmedia/source/gstreamer/gstframegrabber.cxx index db2f203..a525e9b 100644 --- a/avmedia/source/gstreamer/gstframegrabber.cxx +++ b/avmedia/source/gstreamer/gstframegrabber.cxx @@ -56,18 +56,17 @@ void FrameGrabber::disposePipeline() FrameGrabber::FrameGrabber( const OUString &rURL ) : FrameGrabber_BASE() { - gchar *pPipelineStr; - pPipelineStr = g_strdup_printf( #ifdef AVMEDIA_GST_0_10 + const char pPipelineStr[] = "uridecodebin uri=%s ! ffmpegcolorspace ! videoscale ! appsink " "name=sink caps=\"video/x-raw-rgb,format=RGB,pixel-aspect-ratio=1/1," "bpp=(int)24,depth=(int)24,endianness=(int)4321," - "red_mask=(int)0xff0000, green_mask=(int)0x00ff00, blue_mask=(int)0x0000ff\"", + "red_mask=(int)0xff0000, green_mask=(int)0x00ff00, blue_mask=(int)0x0000ff\""; #else + const char pPipelineStr[] = "uridecodebin uri=%s ! videoconvert ! videoscale ! appsink " - "name=sink caps=\"video/x-raw,format=RGB,pixel-aspect-ratio=1/1\"", + "name=sink caps=\"video/x-raw,format=RGB,pixel-aspect-ratio=1/1\""; #endif - OUStringToOString( rURL, RTL_TEXTENCODING_UTF8 ).getStr() ); GError *pError = nullptr; mpPipeline = gst_parse_launch( pPipelineStr, &pError ); @@ -78,6 +77,12 @@ FrameGrabber::FrameGrabber( const OUString &rURL ) : } if( mpPipeline ) { + + if (GstElement *pUriDecode = gst_bin_get_by_name(GST_BIN(mpPipeline), "source")) + g_object_set(pUriDecode, "uri", OUStringToOString(rURL, RTL_TEXTENCODING_UTF8).getStr(), nullptr); + else + g_warning("Missing 'source' element in gstreamer pipeline"); + // pre-roll switch( gst_element_set_state( mpPipeline, GST_STATE_PAUSED ) ) { case GST_STATE_CHANGE_FAILURE: -- 2.44.0