[AGL] Update template of configs to enable multimedia acceleration

To eanble H/W acceleration of multimedia at agl-demo-platform
running on porter board, template of configurations are updated.

For more detail and how to use this template configurations, see
README.md in meta-agl-demo.

Change-Id: I6ab0ec936ea4572a2ccfd8d7b18141bcbca16ea8
Signed-off-by: Tadao Tanikawa <tanikawa.tadao@jp.panasonic.com>

3 files changed, 149 insertions, 30 deletions

diff --git a/meta-rcar-gen2/conf/bblayers.conf.sample b/meta-rcar-gen2/conf/bblayers.conf.sample
index 042f9f9..51bfa87 100644
--- a/meta-rcar-gen2/conf/bblayers.conf.sample
+++ b/meta-rcar-gen2/conf/bblayers.conf.sample
@@ -12,8 +12,10 @@ BBLAYERS ?= " \
   ##OEROOT##/../meta-agl/meta-ivi-common \
   ##OEROOT##/../meta-agl/meta-agl \
   ##OEROOT##/../meta-openembedded/meta-oe \
+  ##OEROOT##/../meta-openembedded/meta-multimedia \
   ##OEROOT##/../meta-renesas \
   ##OEROOT##/../meta-renesas/meta-rcar-gen2 \
+  ##OEROOT##/../meta-agl-demo \
   "
 BBLAYERS_NON_REMOVABLE ?= " \
   ##OEROOT##/meta \
diff --git a/meta-rcar-gen2/conf/conf-notes.txt b/meta-rcar-gen2/conf/conf-notes.txt
new file mode 100644
index 0000000..2a92d55
--- /dev/null
+++ b/meta-rcar-gen2/conf/conf-notes.txt
@@ -0,0 +1,2 @@
+Common target are:
+    agl-demo-platform
diff --git a/meta-rcar-gen2/conf/local.conf.sample b/meta-rcar-gen2/conf/local.conf.sample
index 3609494..43857ba 100644
--- a/meta-rcar-gen2/conf/local.conf.sample
+++ b/meta-rcar-gen2/conf/local.conf.sample
@@ -1,18 +1,59 @@
-MACHINE_FEATURES_append = " sgx"
-LICENSE_FLAGS_WHITELIST = "commercial"
-MULTI_PROVIDER_WHITELIST += "virtual/libgl virtual/egl virtual/libgles1 virtual/libgles2"
-PREFERRED_PROVIDER_virtual/libgles1 = ""
-PREFERRED_PROVIDER_virtual/libgles2 = "gles-user-module"
-PREFERRED_PROVIDER_virtual/egl = "libegl"
-PREFERRED_PROVIDER_virtual/libgl = ""
-PREFERRED_PROVIDER_virtual/mesa = ""
-PREFERRED_PROVIDER_libgbm = "libgbm"
-PREFERRED_PROVIDER_libgbm-dev = "libgbm"
+DISTRO = "poky-agl"
+MACHINE = "porter"
 
-# Include static library in SDK
-SDKIMAGE_FEATURES_append = " staticdev-pkgs"
+# For running GStreamer on wayland (experimental).
+#
+# Uncoment below if want to use multimedia acceleration on wayland
+#
+#IMAGE_INSTALL_append_porter = " \
+#    gstreamer1.0-plugins-bad-waylandsink \
+#    "
 
