package/mpp
1
0
Fork 0
mirror of https://github.com/nyanmisaka/mpp.git synced 2025-10-04 16:52:40 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

[hal_jpege]: Fix hardware mismatch error.

Browse Source 
Signed-off-by: xueman.ruan <xueman.ruan@rock-chips.com>
Change-Id: I5f2051cf21711331e9e58ed0a92a2be2c24197a7
This commit is contained in:
xueman.ruan
2022-11-22 14:12:46 +08:00
committed by Herman Chen
parent 8f17049b52
commit 05bf99bec9
2 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
mpp/hal/common/jpeg/hal_jpege_api_v2.c
View File

@@ -49,19 +49,10 @@ static MPP_RET hal_jpege_init(void *hal, MppEncHalCfg *cfg)
mpp_env_get_u32("hal_jpege_debug", &hal_jpege_debug, 0);
if (vcodec_type & HAVE_RKVENC) {
RK_U32 hw_id = mpp_get_client_hw_id(VPU_CLIENT_RKVENC);
switch (hw_id) {
case HWID_VEPU540C : {
api = &hal_jpege_vepu540c;
} break;
default : {
mpp_err("vcodec type %08x can not find JPEG encoder device\n",
vcodec_type);
ret = MPP_NOK;
} break;
}
} else if (HAVE_VEPU2 | HAVE_VEPU2_JPEG) {
if ((vcodec_type & HAVE_RKVENC) &&
(HWID_VEPU540C == mpp_get_client_hw_id(VPU_CLIENT_RKVENC))) {
api = &hal_jpege_vepu540c;
} else if (vcodec_type & (HAVE_VEPU2 | HAVE_VEPU2_JPEG)) {
api = &hal_jpege_vepu2;
} else if (vcodec_type & HAVE_VEPU1) {
api = &hal_jpege_vepu1;

2
osal/mpp_soc.cpp
View File

@@ -63,7 +63,7 @@
#define CAP_CODING_VEPU_LITE (HAVE_AVC|HAVE_MJPEG)
#define CAP_CODING_VEPU22 (HAVE_HEVC)
#define CAP_CODING_VEPU54X (HAVE_AVC|HAVE_HEVC)
#define CAP_CODING_VEPU540C (HAVE_AVC|HAVE_HEVC|HAVE_MJPEG)
#define CAP_CODING_VEPU540C (HAVE_AVC|HAVE_HEVC|HAVE_MJPEG)
static const MppDecHwCap vdpu1 = {
.cap_coding = CAP_CODING_VDPU,