Merge pull request #371 from WebPlatformForEmbedded/development/btaudio

Add BluetoothAudioSink configuration

Author: pwielders

board/raspberrypi/post-image.sh

@@ -8,6 +8,17 @@ GENIMAGE_CFG="${BOARD_DIR}/genimage-${BOARD_NAME}.cfg"
 GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp"
 BLUETOOTH=$(eval grep ^BR2_PACKAGE_WPEFRAMEWORK_BLUETOOTH=y ${BR2_CONFIG} | wc -l)
 
+if [ ! "x${BLUETOOTH}" = "x" ]; then
+   if ! grep -qE '^enable_uart=1' "${BINARIES_DIR}/rpi-firmware/config.txt"; then
+      echo "Adding serial console to /dev/ttyS0 to config.txt."
+      sed -i 's/ttyAMA0/ttyS0/g' "${BINARIES_DIR}/rpi-firmware/cmdline.txt"
+      cat << __EOF__ >> "${BINARIES_DIR}/rpi-firmware/config.txt"
+# Fixes rpi3 ttyS0 serial console
+enable_uart=1
+__EOF__
+   fi
+fi
+
 for arg in "$@"
 do
 	case "${arg}" in
@@ -158,14 +169,6 @@ __EOF__
 dtoverlay=pi3-miniuart-bt
 __EOF__
                         fi
-                else
-                        echo "Adding serial console to /dev/ttyS0 to config.txt."
-                        sed -i 's/ttyAMA0/ttyS0/g' "${BINARIES_DIR}/rpi-firmware/cmdline.txt"
-                        cat << __EOF__ >> "${BINARIES_DIR}/rpi-firmware/config.txt"
-# Fixes rpi3 ttyS0 serial console
-enable_uart=1
-__EOF__
-
                 fi
                 ;;
                 --rpi-wifi*)

package/wpe/wpeframework-clientlibraries/wpeframework-clientlibraries.mk

@@ -78,6 +78,13 @@ $(error Missing a gstreamer client implementation, please provide one)
 endif
 endif
 
+ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_BLUETOOTHAUDIOSINK),y)
+WPEFRAMEWORK_CLIENTLIBRARIES_CONF_OPTS += -DBLUETOOTHAUDIOSINK=ON
+ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_BLUETOOTHAUDIOSINK_EXAMPLEPLAYER),y)
+WPEFRAMEWORK_CLIENTLIBRARIES_CONF_OPTS += -DBLUETOOTHAUDIOSINK_EXAMPLEPLAYER=ON
+endif
+endif
+
 ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_DEVICEINFO),y)
 WPEFRAMEWORK_CLIENTLIBRARIES_CONF_OPTS += -DDEVICEINFO=ON
 endif

package/wpe/wpeframework-plugins/Config.in

@@ -22,15 +22,80 @@ config BR2_PACKAGE_WPEFRAMEWORK_BLUETOOTH_PERSISTMAC
     default n
     help
       Maintains the MAC address of the BT adapter after the first startup.
+
+choice BR2_PACKAGE_WPEFRAMEWORK_BLUETOOTH_BAUDRATE
+    prompt "Baud rate"
+    default BR2_PACKAGE_WPEFRAMEWORK_BLUETOOTH_BAUDRATE_NORMAL
+
+config BR2_PACKAGE_WPEFRAMEWORK_BLUETOOTH_BAUDRATE_NORMAL
+    bool "115200"
+
+config BR2_PACKAGE_WPEFRAMEWORK_BLUETOOTH_BAUDRATE_HIGH
+    bool "921600"
+
+endchoice
 endif
 
 config BR2_PACKAGE_WPEFRAMEWORK_BLUETOOTHREMOTECONTROL
-    bool "BLE RemoteControl"
-    depends on BR2_PACKAGE_WPEFRAMEWORK_BLUETOOTH
+    bool "BluetoothRemoteControl"
+    select BR2_PACKAGE_WPEFRAMEWORK_BLUETOOTH
     default n
     help
      A Bluetooth Low Energy HID over GATT remote control
 
