meta-intel: add va-impl-intel MACHINE_FEATURE

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>
This commit is contained in:
Tom Zanussi 2012-07-19 14:19:52 -05:00
parent 1ef6cd26ca
commit 756571750b
2 changed files with 25 additions and 7 deletions

View File

@ -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 \
"

View File

@ -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 \