[ACN]: OpenCDM integration

Author: modeveci

board/acn/acn.txt

@@ -4,6 +4,9 @@ WPEDatabaseProcess
 WPEStorageProcess
 WPEFramework
 WPEProcess
+rpcbind
+rpcinfo
+netconfig
 gst-plugin-scanner
 gst-inspect-1.0
 gst-launch-1.0
@@ -32,18 +35,27 @@ libgobject-2.0.so
 libgpg-error.so
 libgraphite2.so
 libgstadaptivedemux-1.0.so
+libgstallocators-1.0.so
 libgstapp-1.0.so
 libgstaudio-1.0.so
+libgstbadaudio-1.0.so
+libgstbadbase-1.0.so
+libgstbadvideo-1.0.so
 libgstbase-1.0.so
+libgstbasecamerabinsrc-1.0.so
 libgstcodecparsers-1.0.so
+libgstcontroller-1.0.so
 libgstfaad.so
 libgstfft-1.0.so
+libgstinsertbin-1.0.so
 libgstpbutils-1.0.so
 libgstmpegts-1.0.so
 libgstnet-1.0.so
+libgstplayer-1.0.so
 libgstreamer-1.0.so
 libgsttag-1.0.so
 libgstriff-1.0.so
+libgstrtsp-1.0.so
 libgstrtp-1.0.so
 libgsturidownloader-1.0.so
 libgstvideo-1.0.so
@@ -65,6 +77,7 @@ liborc-test-0.4.so
 libpcre.so
 libpixman-1.so
 libplayready.so
+libocdm.so
 libpng16.so
 libprovision.so
 librpc.so
@@ -111,6 +124,7 @@ libWPEFrameworkTracing.so
 libWPEFrameworkVirtualInput.so
 libWPEFrameworkTimeSync.so
 libWPEFrameworkWebShell.so
+libWPEFrameworkOpenCDMi.so
 libnxclient.so
 libWPEBackend.so
 libWPEBackend-rdk.so
@@ -123,3 +137,7 @@ libbrcmaudiosink.so
 libbrcmvideodecoder.so
 libbrcmvideosink.so
 libbrcmvidfilter.so
+libgstmatroska.so
+libgstopus.so
+libtirpc.so
+libopus.so

board/acn/wpeframework.sh

@@ -1,7 +1,8 @@
 #!/bin/sh
 
 export SOURCE=/hdd/metrological
-export LD_LIBRARY_PATH=$SOURCE/usr/lib:/lib:/usr/lib:$SOURCE/lib
+#export LD_LIBRARY_PATH=$SOURCE/usr/lib:/lib:/usr/lib:$SOURCE/lib
+export LD_LIBRARY_PATH=$SOURCE/usr/lib:/lib:/usr/lib:$SOURCE/lib:$SOURCE/usr/lib/wpeframework/plugins:$SOURCE/usr/lib/wpeframework/proxystubs
 export PATH=$SOURCE/usr/bin:$PATH
 export GST_PLUGIN_SCANNER=$SOURCE/usr/libexec/gstreamer-1.0/gst-plugin-scanner
 export GST_PLUGIN_SYSTEM_PATH=$SOURCE/usr/lib/gstreamer-1.0
@@ -26,24 +27,37 @@ metrological)
 		mkdir -p $DESTINATION/share
 		mkdir -p $DESTINATION/etc
 		mkdir -p $DESTINATION/lib
