summaryrefslogtreecommitdiffstats
path: root/meta-rcar-gen3/include
diff options
context:
space:
mode:
authorDuy Dang <duy.dang.yw@rvc.renesas.com>2019-01-24 11:27:56 +0700
committerThuy Tran <thuy.tran.xh@renesas.com>2019-05-27 15:56:28 +0700
commit2b542e8180fa3167f6e869df699af011984151d4 (patch)
treec86a3bb649b8e6d3f227d63205ccb541b21b54dc /meta-rcar-gen3/include
parentbb89e2aae91459f91fc28c83befd5abd1cbaea2c (diff)
rcar-gen3: omx-module: Improve vp9dec_lib checking function
This commit modifies the vp9dec_lib checking function to disable vp9dec_lib automatically when not building for M3N, E3 and also warns the user to build it on M3 v3.0 only. This also allows to run the checking at the end of recipe parsing, not have to wait until do_patch finished. Change-Id: I6329c223a42d10a041407a349bac77927b5f3614 Signed-off-by: Duy Dang <duy.dang.yw@renesas.com> Signed-off-by: Khang Nguyen <khang.nguyen.xw@renesas.com> Signed-off-by: Takamitsu Honda <takamitsu.honda.pv@renesas.com> (cherry picked from commit 20fcc94a8d05eda80250f27e87aaa3cfc3275300)
Diffstat (limited to 'meta-rcar-gen3/include')
-rw-r--r--meta-rcar-gen3/include/omx-control.inc11
1 files changed, 7 insertions, 4 deletions
diff --git a/meta-rcar-gen3/include/omx-control.inc b/meta-rcar-gen3/include/omx-control.inc
index 7723693..69093e8 100644
--- a/meta-rcar-gen3/include/omx-control.inc
+++ b/meta-rcar-gen3/include/omx-control.inc
@@ -78,17 +78,20 @@ USE_VP8E_OMX = "${@'1' if 'vp8enc_lib' in '${DISTRO_FEATURES}' else '0'}"
USE_VP9D_OMX = "${@'1' if 'vp9dec_lib' in '${DISTRO_FEATURES}' else '0'}"
# This function is to make sure vp9dec_lib only build with M3N or E3
-python do_vp9_checking() {
+# and warns user to build vp9dec_lib for M3 v3.0 only
+python () {
soc = d.getVar('SOC_FAMILY')
soc = soc.split(':')[1]
use_vp9d = d.getVar('USE_VP9D_OMX')
if use_vp9d == "1":
if soc != 'r8a77965' and soc != 'r8a77990':
- bb.fatal("vp9dec_lib only supports M3N (SoC: r8a77965), E3 (SoC: r8a77990), please disable this feature in your local configuration")
+ if soc == 'r8a7796':
+ bb.warn("vp9dec_lib supports M3 v3.0 only, it does not work on other M3 versions.")
+ else:
+ bb.warn("vp9dec_lib only supports M3N (SoC: r8a77965), E3 (SoC: r8a77990), M3 v3.0 (SoC: r8a7796). Disabling.")
+ d.setVar('USE_VP9D_OMX', '0')
}
-addtask vp9_checking before do_configure after do_patch
-
# OMX Video Decoder Flag list
LIST_OMX_VIDEO_DEC_FLAG = " \
${USE_H263D_OMX} \