From 27d7086809e7c1492078c43d8a83ac58a02e45b3 Mon Sep 17 00:00:00 2001 From: Jonas Karlman Date: Wed, 13 Dec 2017 18:52:02 +0100 Subject: [PATCH] rkmpp: update to 1d67fec --- packages/multimedia/rkmpp/package.mk | 4 +-- ...e-available-input-packet-free-slots.patch} | 8 ++--- .../rkmpp-0001-osal-add-rk3036-platform.patch | 31 ------------------- ...32-bit-mmap-issue-on-64-bit-kernels.patch} | 4 +-- 4 files changed, 8 insertions(+), 39 deletions(-) rename packages/multimedia/rkmpp/patches/{rkmpp-0002-mpp-retrieve-available-input-packet-free-slots.patch => rkmpp-0001-mpp-retrieve-available-input-packet-free-slots.patch} (91%) delete mode 100644 packages/multimedia/rkmpp/patches/rkmpp-0001-osal-add-rk3036-platform.patch rename packages/multimedia/rkmpp/patches/{rkmpp-0003-fix-32-bit-mmap-issue-on-64-bit-kernels.patch => rkmpp-0002-fix-32-bit-mmap-issue-on-64-bit-kernels.patch} (87%) diff --git a/packages/multimedia/rkmpp/package.mk b/packages/multimedia/rkmpp/package.mk index 7d4e935092..2cee25029c 100644 --- a/packages/multimedia/rkmpp/package.mk +++ b/packages/multimedia/rkmpp/package.mk @@ -17,8 +17,8 @@ ################################################################################ PKG_NAME="rkmpp" -PKG_VERSION="90c9f77" -PKG_SHA256="8bd361e506446fa381897547b48800a70f69e3f39e5188929c8dbde44861aa69" +PKG_VERSION="1d67fec" +PKG_SHA256="d4e2224547792f548c845e3eb8e1252e7f16edf8f52807f29e60230023b27a88" PKG_ARCH="arm aarch64" PKG_LICENSE="APL" PKG_SITE="https://github.com/rockchip-linux/mpp" diff --git a/packages/multimedia/rkmpp/patches/rkmpp-0002-mpp-retrieve-available-input-packet-free-slots.patch b/packages/multimedia/rkmpp/patches/rkmpp-0001-mpp-retrieve-available-input-packet-free-slots.patch similarity index 91% rename from packages/multimedia/rkmpp/patches/rkmpp-0002-mpp-retrieve-available-input-packet-free-slots.patch rename to packages/multimedia/rkmpp/patches/rkmpp-0001-mpp-retrieve-available-input-packet-free-slots.patch index 59ce6f33c7..8751a4fb70 100644 --- a/packages/multimedia/rkmpp/patches/rkmpp-0002-mpp-retrieve-available-input-packet-free-slots.patch +++ b/packages/multimedia/rkmpp/patches/rkmpp-0001-mpp-retrieve-available-input-packet-free-slots.patch @@ -1,7 +1,7 @@ -From 7eeac4c01e577ce81ab5b4356691566dcc897a38 Mon Sep 17 00:00:00 2001 +From ea45edab94c03bb48fe0cb9af971b9757de8dd3b Mon Sep 17 00:00:00 2001 From: LongChair Date: Wed, 26 Apr 2017 11:45:37 +0200 -Subject: [PATCH 2/3] [mpp]: retrieve available input packet free slots +Subject: [PATCH 1/2] [mpp]: retrieve available input packet free slots This is something that allows to know before putting a packet into the decoder if it would accept it or if it is full. @@ -31,7 +31,7 @@ index b67b65dd..0eaa328d 100644 MPP_ENC_CMD_BASE = CMD_MODULE_CODEC | CMD_CTX_ID_ENC, diff --git a/mpp/mpp.cpp b/mpp/mpp.cpp -index c77aac12..321ea76d 100644 +index ffbd28a7..385f6183 100644 --- a/mpp/mpp.cpp +++ b/mpp/mpp.cpp @@ -33,6 +33,7 @@ @@ -62,7 +62,7 @@ index c77aac12..321ea76d 100644 MppPacket pkt; if (MPP_OK != mpp_packet_copy_init(&pkt, packet)) return MPP_NOK; -@@ -745,6 +746,10 @@ MPP_RET Mpp::control_dec(MpiCmd cmd, MppParam param) +@@ -746,6 +747,10 @@ MPP_RET Mpp::control_dec(MpiCmd cmd, MppParam param) case MPP_DEC_SET_OUTPUT_FORMAT: { ret = mpp_dec_control(mDec, cmd, param); } break; diff --git a/packages/multimedia/rkmpp/patches/rkmpp-0001-osal-add-rk3036-platform.patch b/packages/multimedia/rkmpp/patches/rkmpp-0001-osal-add-rk3036-platform.patch deleted file mode 100644 index 9d53442730..0000000000 --- a/packages/multimedia/rkmpp/patches/rkmpp-0001-osal-add-rk3036-platform.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 7adc82dade16d0f12f3cbfb3a1163f80e8034966 Mon Sep 17 00:00:00 2001 -From: Randy Li -Date: Wed, 15 Mar 2017 15:14:45 +0800 -Subject: [PATCH 1/3] [osal]: add rk3036 platform - -Change-Id: I82029e8345d3c8e2a9a3baf4be55b7f4c9b284f0 -Signed-off-by: Randy Li ---- - osal/mpp_platform.cpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/osal/mpp_platform.cpp b/osal/mpp_platform.cpp -index 2238eecc..db21d28f 100644 ---- a/osal/mpp_platform.cpp -+++ b/osal/mpp_platform.cpp -@@ -31,6 +31,7 @@ class MppPlatformService; - - typedef enum RockchipSocType_e { - ROCKCHIP_SOC_AUTO, -+ ROCKCHIP_SOC_RK3036, - ROCKCHIP_SOC_RK3066, - ROCKCHIP_SOC_RK3188, - ROCKCHIP_SOC_RK3288, -@@ -52,6 +53,7 @@ typedef struct { - } MppVpuType; - - static const MppVpuType mpp_vpu_version[] = { -+ { "rk3036", ROCKCHIP_SOC_RK3036, HAVE_VPU1 | HAVE_HEVC_DEC, }, - { "rk3066", ROCKCHIP_SOC_RK3066, HAVE_VPU1, }, - { "rk3188", ROCKCHIP_SOC_RK3188, HAVE_VPU1, }, - { "rk3288", ROCKCHIP_SOC_RK3288, HAVE_VPU1 | HAVE_HEVC_DEC, }, diff --git a/packages/multimedia/rkmpp/patches/rkmpp-0003-fix-32-bit-mmap-issue-on-64-bit-kernels.patch b/packages/multimedia/rkmpp/patches/rkmpp-0002-fix-32-bit-mmap-issue-on-64-bit-kernels.patch similarity index 87% rename from packages/multimedia/rkmpp/patches/rkmpp-0003-fix-32-bit-mmap-issue-on-64-bit-kernels.patch rename to packages/multimedia/rkmpp/patches/rkmpp-0002-fix-32-bit-mmap-issue-on-64-bit-kernels.patch index c24a8107ca..b81209bc76 100644 --- a/packages/multimedia/rkmpp/patches/rkmpp-0003-fix-32-bit-mmap-issue-on-64-bit-kernels.patch +++ b/packages/multimedia/rkmpp/patches/rkmpp-0002-fix-32-bit-mmap-issue-on-64-bit-kernels.patch @@ -1,7 +1,7 @@ -From e34511ef9354282ff1edf87391a9ea1a3a321292 Mon Sep 17 00:00:00 2001 +From 263a0e974131ca0806dd93199f092e62fb9f5544 Mon Sep 17 00:00:00 2001 From: Jakob Unterwurzacher Date: Mon, 29 May 2017 14:08:43 +0200 -Subject: [PATCH 3/3] fix 32-bit mmap issue on 64-bit kernels +Subject: [PATCH 2/2] fix 32-bit mmap issue on 64-bit kernels Running 32-bit userland on a 64-bit kernel resulted in the error: