Skip to content
Snippets Groups Projects
Commit 79286ece authored by Francois Buergisser's avatar Francois Buergisser Committed by chrome-bot
Browse files

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: default avatarFrancois 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: default avatarTomasz Figa <tfiga@chromium.org>
parent e840408d
No related branches found
No related tags found
No related merge requests found
...@@ -45,6 +45,7 @@ ...@@ -45,6 +45,7 @@
#endif #endif
#define RK3288_VPU_NAME "rk3288-vpu-enc" #define RK3288_VPU_NAME "rk3288-vpu-enc"
#define HANTRO_VPU_NAME "hantro-vpu"
#define DEFAULT_FRAME_RATE 30 #define DEFAULT_FRAME_RATE 30
#define DEFAULT_BITRATE 1000000 #define DEFAULT_BITRATE 1000000
#define PENDING_BUFFER_QUEUE_SIZE VIDEO_MAX_FRAME #define PENDING_BUFFER_QUEUE_SIZE VIDEO_MAX_FRAME
...@@ -524,7 +525,9 @@ bool is_rockchip_encoder(int fd) { ...@@ -524,7 +525,9 @@ bool is_rockchip_encoder(int fd) {
int ret = SYS_IOCTL(fd, VIDIOC_QUERYCAP, &cap); int ret = SYS_IOCTL(fd, VIDIOC_QUERYCAP, &cap);
if (ret) if (ret)
return false; 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, int set_encoder_config_locked(struct encoder_context *ctx, int fd,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment