67 lines
2.1 KiB
Diff
67 lines
2.1 KiB
Diff
|
From 28dfdc61904b95c96701cee4082cf9c0569f41bb Mon Sep 17 00:00:00 2001
|
||
|
|
From: Frank Liu <frank.liu@rock-chips.com>
|
||
|
|
Date: Sat, 26 Oct 2019 16:08:15 +0800
|
||
|
|
Subject: [PATCH 12/12] support libion for rv1108 package.
|
||
|
|
|
||
|
|
Signed-off-by: Frank Liu <frank.liu@rock-chips.com>
|
||
|
|
---
|
||
|
|
libavcodec/rkmppdec.c | 9 +++++++++
|
||
|
|
libavcodec/rkmppenc.c | 3 +++
|
||
|
|
2 files changed, 12 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/libavcodec/rkmppdec.c b/libavcodec/rkmppdec.c
|
||
|
|
index e346b20..5e13c7c 100644
|
||
|
|
--- a/libavcodec/rkmppdec.c
|
||
|
|
+++ b/libavcodec/rkmppdec.c
|
||
|
|
@@ -19,7 +19,10 @@
|
||
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||
|
|
*/
|
||
|
|
|
||
|
|
+#ifndef CONFIG_ION
|
||
|
|
#include <drm_fourcc.h>
|
||
|
|
+#endif
|
||
|
|
+
|
||
|
|
#include <pthread.h>
|
||
|
|
#include <rockchip/mpp_buffer.h>
|
||
|
|
#include <rockchip/rk_mpi.h>
|
||
|
|
@@ -78,7 +81,9 @@ static MppCodingType rkmpp_get_codingtype(AVCodecContext *avctx)
|
||
|
|
static uint32_t rkmpp_get_frameformat(MppFrameFormat mppformat)
|
||
|
|
{
|
||
|
|
switch (mppformat) {
|
||
|
|
+#ifndef CONFIG_ION
|
||
|
|
case MPP_FMT_YUV420SP: return DRM_FORMAT_NV12;
|
||
|
|
+#endif
|
||
|
|
#ifdef DRM_FORMAT_NV12_10
|
||
|
|
case MPP_FMT_YUV420SP_10BIT: return DRM_FORMAT_NV12_10;
|
||
|
|
#endif
|
||
|
|
@@ -365,7 +370,11 @@ static int rkmpp_retrieve_frame(AVCodecContext *avctx, AVFrame *frame)
|
||
|
|
|
||
|
|
hwframes = (AVHWFramesContext*)decoder->frames_ref->data;
|
||
|
|
hwframes->format = AV_PIX_FMT_DRM_PRIME;
|
||
|
|
+#ifndef CONFIG_ION
|
||
|
|
hwframes->sw_format = drmformat == DRM_FORMAT_NV12 ? AV_PIX_FMT_NV12 : AV_PIX_FMT_NONE;
|
||
|
|
+#else
|
||
|
|
+ hwframes->sw_format = AV_PIX_FMT_NONE;
|
||
|
|
+#endif
|
||
|
|
hwframes->width = avctx->width;
|
||
|
|
hwframes->height = avctx->height;
|
||
|
|
ret = av_hwframe_ctx_init(decoder->frames_ref);
|
||
|
|
diff --git a/libavcodec/rkmppenc.c b/libavcodec/rkmppenc.c
|
||
|
|
index 0ebb766..e71de66 100644
|
||
|
|
--- a/libavcodec/rkmppenc.c
|
||
|
|
+++ b/libavcodec/rkmppenc.c
|
||
|
|
@@ -19,7 +19,10 @@
|
||
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||
|
|
*/
|
||
|
|
|
||
|
|
+#ifndef CONFIG_ION
|
||
|
|
#include <drm_fourcc.h>
|
||
|
|
+#endif
|
||
|
|
+
|
||
|
|
#include <pthread.h>
|
||
|
|
#include <rockchip/mpp_buffer.h>
|
||
|
|
#include <rockchip/rk_mpi.h>
|
||
|
|
--
|
||
|
|
2.17.1
|
||
|
|
|