From dd2eaf55309c0b53839d05e57e4ecf968dced5d1 Mon Sep 17 00:00:00 2001 From: Cristinel Panfir Date: Mon, 16 Dec 2019 15:50:08 +0200 Subject: imx-vpu-hantro: Upgrade version from 1.11.0 to 1.15.0 - [H1]: code refine for error handling to avoid blocking - [H1]: Driver enhancement for suspend/resume - [ION]: Enhance for 32bit compatibility for decoder and encoder - [H264] Handle interlace video correctly - [VC1Dec] Return error to avoid segmentation fault - [H264]: decoder enhancment in h264bsdGetBits() for corrupted clips - [Common]: support for security mode Remove unused patch Signed-off-by: Cristinel Panfir --- ...-i.MX-custom-headers-from-usr-include-imx.patch | 49 ---------------------- .../imx-vpu-hantro/imx-vpu-hantro_1.11.0.bb | 34 --------------- .../imx-vpu-hantro/imx-vpu-hantro_1.15.0.bb | 34 +++++++++++++++ 3 files changed, 34 insertions(+), 83 deletions(-) delete mode 100644 recipes-bsp/imx-vpu-hantro/imx-vpu-hantro/0001-Get-i.MX-custom-headers-from-usr-include-imx.patch delete mode 100644 recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.11.0.bb create mode 100644 recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.15.0.bb diff --git a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro/0001-Get-i.MX-custom-headers-from-usr-include-imx.patch b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro/0001-Get-i.MX-custom-headers-from-usr-include-imx.patch deleted file mode 100644 index a41641dfb..000000000 --- a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro/0001-Get-i.MX-custom-headers-from-usr-include-imx.patch +++ /dev/null @@ -1,49 +0,0 @@ -From a277191d6e7d775b1c081f8b25734f6f962ade14 Mon Sep 17 00:00:00 2001 -From: Tom Hochstein -Date: Thu, 4 Oct 2018 10:34:00 -0500 -Subject: [PATCH] Get i.MX custom headers from /usr/include/imx - -Upstream-Status: Pending - -Signed-off-by: Tom Hochstein ---- - Makefile_G1G2 | 5 ++--- - Makefile_H1 | 3 +-- - 2 files changed, 3 insertions(+), 5 deletions(-) - -diff --git a/Makefile_G1G2 b/Makefile_G1G2 -index caab40f..5b55a8b 100755 ---- a/Makefile_G1G2 -+++ b/Makefile_G1G2 -@@ -6,12 +6,11 @@ SOURCE_ROOT = decoder_sw/software - OMX_ROOT = openmax_il - - INCLUDE_HEADERS = -I./decoder_sw -I$(SOURCE_ROOT)/source/inc -I$(SOURCE_ROOT)/source/hevc \ -- -I$(SOURCE_ROOT)/source/config -I$(SOURCE_ROOT)/source/dwl -I$(SOURCE_ROOT)/source/common -I$(SOURCE_ROOT)/source/vp9 \ -- -I$(SDKTARGETSYSROOT)/usr/imx/include -+ -I$(SOURCE_ROOT)/source/config -I$(SOURCE_ROOT)/source/dwl -I$(SOURCE_ROOT)/source/common -I$(SOURCE_ROOT)/source/vp9 - - INCLUDE_HEADERS += -I$(SOURCE_ROOT)/linux/memalloc - #INCLUDE_HEADERS += -I$(SOURCE_ROOT)/linux/ldriver --INCLUDE_HEADERS += -I$(LINUX_KERNEL_ROOT)/include/uapi -I$(LINUX_KERNEL_ROOT)/include -+INCLUDE_HEADERS += -I$(SDKTARGETSYSROOT)/usr/include/imx - - CFLAGS += -DDEC_MODULE_PATH=\"/dev/mxc_hantro\" -DUSE_FAKE_RFC_TABLE -DFIFO_DATATYPE=void* -DNDEBUG -DDOWN_SCALER \ - -DUSE_EXTERNAL_BUFFER -DUSE_FAST_EC -DUSE_VP9_EC -DGET_FREE_BUFFER_NON_BLOCK \ -diff --git a/Makefile_H1 b/Makefile_H1 -index 9ca1aa9..237f53a 100755 ---- a/Makefile_H1 -+++ b/Makefile_H1 -@@ -17,8 +17,7 @@ ENV += -DMEMALLOC_MODULE_PATH=\\\"/dev/ion\\\" - #ENV += -DSDRAM_LM_BASE=0x00000000 - ENV += -DEWL_NO_HW_TIMEOUT - ENV += -DUSE_ION --ENV += -I$(LINUX_KERNEL_ROOT)/include/uapi -I$(LINUX_KERNEL_ROOT)/include --ENV += -I$(SDKTARGETSYSROOT)/usr/imx/include -+ENV += -I$(SDKTARGETSYSROOT)/usr/include/imx - - LIBENCNAME = libcodec_enc - LIBSENC = -L./ -lhantro_h1 -lpthread --- -2.7.4 - diff --git a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.11.0.bb b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.11.0.bb deleted file mode 100644 index 3aeba4ac7..000000000 --- a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.11.0.bb +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 2017-2018 NXP - -DESCRIPTION = "i.MX Hantro VPU library" -LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://COPYING;md5=80c0478f4339af024519b3723023fe28" - -PROVIDES = "virtual/imxvpu" - -SRC_URI = " \ - ${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true \ -" -SRC_URI[md5sum] = "51b811f9523d03ca87f611ba86594311" -SRC_URI[sha256sum] = "cec620241d303852ddad8601f2025a68abbc1ec26d605103c7e4173749b59e3f" - -inherit fsl-eula-unpack use-imx-headers - -PARALLEL_MAKE="-j 1" - -PLATFORM_mx8mm = "IMX8MM" -PLATFORM_mx8mq = "IMX8MQ" - -do_compile () { - oe_runmake CROSS_COMPILE="${HOST_PREFIX}" \ - SDKTARGETSYSROOT="${STAGING_DIR_TARGET}" \ - PLATFORM="${PLATFORM}" all -} - -do_install () { - oe_runmake DEST_DIR="${D}" PLATFORM="${PLATFORM}" install -} - -FILES_${PN} += "/unit_tests" - -COMPATIBLE_MACHINE = "(mx8m)" diff --git a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.15.0.bb b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.15.0.bb new file mode 100644 index 000000000..407d17f72 --- /dev/null +++ b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.15.0.bb @@ -0,0 +1,34 @@ +# Copyright 2017-2018 NXP + +DESCRIPTION = "i.MX Hantro VPU library" +LICENSE = "Proprietary" +LIC_FILES_CHKSUM = "file://COPYING;md5=6c12031a11b81db21cdfe0be88cac4b3" + +PROVIDES = "virtual/imxvpu" + +SRC_URI = " \ + ${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true \ +" +SRC_URI[md5sum] = "2cb9a95223bee98a5b3d86c89ee36a55" +SRC_URI[sha256sum] = "8d189156d713f12b255f16badd0093aaacd16859aa3191603908de07567485a5" + +inherit fsl-eula-unpack use-imx-headers + +PARALLEL_MAKE="-j 1" + +PLATFORM_mx8mm = "IMX8MM" +PLATFORM_mx8mq = "IMX8MQ" + +do_compile () { + oe_runmake CROSS_COMPILE="${HOST_PREFIX}" \ + SDKTARGETSYSROOT="${STAGING_DIR_TARGET}" \ + PLATFORM="${PLATFORM}" all +} + +do_install () { + oe_runmake DEST_DIR="${D}" PLATFORM="${PLATFORM}" install +} + +FILES_${PN} += "/unit_tests" + +COMPATIBLE_MACHINE = "(mx8m)" -- cgit v1.2.3-54-g00ecf