+menuconfig BR2_PACKAGE_WPEFRAMEWORK_BLUETOOTHAUDIOSINK
+    bool "BluetoothAudioSink"
+    select BR2_PACKAGE_WPEFRAMEWORK_BLUETOOTH
+    select BR2_PACKAGE_WPEFRAMEWORK_BLUETOOTHAUDIOSINK_CODECSBC
+    default n
+    help
+      Bluetooth audio sink
+
+if BR2_PACKAGE_WPEFRAMEWORK_BLUETOOTHAUDIOSINK
+    menuconfig BR2_PACKAGE_WPEFRAMEWORK_BLUETOOTHAUDIOSINK_SDPSERVICE
+      bool "Enable SDP service"
+      default y
+
+if BR2_PACKAGE_WPEFRAMEWORK_BLUETOOTHAUDIOSINK_SDPSERVICE
+config BR2_PACKAGE_WPEFRAMEWORK_BLUETOOTHAUDIOSINK_SDPSERVICE_NAME
+    string "Name"
+    default "A2DP Audio Source"
+
+config BR2_PACKAGE_WPEFRAMEWORK_BLUETOOTHAUDIOSINK_SDPSERVICE_DESCRIPTION
+    string "Description"
+    default "Thunder BluetoothAudioSink plugin"
+
+config BR2_PACKAGE_WPEFRAMEWORK_BLUETOOTHAUDIOSINK_SDPSERVICE_PROVIDER
+    string "Provider"
+    default "Thunder"
+endif
+
+config BR2_PACKAGE_WPEFRAMEWORK_BLUETOOTHAUDIOSINK_CODECSBC
+    bool "Enable SBC codec"
+    select BR2_PACKAGE_SBC
+    default y
+
+if BR2_PACKAGE_WPEFRAMEWORK_BLUETOOTHAUDIOSINK_CODECSBC
+choice BR2_PACKAGE_WPEFRAMEWORK_BLUETOOTHAUDIOSINK_CODECSBC_PRESET
+    prompt "SBC quality"
+    default BR2_PACKAGE_WPEFRAMEWORK_BLUETOOTHAUDIOSINK_CODECSBC_PRESET_HQ
+
+config BR2_PACKAGE_WPEFRAMEWORK_BLUETOOTHAUDIOSINK_CODECSBC_PRESET_LQ
+    bool "LQ - Low Quality"
+
+config BR2_PACKAGE_WPEFRAMEWORK_BLUETOOTHAUDIOSINK_CODECSBC_PRESET_MQ
+    bool "MQ - Medium Quality"
+
+config BR2_PACKAGE_WPEFRAMEWORK_BLUETOOTHAUDIOSINK_CODECSBC_PRESET_HQ
+    bool "HQ - High Quality"
+
+config BR2_PACKAGE_WPEFRAMEWORK_BLUETOOTHAUDIOSINK_CODECSBC_PRESET_XQ
+    bool "XQ - Extreme Quality"
+endchoice
+endif
+
+endif
+
 menuconfig BR2_PACKAGE_WPEFRAMEWORK_CDMI
     bool "CDMi"
     select BR2_PACKAGE_WPEFRAMEWORK_RDKSERVICES

package/wpe/wpeframework-plugins/wpeframework-plugins.mk

@@ -201,7 +201,14 @@ WPEFRAMEWORK_PLUGINS_CONF_OPTS += -DPLUGIN_NETWORKCONTROL_INTERFACES='$(call qst
 endif
 
 ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_BLUETOOTH),y)
+#Prevent switching bluetooth to ttyS0
+export BLUETOOTH=1
 WPEFRAMEWORK_PLUGINS_CONF_OPTS += -DPLUGIN_BLUETOOTH=ON
+ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_BLUETOOTH_BAUDRATE_HIGH),y)
+WPEFRAMEWORK_PLUGINS_CONF_OPTS += -DPLUGIN_BLUETOOTH_BAUDRATE=921600
+else
+WPEFRAMEWORK_PLUGINS_CONF_OPTS += -DPLUGIN_BLUETOOTH_BAUDRATE=115200
+endif
 WPEFRAMEWORK_PLUGINS_DEPENDENCIES += wpeframework-libraries
 ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_BLUETOOTH_AUTOSTART),y)
 WPEFRAMEWORK_PLUGINS_CONF_OPTS += -DPLUGIN_BLUETOOTH_AUTOSTART=true
@@ -217,6 +224,29 @@ ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_BLUETOOTHREMOTECONTROL),y)
 WPEFRAMEWORK_PLUGINS_CONF_OPTS += -DPLUGIN_BLUETOOTHREMOTECONTROL=ON
 endif
 
+ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_BLUETOOTHAUDIOSINK),y)
+ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_BLUETOOTHAUDIOSINK_CODECSBC), y)
+WPEFRAMEWORK_PLUGINS_CONF_OPTS += -DPLUGIN_BLUETOOTHAUDIOSINK_CODECSBC=ON
+ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_BLUETOOTHAUDIOSINK_CODECSBC_PRESET_LQ),y)
+WPEFRAMEWORK_PLUGINS_CONF_OPTS += -DPLUGIN_BLUETOOTHAUDIOSINK_CODECSBC_PRESET=LQ
+else ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_BLUETOOTHAUDIOSINK_CODECSBC_PRESET_MQ),y)
+WPEFRAMEWORK_PLUGINS_CONF_OPTS += -DPLUGIN_BLUETOOTHAUDIOSINK_CODECSBC_PRESET=MQ
+else ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_BLUETOOTHAUDIOSINK_CODECSBC_PRESET_HQ),y)
+WPEFRAMEWORK_PLUGINS_CONF_OPTS += -DPLUGIN_BLUETOOTHAUDIOSINK_CODECSBC_PRESET=HQ
+else ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_BLUETOOTHAUDIOSINK_CODECSBC_PRESET_XQ),y)
+WPEFRAMEWORK_PLUGINS_CONF_OPTS += -DPLUGIN_BLUETOOTHAUDIOSINK_CODECSBC_PRESET=XQ
+endif
+WPEFRAMEWORK_PLUGINS_DEPENDENCIES += sbc
+endif
+ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_BLUETOOTHAUDIOSINK_SDPSERVICE), y)
+WPEFRAMEWORK_PLUGINS_CONF_OPTS += -DPLUGIN_BLUETOOTHAUDIOSINK_SDPSERVICE=ON
+WPEFRAMEWORK_PLUGINS_CONF_OPTS += -DPLUGIN_BLUETOOTHAUDIOSINK_SDPSERVICE_NAME=${BR2_PACKAGE_WPEFRAMEWORK_BLUETOOTHAUDIOSINK_SDPSERVICE_NAME}
+WPEFRAMEWORK_PLUGINS_CONF_OPTS += -DPLUGIN_BLUETOOTHAUDIOSINK_SDPSERVICE_DESCRIPTION=${BR2_PACKAGE_WPEFRAMEWORK_BLUETOOTHAUDIOSINK_SDPSERVICE_DESCRIPTION}
+WPEFRAMEWORK_PLUGINS_CONF_OPTS += -DPLUGIN_BLUETOOTHAUDIOSINK_SDPSERVICE_PROVIDER=${BR2_PACKAGE_WPEFRAMEWORK_BLUETOOTHAUDIOSINK_SDPSERVICE_PROVIDER}
+endif
+WPEFRAMEWORK_PLUGINS_CONF_OPTS += -DPLUGIN_BLUETOOTHAUDIOSINK=ON
+endif
+
 ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_REMOTECONTROL),y)
 WPEFRAMEWORK_PLUGINS_CONF_OPTS += -DPLUGIN_REMOTECONTROL=ON
 WPEFRAMEWORK_PLUGINS_CONF_OPTS += -DREMOTECONTROL_IMPLEMENTATION_REPOSITORY=https://github.com/WebPlatformForEmbedded/RemoteControl-brcm

package/wpe/wpeframework/Config.in

@@ -145,6 +145,19 @@ config BR2_PACKAGE_WPEFRAMEWORK_COMPOSITORCLIENT
           interaction (Graphics/input). The implementation hides all the compositor specific details.
       allows for relaying keys to plugins
 
+menuconfig BR2_PACKAGE_WPEFRAMEWORK_BLUETOOTHAUDIOSINK
+    select BR2_PACKAGE_WPEFRAMEWORK_CLIENTLIBRARIES
+    bool "BluetoothAudioSink"
+        default n
+    help
+      C-interface towards BluetoothAudioSink plugin for controlling the Bluetooth sink and supplying audio data samples
+
+if BR2_PACKAGE_WPEFRAMEWORK_BLUETOOTHAUDIOSINK
+config BR2_PACKAGE_WPEFRAMEWORK_BLUETOOTHAUDIOSINK_EXAMPLEPLAYER
+    bool "Example .wav player"
+    default y
+endif
+
 config BR2_PACKAGE_WPEFRAMEWORK_GSTREAMERCLIENT
         select BR2_PACKAGE_WPEFRAMEWORK_CLIENTLIBRARIES
         bool "GstreamerClient"