From 68e55d96eef080935bf250f96389eb64c547a740 Mon Sep 17 00:00:00 2001 From: Jonas Karlman Date: Fri, 29 Dec 2017 18:09:55 +0100 Subject: [PATCH] rkmpp: update to c6594ae --- packages/multimedia/rkmpp/package.mk | 4 ++-- ...ve-available-input-packet-free-slots.patch | 22 ++++++++++--------- ...-32-bit-mmap-issue-on-64-bit-kernels.patch | 2 +- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/packages/multimedia/rkmpp/package.mk b/packages/multimedia/rkmpp/package.mk index 2cee25029c..b53b27fb21 100644 --- a/packages/multimedia/rkmpp/package.mk +++ b/packages/multimedia/rkmpp/package.mk @@ -17,8 +17,8 @@ ################################################################################ PKG_NAME="rkmpp" -PKG_VERSION="1d67fec" -PKG_SHA256="d4e2224547792f548c845e3eb8e1252e7f16edf8f52807f29e60230023b27a88" +PKG_VERSION="c6594ae" +PKG_SHA256="981f7bc04677ff5135cea92e9926d5521ed38b359514d3405dd8f01c9295d147" PKG_ARCH="arm aarch64" PKG_LICENSE="APL" PKG_SITE="https://github.com/rockchip-linux/mpp" diff --git a/packages/multimedia/rkmpp/patches/rkmpp-0001-mpp-retrieve-available-input-packet-free-slots.patch b/packages/multimedia/rkmpp/patches/rkmpp-0001-mpp-retrieve-available-input-packet-free-slots.patch index 8751a4fb70..2dfd10df2c 100644 --- a/packages/multimedia/rkmpp/patches/rkmpp-0001-mpp-retrieve-available-input-packet-free-slots.patch +++ b/packages/multimedia/rkmpp/patches/rkmpp-0001-mpp-retrieve-available-input-packet-free-slots.patch @@ -1,4 +1,4 @@ -From ea45edab94c03bb48fe0cb9af971b9757de8dd3b Mon Sep 17 00:00:00 2001 +From 0d5fc7b20b6997418935b422b3704b1a90ad584b Mon Sep 17 00:00:00 2001 From: LongChair Date: Wed, 26 Apr 2017 11:45:37 +0200 Subject: [PATCH 1/2] [mpp]: retrieve available input packet free slots @@ -15,23 +15,23 @@ Reviewed-by: ayaka Signed-off-by: Randy Li --- inc/rk_mpi_cmd.h | 1 + - mpp/mpp.cpp | 11 ++++++++--- - 2 files changed, 9 insertions(+), 3 deletions(-) + mpp/mpp.cpp | 13 +++++++++---- + 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/inc/rk_mpi_cmd.h b/inc/rk_mpi_cmd.h -index b67b65dd..0eaa328d 100644 +index 3f2c8d71..a9c58563 100644 --- a/inc/rk_mpi_cmd.h +++ b/inc/rk_mpi_cmd.h -@@ -96,6 +96,7 @@ typedef enum { +@@ -97,6 +97,7 @@ typedef enum { MPP_DEC_SET_VC1_EXTRA_DATA, MPP_DEC_SET_OUTPUT_FORMAT, - MPP_DEC_CHANGE_HARD_MODE, + MPP_DEC_SET_DISABLE_ERROR, /* When set it will disable sw/hw error (H.264 / H.265) */ + MPP_DEC_GET_FREE_PACKET_SLOT_COUNT, MPP_DEC_CMD_END, MPP_ENC_CMD_BASE = CMD_MODULE_CODEC | CMD_CTX_ID_ENC, diff --git a/mpp/mpp.cpp b/mpp/mpp.cpp -index ffbd28a7..385f6183 100644 +index 164cd60d..1357d1a0 100644 --- a/mpp/mpp.cpp +++ b/mpp/mpp.cpp @@ -33,6 +33,7 @@ @@ -62,10 +62,12 @@ index ffbd28a7..385f6183 100644 MppPacket pkt; if (MPP_OK != mpp_packet_copy_init(&pkt, packet)) return MPP_NOK; -@@ -746,6 +747,10 @@ MPP_RET Mpp::control_dec(MpiCmd cmd, MppParam param) - case MPP_DEC_SET_OUTPUT_FORMAT: { +@@ -742,7 +743,11 @@ MPP_RET Mpp::control_dec(MpiCmd cmd, MppParam param) + case MPP_DEC_SET_OUTPUT_FORMAT: + case MPP_DEC_SET_DISABLE_ERROR: { ret = mpp_dec_control(mDec, cmd, param); - } break; +- } ++ } break; + case MPP_DEC_GET_FREE_PACKET_SLOT_COUNT: { + *((RK_S32 *)param) = MPP_MAX_INPUT_PACKETS - mPackets->list_size(); + ret = MPP_OK; diff --git a/packages/multimedia/rkmpp/patches/rkmpp-0002-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 index b81209bc76..c200be05ab 100644 --- a/packages/multimedia/rkmpp/patches/rkmpp-0002-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,4 +1,4 @@ -From 263a0e974131ca0806dd93199f092e62fb9f5544 Mon Sep 17 00:00:00 2001 +From ccb2128ace5c069ec1b904cc621bacaf82498929 Mon Sep 17 00:00:00 2001 From: Jakob Unterwurzacher Date: Mon, 29 May 2017 14:08:43 +0200 Subject: [PATCH 2/2] fix 32-bit mmap issue on 64-bit kernels