Skip to contentSkip to conversation

gstreamer1: Plugin work

PATCH New aduskett at gmail.com 2 participants 9 messages May 9, 2019 – May 26, 2019

lore
Share & tools
lore
#0 lore raw

cover gstreamer1: Plugin work

From: Adam Duskett <[email protected]>

In this patch series, the following plugins are added:
- gst1-plugins-good/twolame
- gst1-plugins-bad/audiolatency
- gst1-plugins-bad/proxy

There are also two plugins that are currently enabled just by selecting a package, but with no way to explicitly enable or disable them.

These plugins are:
- gst1-plugins-good/jack
- gst1-plugins-bad/bluez

So I added options to enable/disable those as well.

This is the first of a multi-step process to do the following:

1) Clean up gstreamer1 and the plugin packages.
2) Convert gstreamer1 to meson.
3) Fix the order of plugins in the mk and config files to reflect what is in meson_options.txt

Adam Duskett (5):
package/gstreamer1/gst1-plugins-good: Add twolame plugin package/gstreamer1/gst1-plugins-good: Add jack plugin package/gstreamer1/gst1-plugins-bad: add proxy plugin package/gstreamer1/gst1-plugins-bad: add audiolatency plugin package/gstreamer1/gst1-plugins-bad: Add bluez plugin

 package/gstreamer1/gst1-plugins-bad/Config.in | 20 +++++++++++++++++++
 .../gst1-plugins-bad/gst1-plugins-bad.mk      | 14 ++++++++++++-
 .../gstreamer1/gst1-plugins-good/Config.in    | 19 ++++++++++++++++++
 .../gst1-plugins-good/gst1-plugins-good.mk    |  9 ++++++++-
 4 files changed, 60 insertions(+), 2 deletions(-)
Signature · 1 line
2.21.0
#1 lore raw

PATCH 1/5 package/gstreamer1/gst1-plugins-good: Add twolame plugin

From: Adam Duskett <[email protected]>

This plugin was introduced in 1.16.0. It dependends on the twolame package and allows a user to encode MP2s with TwoLAME

---
 package/gstreamer1/gst1-plugins-good/Config.in            | 6 ++++++
 package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk | 7 +++++++
 2 files changed, 13 insertions(+)
package/gstreamer1/gst1-plugins-good/Config.in +6 -0
index 30a4876ee7..3af05ba6b4 100644
@@ -389,6 +389,12 @@ config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_TAGLIB
 comment "taglib needs a toolchain w/ C++, wchar"
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR
 
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_TWOLAME
+	bool "twolame"
+	select BR2_PACKAGE_TWOLAME
+	help
+	  twolame mp2 audio encoder plugin
+
 config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VPX
 	bool "vpx (webm)"
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libvpx
package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk +7 -0
index 4ef128229a..462d5e1307 100644
@@ -429,6 +429,13 @@ else
 GST1_PLUGINS_GOOD_CONF_OPTS += --disable-taglib
 endif
 
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_TWOLAME),y)
+GST1_PLUGINS_GOOD_CONF_OPTS += --enable-twolame
+GST1_PLUGINS_GOOD_DEPENDENCIES += twolame
+else
+GST1_PLUGINS_GOOD_CONF_OPTS += --disable-twolame
+endif
+
 ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VPX),y)
 GST1_PLUGINS_GOOD_CONF_OPTS += --enable-vpx
 GST1_PLUGINS_GOOD_DEPENDENCIES += libvpx
Signature · 1 line
2.21.0
#2 lore raw

PATCH 2/5 package/gstreamer1/gst1-plugins-good: Add jack plugin

In reply to aduskett at gmail.com

From: Adam Duskett <[email protected]>

Currently there is no explicit way to turn the jack plugin on or off. Create a menu entry allowing users to disable or enable the plugin.

---
 package/gstreamer1/gst1-plugins-good/Config.in      | 13 +++++++++++++
 .../gst1-plugins-good/gst1-plugins-good.mk          |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)
package/gstreamer1/gst1-plugins-good/Config.in +13 -0
index 3af05ba6b4..433084fd6b 100644
@@ -345,6 +345,19 @@ config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_GDKPIXBUF
 comment "gdkpixbuf needs a toolchain w/ wchar, threads"
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
 
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_JACK
+	bool "jack"
+	depends on BR2_INSTALL_LIBSTDCPP
+	depends on !BR2_STATIC_LIBS
+	depends on BR2_TOOLCHAIN_HAS_SYNC_4
+	select BR2_PACKAGE_JACK2
+	help
+	  JACK audio source/sink plugin
+
+comment "jack needs a toolchain w/ C++, dynamic library"
+	depends on BR2_TOOLCHAIN_HAS_SYNC_4
+	depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS
+
 config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_PULSE
 	bool "pulseaudio"
 	depends on BR2_TOOLCHAIN_HAS_THREADS # pulseaudio