+		mkdir -p $DESTINATION/bin
 		cp -rfap /usr/share/* $DESTINATION/share
 		cp -rfap /etc/* $DESTINATION/etc
 		cp -rfap /usr/lib/* $DESTINATION/lib
+		cp -rfap /usr/bin/* $DESTINATION/bin
 
 		ln -s $SOURCE/usr/share/mime $DESTINATION/share/mime
 		ln -s $SOURCE/usr/share/X11 $DESTINATION/share/X11
 		ln -s $SOURCE/usr/share/WPEFramework $DESTINATION/share/WPEFramework
 		ln -s $SOURCE/usr/share/fonts $DESTINATION/share/fonts
 		ln -s $SOURCE/etc/ssl $DESTINATION/etc/ssl
 		ln -s $SOURCE/etc/ssl $DESTINATION/lib/ssl
+		ln -s $SOURCE/etc/netconfig $DESTINATION/etc/netconfig
 		ln -s $SOURCE/etc/fonts $DESTINATION/etc/fonts
 		ln -s $SOURCE/etc/WPEFramework $DESTINATION/etc/WPEFramework
 		ln -s $SOURCE/usr/lib/gio $DESTINATION/lib/gio
 	fi
 	grep -q "/usr/share ext4" /proc/mounts && echo "/usr/share is already mounted" || mount -t ext4 --bind $DESTINATION/share/ /usr/share/
 	grep -q "/etc ext4" /proc/mounts && echo "/etc is already mounted" || mount -t ext4 --bind $DESTINATION/etc/ /etc/
 	grep -q "/usr/lib ext4" /proc/mounts && echo "/usr/lib is already mounted" || mount -t ext4 --bind $DESTINATION/lib/ /usr/lib/
+	grep -q "/usr/bin ext4" /proc/mounts && echo "/usr/bin is already mounted" || mount -t ext4 --bind $DESTINATION/bin /usr/bin/
 
+	#launch rpcbind to create channel between framework and webkit
+	ext=`pidof rpcbind`
+	if [ ! $ext ]; then
+    		echo "Launching rpcbind ..."
+		rpcbind 
+	else
+    		echo "rpcbind is already launched..."
+	fi	
+	
 	#work around for playready
 	cd /usr/bin/netflix
 
@@ -58,6 +72,15 @@ metrological)
 	grep -q "/usr/lib/gio ext4" /proc/mounts &&
 		echo "/usr/lib/gio is already mounted" || mount -t ext4 --bind $SOURCE/usr/lib/gio /usr/lib/gio
 
+	#launch rpcbind to create channel between framework and webkit
+	ext=`pidof rpcbind`
+	if [ ! $ext ]; then
+    		echo "Launching rpcbind ..."
+		rpcbind 
+	else
+    		echo "rpcbind is already launched..."
+	fi	
+
 	cd /usr/bin/netflix	
 	LD_PRELOAD=$SOURCE/lib/libstdc\+\+.so.6.0.21 WPEFramework -c $SOURCE/etc/WPEFramework/config.json 	
 ;;

configs/acn2952_wpe_yt_defconfig

@@ -23,43 +23,46 @@ BR2_PACKAGE_GST1_BCM=y
 BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_APP=y
 BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERT=y
 BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_GIO=y
+BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_OPUS=y
 BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_AUDIOFX=y
 BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_AUDIOPARSERS=y
 BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_AUTODETECT=y
 BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_DEINTERLACE=y
 BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_ICYDEMUX=y
 BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_ID3DEMUX=y
 BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_INTERLEAVE=y
+BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_MATROSKA=y
 BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_SOUPHTTPSRC=y
 BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEGTSDEMUX=y
 BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VIDEOPARSERS=y
 BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DASH=y
 BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FAAD=y
 BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_HLS=y
+BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPUS=y
 BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SMOOTHSTREAMING=y
 BR2_PACKAGE_GST1_PLUGINS_UGLY=y
 BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_MPG123=y
 BR2_PACKAGE_NINJA=y
+BR2_PACKAGE_OPENCDM=y
 BR2_PACKAGE_BITSTREAM_VERA=y
 BR2_PACKAGE_ACN_SDK=y
 BR2_PACKAGE_OPENSSL=y
 BR2_PACKAGE_JPEG_TURBO=y
 BR2_PACKAGE_LIBMNG=y
 BR2_PACKAGE_WEBP=y
 BR2_PACKAGE_WPEFRAMEWORK=y
-BR2_PACKAGE_WPEFRAMEWORK_PORT="8082"
+BR2_PACKAGE_WPEFRAMEWORK_PORT="8081"
 BR2_PACKAGE_WPEFRAMEWORK_PERSISTENT_PATH="/hdd/metrological/persistent"
 BR2_PACKAGE_WPEFRAMEWORK_DATA_PATH="/hdd/metrological/usr/share/WPEFramework"
 BR2_PACKAGE_WPEFRAMEWORK_SYSTEM_PATH="/hdd/metrological/usr/lib/wpeframework/plugins"
 BR2_PACKAGE_WPEFRAMEWORK_PROXYSTUB_PATH="/hdd/metrological/usr/lib/wpeframework/proxystubs"
 BR2_PACKAGE_WPEFRAMEWORK_VIRTUALINPUT=y
 BR2_PACKAGE_WPEFRAMEWORK_DEVICEINFO=y
 BR2_PACKAGE_WPEFRAMEWORK_LOCATIONSYNC=y
-BR2_PACKAGE_WPEFRAMEWORK_LOCATIONSYNC_URI="http://ip-api/json"
 BR2_PACKAGE_WPEFRAMEWORK_MONITOR=y
-BR2_PACKAGE_WPEFRAMEWORK_TIMESYNC=y
 BR2_PACKAGE_WPEFRAMEWORK_REMOTECONTROL=y
 BR2_PACKAGE_WPEFRAMEWORK_SNAPSHOT=y
+BR2_PACKAGE_WPEFRAMEWORK_TIMESYNC=y
 BR2_PACKAGE_WPEFRAMEWORK_TRACECONTROL=y
 BR2_PACKAGE_WPEFRAMEWORK_WEBKITBROWSER=y
 BR2_PACKAGE_WPEFRAMEWORK_WEBKITBROWSER_STARTURL="https://www.youtube.com/tv"

package/opencdm/0001-correct-test-sample.patch

@@ -0,0 +1,17 @@
+diff --git a/src/browser/wpe/test/ocdm_client.cpp b/src/browser/wpe/test/ocdm_client.cpp
+index 32033d6..bb4f5fd 100644
+--- a/src/browser/wpe/test/ocdm_client.cpp
++++ b/src/browser/wpe/test/ocdm_client.cpp
+@@ -151,7 +151,11 @@ int main()
+   unsigned char* puc_lic_response = (unsigned char*)lic_response.c_str();
+   int cb_lic_response = lic_response.length();
+ 
+-  const char test_challenge[3096] = {0xde, 0xad, 0xf0, 0x01};
++  char test_challenge[3096];
++  test_challenge[0] = 0xde;
++  test_challenge[1] = 0xad; 
++  test_challenge[2] = 0xf0;
++  test_challenge[3] = 0x01;
+   int challenge_len = 0;
+   unsigned char test_url[100];
+   int url_length = 0;

package/opencdm/opencdm.mk

@@ -3,7 +3,7 @@
 # cdm
 #
 ################################################################################
-OPENCDM_VERSION = f223f5dd751528fb7e40ac56f3b6aa99eaf04361
+OPENCDM_VERSION = 3d7696803bdafc82010c6619f07b22eb5fded99e
 OPENCDM_SITE_METHOD = git
 OPENCDM_SITE = https://github.com/WebPlatformForEmbedded/WPEOpenCDM.git
 

package/wpe/wpeframework-plugins/Config.in

@@ -110,6 +110,10 @@ menuconfig BR2_PACKAGE_WPEFRAMEWORK_OPENCDMI
 
 if BR2_PACKAGE_WPEFRAMEWORK_OPENCDMI
 
+config BR2_PACKAGE_WPEFRAMEWORK_OPENCDMI_OOP
+    bool "outofprocess"
+    default n
+
 config BR2_PACKAGE_WPEFRAMEWORK_OPENCDMI_CLEARKEY
     bool "clearkey"
     default y

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

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-WPEFRAMEWORK_PLUGINS_VERSION = 897553f1c11bde38094dff3774844f2f29d3bcb2 
+WPEFRAMEWORK_PLUGINS_VERSION = 14a3a81086652431812ebf8ccbcfddcc0b7af8cb
 WPEFRAMEWORK_PLUGINS_SITE_METHOD = git
 WPEFRAMEWORK_PLUGINS_SITE = [email protected]:WebPlatformForEmbedded/WPEFrameworkPlugins.git
 WPEFRAMEWORK_PLUGINS_INSTALL_STAGING = YES
@@ -54,7 +54,11 @@ endif
 ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_OPENCDMI),y)
   WPEFRAMEWORK_PLUGINS_CONF_OPTS += -DWPEFRAMEWORK_PLUGIN_OPENCDMI=ON
   WPEFRAMEWORK_PLUGINS_CONF_OPTS += -DWPEFRAMEWORK_PLUGIN_OPENCDMI_AUTOSTART=true
+ifeq (${BR2_PACKAGE_WPEFRAMEWORK_OPENCDMI_OOP},y)
   WPEFRAMEWORK_PLUGINS_CONF_OPTS += -DWPEFRAMEWORK_PLUGIN_OPENCDMI_OOP=true
+else
+  WPEFRAMEWORK_PLUGINS_CONF_OPTS += -DWPEFRAMEWORK_PLUGIN_OPENCDMI_OOP=false
+endif
   WPEFRAMEWORK_PLUGINS_DEPENDENCIES += rpcbind
   ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_OPENCDMI_CLEARKEY),y)
       WPEFRAMEWORK_PLUGINS_CONF_OPTS += -DPLUGIN_OPENCDMI_CLEARKEY=ON

package/wpe/wpeframework/wpeframework.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-WPEFRAMEWORK_VERSION = 430d766801b6657b5a952eb188fd96e3233770e0 
+WPEFRAMEWORK_VERSION = 8401330a8475ce830825eeff6ee19727b1b0758c
 WPEFRAMEWORK_SITE_METHOD = git
 WPEFRAMEWORK_SITE = [email protected]:WebPlatformForEmbedded/WPEFramework.git
 WPEFRAMEWORK_INSTALL_STAGING = YES