* [PATCH 1/2] meta-intel: add va-impl-intel MACHINE_FEATURE
2012-08-30 21:37 [PATCH 0/2] meta-intel: refactor VAAPI_IMPL tom.zanussi
@ 2012-08-30 21:38 ` tom.zanussi
2012-08-30 21:38 ` [PATCH 2/2] meta-intel: use " tom.zanussi
1 sibling, 0 replies; 3+ messages in thread
From: tom.zanussi @ 2012-08-30 21:38 UTC (permalink / raw)
To: yocto
From: Tom Zanussi <tom.zanussi@intel.com>
Add a new va-impl-intel MACHINE_FEATURE to explicitly choose intel
video acceleration, rather than have it as the fallthrough default, so
that anything that wants to specify something different locally
doesn't get unwanted components.
Also rename the gst-va-mixvideo feature to va-impl-mixvideo match and
since it isn't only concerned with gst.
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
.../recipes-multimedia/gstreamer/gst-va-intel.bb | 16 +++++++++++++---
common/recipes-multimedia/libva/va-intel.bb | 16 ++++++++++++----
2 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/common/recipes-multimedia/gstreamer/gst-va-intel.bb b/common/recipes-multimedia/gstreamer/gst-va-intel.bb
index 17cb7c8..516e5f1 100644
--- a/common/recipes-multimedia/gstreamer/gst-va-intel.bb
+++ b/common/recipes-multimedia/gstreamer/gst-va-intel.bb
@@ -4,10 +4,16 @@ DEPENDS = "gst-meta-base"
LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-PR = "r0"
+PR = "r1"
-VAAPI_IMPL = "${@base_contains('MACHINE_FEATURES', 'gst-va-mixvideo', 'gst-va-mixvideo-vaapi', \
- 'gst-va-intel-vaapi', d)}"
+def map_gst_vaapi(d):
+ if base_contains('MACHINE_FEATURES', 'va-impl-mixvideo', "1", "0", d) == "1":
+ return "gst-va-mixvideo-vaapi"
+ if base_contains('MACHINE_FEATURES', 'va-impl-intel', "1", "0", d) == "1":
+ return "gst-va-intel-vaapi"
+ return ""
+
+VAAPI_IMPL = "${@map_gst_vaapi(d)}"
PACKAGES = "\
gst-va-intel \
@@ -32,10 +38,14 @@ RDEPENDS_gst-va-intel-video = "\
gst-plugins-good-isomp4 \
"
+# The gstreamer-vaapi package contains the vaapi implementation
+#
RDEPENDS_gst-va-intel-vaapi = "\
gstreamer-vaapi \
"
+# The emgd driver contains the vaapi implementation
+#
RDEPENDS_gst-va-mixvideo-vaapi = "\
emgd-driver-bin \
"
diff --git a/common/recipes-multimedia/libva/va-intel.bb b/common/recipes-multimedia/libva/va-intel.bb
index fc4a28e..ce642fe 100644
--- a/common/recipes-multimedia/libva/va-intel.bb
+++ b/common/recipes-multimedia/libva/va-intel.bb
@@ -3,11 +3,19 @@ LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-PR = "r0"
+PR = "r1"
-VA_IMPL = "${@base_contains('MACHINE_FEATURES', 'gst-va-mixvideo', \
- 'libva libva-x11 libva-tpi libva-glx libva-egl', \
- 'libva libva-intel-driver', d)}"
+def map_valibs(d):
+ # The emgd mixvideo implementation requires libva-x11/tpi/glx/egl
+ if base_contains('MACHINE_FEATURES', 'va-impl-mixvideo', "1", "0", d) == "1":
+ return "libva libva-x11 libva-tpi libva-glx libva-egl"
+ # The intel implementation requires the libva-intel-driver package
+ if base_contains('MACHINE_FEATURES', 'va-impl-intel', "1", "0", d) == "1":
+ return "libva libva-intel-driver"
+ # All meta-intel video acceleration requires libva
+ return "libva"
+
+VA_IMPL = "${@map_valibs(d)}"
PACKAGES = "\
va-intel \
--
1.7.4.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* [PATCH 2/2] meta-intel: use va-impl-intel MACHINE_FEATURE
2012-08-30 21:37 [PATCH 0/2] meta-intel: refactor VAAPI_IMPL tom.zanussi
2012-08-30 21:38 ` [PATCH 1/2] meta-intel: add va-impl-intel MACHINE_FEATURE tom.zanussi
@ 2012-08-30 21:38 ` tom.zanussi
1 sibling, 0 replies; 3+ messages in thread
From: tom.zanussi @ 2012-08-30 21:38 UTC (permalink / raw)
To: yocto
From: Tom Zanussi <tom.zanussi@intel.com>
Explicitly specify the va-impl-intel MACHINE_FEATURE, and update the
mixvideo uses with the feature rename.
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
meta-chiefriver/conf/machine/chiefriver.conf | 1 +
meta-crownbay/conf/machine/crownbay.conf | 2 +-
meta-fri2/conf/machine/fri2.conf | 2 +-
meta-sugarbay/conf/machine/sugarbay.conf | 2 ++
4 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/meta-chiefriver/conf/machine/chiefriver.conf b/meta-chiefriver/conf/machine/chiefriver.conf
index b644119..6d8d3a5 100644
--- a/meta-chiefriver/conf/machine/chiefriver.conf
+++ b/meta-chiefriver/conf/machine/chiefriver.conf
@@ -5,6 +5,7 @@
# i.e. Ivy Bridge + Panther Point
PREFERRED_VERSION_linux-yocto ?= "3.4%"
+MACHINE_FEATURES += "va-impl-intel"
require conf/machine/include/tune-x86_64.inc
require conf/machine/include/ia32-base.inc
diff --git a/meta-crownbay/conf/machine/crownbay.conf b/meta-crownbay/conf/machine/crownbay.conf
index dba735a..c4b7682 100644
--- a/meta-crownbay/conf/machine/crownbay.conf
+++ b/meta-crownbay/conf/machine/crownbay.conf
@@ -10,7 +10,7 @@ require conf/machine/include/tune-atom.inc
require conf/machine/include/ia32-base.inc
require conf/machine/include/meta-intel.inc
-MACHINE_FEATURES += "gst-va-mixvideo"
+MACHINE_FEATURES += "va-impl-mixvideo"
XSERVER ?= "${XSERVER_IA32_BASE} \
${XSERVER_IA32_EXT} \
diff --git a/meta-fri2/conf/machine/fri2.conf b/meta-fri2/conf/machine/fri2.conf
index a928f0f..56408f7 100644
--- a/meta-fri2/conf/machine/fri2.conf
+++ b/meta-fri2/conf/machine/fri2.conf
@@ -10,7 +10,7 @@ require conf/machine/include/meta-intel.inc
VA_FEATURES ?= "gst-va-intel va-intel"
-MACHINE_FEATURES += "wifi 3g pcbios efi gst-va-mixvideo"
+MACHINE_FEATURES += "wifi 3g pcbios efi va-impl-mixvideo"
MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-iwlwifi-6000g2a-5 ${VA_FEATURES}"
PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
diff --git a/meta-sugarbay/conf/machine/sugarbay.conf b/meta-sugarbay/conf/machine/sugarbay.conf
index a80c938..616c2c5 100644
--- a/meta-sugarbay/conf/machine/sugarbay.conf
+++ b/meta-sugarbay/conf/machine/sugarbay.conf
@@ -4,6 +4,8 @@
#@DESCRIPTION: Machine configuration for Sugar Bay systems
# i.e. Sandy Bridge + Cougar Point
+MACHINE_FEATURES += "va-impl-intel"
+
PREFERRED_VERSION_linux-yocto ?= "3.4%"
require conf/machine/include/tune-x86_64.inc
--
1.7.4.1
^ permalink raw reply related [flat|nested] 3+ messages in thread