rkmpp: update to 1d67fec

This commit is contained in:
Jonas Karlman 2017-12-13 18:52:02 +01:00
parent 5b78e13a96
commit 27d7086809
4 changed files with 8 additions and 39 deletions

View File

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

View File

@ -1,7 +1,7 @@
From 7eeac4c01e577ce81ab5b4356691566dcc897a38 Mon Sep 17 00:00:00 2001
From ea45edab94c03bb48fe0cb9af971b9757de8dd3b Mon Sep 17 00:00:00 2001
From: LongChair <LongChair@hotmail.com>
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;

View File

@ -1,31 +0,0 @@
From 7adc82dade16d0f12f3cbfb3a1163f80e8034966 Mon Sep 17 00:00:00 2001
From: Randy Li <randy.li@rock-chips.com>
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 <randy.li@rock-chips.com>
---
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, },

View File

@ -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 <jakob.unterwurzacher@theobroma-systems.com>
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: