From 79286ece8624ab016575a5ad8965a61b334ab169 Mon Sep 17 00:00:00 2001
From: Francois Buergisser <fbuergisser@chromium.org>
Date: Fri, 2 Aug 2019 16:44:32 +0900
Subject: [PATCH] Rockchip: Add Hantro support in encoder plugin.
Rockchip driver has been renamed to Hantro from kernel v4.19.
This patch adds Hantro driver check in order for the plugin to also
support Hantro.
BUG=chromium:965378
TEST=Checked encoder plugin is used on Hantro and v4.19 using VP8
encoder unittest
Change-Id: I5a45717c073f09959cd27ff2ca5debdcff83d8d4
Signed-off-by: Francois Buergisser <fbuergisser@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1732619
Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com>
Legacy-Commit-Queue: Commit Bot <commit-bot@chromium.org>
Reviewed-by: Tomasz Figa <tfiga@chromium.org>
---
libv4l-rockchip/libv4l-encplugin-rockchip.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/libv4l-rockchip/libv4l-encplugin-rockchip.c b/libv4l-rockchip/libv4l-encplugin-rockchip.c
index bbf573b..7edda58 100644
--- a/libv4l-rockchip/libv4l-encplugin-rockchip.c
+++ b/libv4l-rockchip/libv4l-encplugin-rockchip.c
@@ -45,6 +45,7 @@
#endif
#define RK3288_VPU_NAME "rk3288-vpu-enc"
+#define HANTRO_VPU_NAME "hantro-vpu"
#define DEFAULT_FRAME_RATE 30
#define DEFAULT_BITRATE 1000000
#define PENDING_BUFFER_QUEUE_SIZE VIDEO_MAX_FRAME
@@ -524,7 +525,9 @@ bool is_rockchip_encoder(int fd) {
int ret = SYS_IOCTL(fd, VIDIOC_QUERYCAP, &cap);
if (ret)
return false;
- return strcmp(RK3288_VPU_NAME, (const char *)cap.driver) == 0;
+
+ return strcmp(RK3288_VPU_NAME, (const char *)cap.driver) == 0 ||
+ strcmp(HANTRO_VPU_NAME, (const char *)cap.driver) == 0;
}
int set_encoder_config_locked(struct encoder_context *ctx, int fd,
--
GitLab