From: Loic Le Page Date: Wed, 26 Jan 2022 20:06:45 +0000 (+0100) Subject: Add build files and fix build for gst-plugins-bad dshowsinkwrapper plugin X-Git-Tag: 1.22.0~2404 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e1c0628bb9dff6f120afeb6febc21072226cd708;p=platform%2Fupstream%2Fgstreamer.git Add build files and fix build for gst-plugins-bad dshowsinkwrapper plugin dshowsinkwrapper plugin is the old dshowvideosink plugin that has been renamed to be compliant with the actuel plugin name in the source code. Part-of: --- diff --git a/subprojects/gst-plugins-bad/sys/directshow/dshowvideosink/dshowvideofakesrc.cpp b/subprojects/gst-plugins-bad/sys/directshow/dshowsinkwrapper/dshowvideofakesrc.cpp similarity index 100% rename from subprojects/gst-plugins-bad/sys/directshow/dshowvideosink/dshowvideofakesrc.cpp rename to subprojects/gst-plugins-bad/sys/directshow/dshowsinkwrapper/dshowvideofakesrc.cpp diff --git a/subprojects/gst-plugins-bad/sys/directshow/dshowvideosink/dshowvideofakesrc.h b/subprojects/gst-plugins-bad/sys/directshow/dshowsinkwrapper/dshowvideofakesrc.h similarity index 100% rename from subprojects/gst-plugins-bad/sys/directshow/dshowvideosink/dshowvideofakesrc.h rename to subprojects/gst-plugins-bad/sys/directshow/dshowsinkwrapper/dshowvideofakesrc.h diff --git a/subprojects/gst-plugins-bad/sys/directshow/dshowvideosink/dshowvideosink.cpp b/subprojects/gst-plugins-bad/sys/directshow/dshowsinkwrapper/dshowvideosink.cpp similarity index 99% rename from subprojects/gst-plugins-bad/sys/directshow/dshowvideosink/dshowvideosink.cpp rename to subprojects/gst-plugins-bad/sys/directshow/dshowsinkwrapper/dshowvideosink.cpp index f6e2d00..55664c1 100644 --- a/subprojects/gst-plugins-bad/sys/directshow/dshowvideosink/dshowvideosink.cpp +++ b/subprojects/gst-plugins-bad/sys/directshow/dshowsinkwrapper/dshowvideosink.cpp @@ -973,6 +973,8 @@ gst_dshowvideosink_change_state (GstElement * element, GstStateChange transition return ret; sink->graph_running = TRUE; break; + default: + break; } ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition); @@ -997,6 +999,8 @@ gst_dshowvideosink_change_state (GstElement * element, GstStateChange transition case GST_STATE_CHANGE_READY_TO_NULL: gst_dshowvideosink_clear (sink); break; + default: + break; } return ret; diff --git a/subprojects/gst-plugins-bad/sys/directshow/dshowvideosink/dshowvideosink.h b/subprojects/gst-plugins-bad/sys/directshow/dshowsinkwrapper/dshowvideosink.h similarity index 100% rename from subprojects/gst-plugins-bad/sys/directshow/dshowvideosink/dshowvideosink.h rename to subprojects/gst-plugins-bad/sys/directshow/dshowsinkwrapper/dshowvideosink.h diff --git a/subprojects/gst-plugins-bad/sys/directshow/dshowsinkwrapper/meson.build b/subprojects/gst-plugins-bad/sys/directshow/dshowsinkwrapper/meson.build new file mode 100644 index 0000000..37e14a6 --- /dev/null +++ b/subprojects/gst-plugins-bad/sys/directshow/dshowsinkwrapper/meson.build @@ -0,0 +1,38 @@ +dshowsinkwrapper_sources = [ + 'dshowvideofakesrc.cpp', + 'dshowvideosink.cpp' +] + +if not strmbase_dep.found() + message('strmbase not found, not building dshowsinkwrapper') + subdir_done() +endif + +winmm_dep = cxx.find_library('winmm', required: get_option('directshow')) +if not winmm_dep.found() + message('winmm not found, not building dshowsinkwrapper') + subdir_done() +endif + +mfuuid_dep = cxx.find_library('mfuuid', required: get_option('directshow')) +if not mfuuid_dep.found() + message('mfuuid not found, not building dshowsinkwrapper') + subdir_done() +endif + +gstdshowsinkwrapper = library('gstdshowsinkwrapper', + dshowsinkwrapper_sources, + cpp_args : gst_plugins_bad_args, + include_directories : [configinc], + dependencies : [ + gstvideo_dep, + strmbase_dep, + winmm_dep, + mfuuid_dep + ], + install : true, + install_dir : plugins_install_dir, + override_options : ['cpp_std=none']) + +pkgconfig.generate(gstdshowsinkwrapper, install_dir : plugins_pkgconfig_install_dir) +plugins += [gstdshowsinkwrapper] diff --git a/subprojects/gst-plugins-bad/sys/directshow/dshowvideosink/README b/subprojects/gst-plugins-bad/sys/directshow/dshowvideosink/README deleted file mode 100644 index af296dc..0000000 --- a/subprojects/gst-plugins-bad/sys/directshow/dshowvideosink/README +++ /dev/null @@ -1,5 +0,0 @@ -To build this, you'll require the DirectShow base classes. These are supplied -in the Windows SDK, but under Samples\Multimedia\DirectShow\BaseClasses - -Once you've built that, you should be able to figure out the rest... - diff --git a/subprojects/gst-plugins-bad/sys/directshow/meson.build b/subprojects/gst-plugins-bad/sys/directshow/meson.build index b06f112..c043544 100644 --- a/subprojects/gst-plugins-bad/sys/directshow/meson.build +++ b/subprojects/gst-plugins-bad/sys/directshow/meson.build @@ -23,4 +23,4 @@ endif subdir('strmbase') subdir('dshowdecwrapper') subdir('dshowsrcwrapper') -#subdir('dshowvideosink') +subdir('dshowsinkwrapper')