package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk +1 -1
index 462d5e1307..829d27a2da 100644
@@ -30,7 +30,7 @@ GST1_PLUGINS_GOOD_CONF_OPTS += \
 
 GST1_PLUGINS_GOOD_DEPENDENCIES = gstreamer1 gst1-plugins-base
 
-ifeq ($(BR2_PACKAGE_JACK2),y)
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_JACK),y)
 GST1_PLUGINS_GOOD_CONF_OPTS += --enable-jack
 GST1_PLUGINS_GOOD_DEPENDENCIES += jack2
 else
Signature · 1 line
2.21.0
#3 lore raw

PATCH 3/5 package/gstreamer1/gst1-plugins-bad: add proxy plugin

In reply to aduskett at gmail.com

From: Adam Duskett <[email protected]>

This plugin was introduced in 1.16.0. It is dependencyless and provides proxied inter-pipeline communication.

---
 package/gstreamer1/gst1-plugins-bad/Config.in           | 5 +++++
 package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk | 6 ++++++
 2 files changed, 11 insertions(+)
package/gstreamer1/gst1-plugins-bad/Config.in +5 -0
index e0757e96c9..c53ff66272 100644
@@ -212,6 +212,11 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_PNM
 	help
 	  PNM plugin
 
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_PROXY
+	bool "proxy"
+	help
+	  Proxy plugin
+
 config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RAWPARSE
 	bool "rawparse"
 	help
package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +6 -0
index a66d3e32bf..d6414f9daa 100644
@@ -344,6 +344,12 @@ else
 GST1_PLUGINS_BAD_CONF_OPTS += --disable-pnm
 endif
 
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_PROXY),y)
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-proxy
+else
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-proxy
+endif
+
 ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RAWPARSE),y)
 GST1_PLUGINS_BAD_CONF_OPTS += --enable-rawparse
 else
Signature · 1 line
2.21.0
#4 lore raw

PATCH 4/5 package/gstreamer1/gst1-plugins-bad: add audiolatency plugin

In reply to aduskett at gmail.com

From: Adam Duskett <[email protected]>

This plugin was introduced in 1.16.0. It is dependencyless and provides a way to measure audio latency

---
 package/gstreamer1/gst1-plugins-bad/Config.in           | 5 +++++
 package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk | 6 ++++++
 2 files changed, 11 insertions(+)
package/gstreamer1/gst1-plugins-bad/Config.in +5 -0
index c53ff66272..35d6bddd05 100644
@@ -46,6 +46,11 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUDIOFXBAD
 	help
 	  Audio filters plugin
 
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUDIOLATENCY
+	bool "audiolatency"
+	help
+	  Audio latency plugin
+
 config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUDIOMIXMATRIX
 	bool "audiomixmatrix"
 	help
package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +6 -0
index d6414f9daa..ad1adbc385 100644
@@ -132,6 +132,12 @@ else
 GST1_PLUGINS_BAD_CONF_OPTS += --disable-audiofxbad
 endif
 
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUDIOLATENCY),y)
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-audiolatency
+else
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-audiolatency
+endif
+
 ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUDIOMIXMATRIX),y)
 GST1_PLUGINS_BAD_CONF_OPTS += --enable-audiomixmatrix
 else
Signature · 1 line
2.21.0
#5 lore raw

PATCH 4/4 package/gstreamer1/gst1-plugins-bad: Add bluez plugin

In reply to aduskett at gmail.com

From: Adam Duskett <[email protected]>

Currently there is no explicit way to turn the bluez plugin on or off. Create a menu entry allowing users to disable or enable the plugin.

---
 package/gstreamer1/gst1-plugins-bad/Config.in          | 10 ++++++++++
 .../gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk    |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)
package/gstreamer1/gst1-plugins-bad/Config.in +10 -0
index 35d6bddd05..b0b253bf12 100644
@@ -308,6 +308,16 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ASSRENDER
 	bool "assrender"
 	select BR2_PACKAGE_LIBASS
 
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_BLUEZ
+	bool "bluez"
+	depends on !BR2_STATIC_LIBS
+	select BR2_PACKAGE_BLUEZ_UTILS
+	help
+	  Bluetooth audio A2DP/AVDTP sink, AVDTP source plugin
+
+comment "bluez needs a toolchain w/ dynamic library"
+	depends on BR2_STATIC_LIBS
+
 config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_BZ2
 	bool "bz2"
 	select BR2_PACKAGE_BZIP2
package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +1 -1
index ad1adbc385..32edde4901 100644
@@ -83,7 +83,7 @@ GST1_PLUGINS_BAD_DEPENDENCIES += orc
 GST1_PLUGINS_BAD_CONF_OPTS += --enable-orc
 endif
 