-MACHINE = "porter"
+# Additional plugins to test multimedia acceleration (experimental)
+#
+# Uncoment below if want to use multimedia acceleration
+#
+#IMAGE_INSTALL_append_porter = " \
+#    gstreamer1.0-plugins-base-videorate \
+#    gstreamer1.0-plugins-base-videotestsrc \
+#    gstreamer1.0-plugins-base-audiotestsrc \
+#    gstreamer1.0-plugins-base-alsa \
+#    gstreamer1.0-plugins-good-autodetect \
+#    gstreamer1.0-plugins-good-isomp4 \
+#    gstreamer1.0-plugins-good-video4linux2 \
+#    gstreamer1.0-plugins-good-videocrop \
+#    gstreamer1.0-plugins-bad-asfmux \
+#    gstreamer1.0-plugins-bad-fbdevsink \
+#    gstreamer1.0-plugins-bad-faad \
+#    gstreamer1.0-plugins-bad-videoparsersbad \
+#"
+# for graphics acceleration
+#
+# Uncoment below if want to use multimedia acceleration
+#
+#IMAGE_INSTALL_append_porter = " \
+#    libegl libegl-dev libgbm-dev \
+#    gles-kernel-module gles-user-module \
+#    libdrm-tests \
+#    libdrm-kms \
+#    "
+
+# for multimedia acceleration
+#
+# Uncoment below if want to use multimedia acceleration
+#
+#IMAGE_INSTALL_append_porter = " \
+#    packagegroup-rcar-gen2-multimedia \
+#    packagegroup-lcb-oss-codecs \
+#    alsa-utils alsa-tools \
+#"
+
+# TODO: When booting weston, someone try to load 'libgbm_kms.so' then
+# fail to boot. It should be 'libgbm_kms.so.1'.
+# Tentatively, it is to install 'libgbm-dev' pkg.
+IMAGE_INSTALL_append = "libgbm-dev"
+
+LICENSE_FLAGS_WHITELIST = "commercial"
 
 # Define the name of multimedia, dtv, graphic test, multimedia-test for bbmask
 BB_MULTIMEDIA_KERNEL_MODULE = "fdpm-kernel-module|mmngr-kernel-module|\
@@ -24,31 +65,105 @@ BB_MULTIMEDIA_USER_MODULE = "fdpm-user-module|mmngr-user-module|\
 BB_MULTIMEDIA_TEST_MODULE = "fdpm-tp-user-module|mmngr-tp-user-module|\
                              mmngrbuf-tp-user-module|s3ctl-tp-user-module|\
                              vspm-tp-user-module"
-BB_GRAPHIC_TEST_MODULE = "gles-test-module"
-
-BB_GST_PLUGINS = "meta-renesas/common/recipes-multimedia/gstreamer"
-BB_GSTREAMER = "meta-renesas/meta-rcar-gen2/recipes-multimedia/gstreamer"
-
+BB_GST_PLUGINS = "meta-renesas/meta-rcar-gen2/recipes-multimedia/gstreamer"
 MULTIMEDIA_BB = "${BB_MULTIMEDIA_KERNEL_MODULE}|${BB_MULTIMEDIA_USER_MODULE}|\
-                 ${BB_MULTIMEDIA_TEST_MODULE}|${BB_GRAPHIC_TEST_MODULE}|\
-                 ${BB_GST_PLUGINS}|${BB_GSTREAMER}"
+                 ${BB_MULTIMEDIA_TEST_MODULE}|${BB_GST_PLUGINS}"
 
-# Mask all the multimedia modules
-BBMASK = "${MULTIMEDIA_BB}"
+# Enable Multimedia standard pkg
+#MACHINE_FEATURES_append = " multimedia"
 
-# Mask the multimedia kernel modules
-#BBMASK = "${BB_MULTIMEDIA_KERNEL_MODULE}"
+# UnMask the multimedia kernel modules
+#BBMASK .= "|${BB_MULTIMEDIA_KERNEL_MODULE}"
 
-# Mask the multimedia user modules
+# UnMask the multimedia user modules
 #BBMASK .= "|${BB_MULTIMEDIA_USER_MODULE}"
 
+# Include static library in SDK
+SDKIMAGE_FEATURES_append = " staticdev-pkgs"
+
 # Mask the DTV pkgs
-BBMASK .= "|dtv-module|ssp-module|scu-module"
+#MACHINE_FEATURES_append = " dtv"
+BBMASK = "dtv-module|ssp-module|scu-module"
 
-# TODO: When booting weston, someone try to load 'libgbm_kms.so' then
-# fail to boot. It should be 'libgbm_kms.so.1'.
-# Tentatively, it is to install 'libgbm-dev' pkg.
-IMAGE_INSTALL_append = "libgbm-dev"
+# Enable graphic pkgs
+#BBMASK .= "|gles-kernel-module|gles-user-module"
+
+# Mask the multimedia-test
+BBMASK .= "|${BB_MULTIMEDIA_TEST_MODULE}"
+
+# Mask the graphic test
+BBMASK .= "|gles-test-module"
+
+#DISTRO_FEATURES_append = " mm-test"
+#DISTRO_FEATURES_append = " gles-test"
+
+# Enable Gfx Pkgs
+MACHINE_FEATURES_append = " sgx"
+MULTI_PROVIDER_WHITELIST += "virtual/libgl virtual/egl virtual/libgles1 virtual/libgles2"
+
+# for Wayland/Weston
+
+PREFERRED_PROVIDER_virtual/libgles1 = ""
+PREFERRED_PROVIDER_virtual/libgles2 = "gles-user-module"
+PREFERRED_PROVIDER_virtual/egl = "libegl"
+PREFERRED_PROVIDER_virtual/libgl = ""
+PREFERRED_PROVIDER_virtual/mesa = ""
+PREFERRED_PROVIDER_libgbm = "libgbm"
+PREFERRED_PROVIDER_libgbm-dev = "libgbm"
+
+# Setting for u-boot Wayland
+UBOOT_MACHINE = "porter_vin_config"
+
+# Addtional Configurations of Optional OMX modules
+
+# OMX Media Component H263 Decoder Library
+#DISTRO_FEATURES_append = " h263dec_lib"
+# OMX Media Component VC-1 Decoder Library
+#DISTRO_FEATURES_append = " vc1dec_lib"
+# OMX Media Component MPEG-4 Decoder Library
+#DISTRO_FEATURES_append = " mpeg4dec_lib"
+# VCP3 Driver Adapted for Linux MPEG-2 Decoder Library
+#DISTRO_FEATURES_append = " mpeg2dec_lib"
+# DivX Decoder Library for Linux
+#DISTRO_FEATURES_append = " divxdec_lib"
+# Encoder Library for Linux
+DISTRO_FEATURES_append = " h264avcenc_lib"
+
+# Configurations of Optional Audio Decoders
+# ARM 5.1ch aacPlus V2 Decoder for Linux
+#DISTRO_FEATURES_append = " aacp2dec_lib"
+# ARM MP3 Decoder for Linux
+#DISTRO_FEATURES_append = " mp3dec_lib"
+# ARM WMA Decoder for Linux
+#DISTRO_FEATURES_append = " wmadec_lib"
+# ARM 5.1ch Dolby Digital Decoder for Linux
+#DISTRO_FEATURES_append = " ddddec_lib"
+# ARM ALAC Decoder for Linux
+#DISTRO_FEATURES_append = " alacdec_lib"
+# ARM FLAC Decoder for Linux
+#DISTRO_FEATURES_append = " flacdec_lib"
+# ARM AAC-LC Decoder Library Sample for Linux
+#DISTRO_FEATURES_append = " aaclcsdec_lib"
+# ARM AAC Encoder for Linux
+#DISTRO_FEATURES_append = " aacenc_lib"
+
+# Configurations of Optional Audio Middlewares
+# ARM 5.1ch aacPlus V2 Decode Middleware for Linux
+#DISTRO_FEATURES_append = " armaccp2dec_mdw"
+# ARM MP3 Decode Middleware for Linux
+#DISTRO_FEATURES_append = " mp3dec_mdw"
+# ARM WMA Decode Middleware for Linux
+#DISTRO_FEATURES_append = " wmadec_mdw"
+# ARM 5.1ch Dolby Digital Decode Middleware for Linux
+#DISTRO_FEATURES_append = " ddddec_mdw"
+# ARM ALAC Decode Middleware for Linux
+#DISTRO_FEATURES_append = " alacdec_mdw"
+# ARM FLAC Decode Middleware for Linux
+#DISTRO_FEATURES_append = " flacdec_mdw"
+# ARM AAC Decode Middleware Sample for Linux
+#DISTRO_FEATURES_append = " aacsdec_mdw"
+# ARM AAC Encode Middleware for Linux
+#DISTRO_FEATURES_append = " aacenc_mdw"
 
 #
 # This file is your local configuration file and is where all local user settings