-ifeq ($(BR2_PACKAGE_BLUEZ_UTILS),y)
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_BLUEZ),y)
 GST1_PLUGINS_BAD_DEPENDENCIES += bluez_utils
 GST1_PLUGINS_BAD_CONF_OPTS += --enable-bluez
 else
Signature · 1 line
2.21.0
#6 lore raw

PATCH 5/5 package/gstreamer1/gst1-plugins-bad: Add bluez plugin

In reply to aduskett at gmail.com

From: Adam Duskett <[email protected]>

Currently there is no explicit way to turn the bluez plugin on or off. Create a menu entry allowing users to disable or enable the plugin.

---
 package/gstreamer1/gst1-plugins-bad/Config.in          | 10 ++++++++++
 .../gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk    |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)
package/gstreamer1/gst1-plugins-bad/Config.in +10 -0
index 35d6bddd05..b0b253bf12 100644
@@ -308,6 +308,16 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ASSRENDER
 	bool "assrender"
 	select BR2_PACKAGE_LIBASS
 
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_BLUEZ
+	bool "bluez"
+	depends on !BR2_STATIC_LIBS
+	select BR2_PACKAGE_BLUEZ_UTILS
+	help
+	  Bluetooth audio A2DP/AVDTP sink, AVDTP source plugin
+
+comment "bluez needs a toolchain w/ dynamic library"
+	depends on BR2_STATIC_LIBS
+
 config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_BZ2
 	bool "bz2"
 	select BR2_PACKAGE_BZIP2
package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +1 -1
index ad1adbc385..32edde4901 100644
@@ -83,7 +83,7 @@ GST1_PLUGINS_BAD_DEPENDENCIES += orc
 GST1_PLUGINS_BAD_CONF_OPTS += --enable-orc
 endif
 
-ifeq ($(BR2_PACKAGE_BLUEZ_UTILS),y)
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_BLUEZ),y)
 GST1_PLUGINS_BAD_DEPENDENCIES += bluez_utils
 GST1_PLUGINS_BAD_CONF_OPTS += --enable-bluez
 else
Signature · 1 line
2.21.0
#7 lore raw

PATCH 5/5 package/gstreamer1/gst1-plugins-bad: Add bluez plugin

Hello,

Quoted 16 lines · On Thu, 9 May 2019 18:46:24 -0400 aduskett at gmail.com wrote:

From: Adam Duskett <[email protected]>

Currently there is no explicit way to turn the bluez plugin on or off. Create a menu entry allowing users to disable or enable the plugin.

---
 package/gstreamer1/gst1-plugins-bad/Config.in          | 10 ++++++++++
 .../gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk    |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)
package/gstreamer1/gst1-plugins-bad/Config.in +0 -0
index 35d6bddd05..b0b253bf12 100644

package/gstreamer1/gst1-plugins-bad/Config.in config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ASSRENDER · line 313

Quoted 6 lines
package/gstreamer1/gst1-plugins-bad/Config.in +3 -0
@@ -308,6 +308,16 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ASSRENDER
 	bool "assrender"
 	select BR2_PACKAGE_LIBASS
 
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_BLUEZ
+	bool "bluez"
+	depends on !BR2_STATIC_LIBS

In this case, I think propagating all the dependencies of BR2_PACKAGE_BLUEZ_UTILS is more appropriate. I know they are already handled by the overall gstreamer1 dependencies, but I believe it is not unlikely that the dependencies of gstreamer1 change, and for this reason, replicating the complete bluez_utils dependencies make sense.

I know we don't have a very strict rule about this, so it's really just a feeling for this specific case.

Besides that, bluez_utils is kinda deprecated. What about bluez5_utils support ?

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#8 lore raw

cover gstreamer1: Plugin work

In reply to aduskett at gmail.com

Hello Adam,

Quoted 6 lines · On Thu, 9 May 2019 18:46:18 -0400 aduskett at gmail.com wrote:

Adam Duskett (5):
package/gstreamer1/gst1-plugins-good: Add twolame plugin package/gstreamer1/gst1-plugins-good: Add jack plugin package/gstreamer1/gst1-plugins-bad: add proxy plugin package/gstreamer1/gst1-plugins-bad: add audiolatency plugin package/gstreamer1/gst1-plugins-bad: Add bluez plugin

I've applied to next, with some changes. First, the commit titles are not consistent in terms of lower-case vs. upper-case. You use "add" or "Add". I personally prefer lower-case.

Secondly, the patches are not adding plugins, but adding options, so "add twolame plugin option" is more correct.

I did some other changes to one patch, I'll reply to that one specifically.

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com