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

fix[osal]: rv1109/rv1126 vcodec_type mismatch problem

Browse Source 
RV1126/RV1109 JPEG decoder has no PP. This will be conflict with
vcodec_type queried from kernel. Also VPU_CLIENT_VEPU2_JPEG is defined
and used only for multi-core JPEG encoder at kernel. So the following
changes is made to fix this problem:

1. This reverts commit 9b860cd250.
2. Define a new MppDecHwCap to distinguish normal VPU with only JPEG
   supported from multi-core JPEG encoder.
3. Correct vcodec_type queried from kernel when there is no PP for
   VDPU2.

Change-Id: I58a1abe708721f725a9cf487e8f870dd5820844f
Signed-off-by: Johnson Ding <johnson.ding@rock-chips.com>
This commit is contained in:
Johnson Ding
2024-05-16 09:12:11 +08:00
parent 56449b26f1
commit 45f2fcbcf0
3 changed files with 49 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
osal/mpp_soc.cpp
View File

@@ -528,7 +528,7 @@ static const MppEncHwCap vepu2_no_jpeg = {
static const MppEncHwCap vepu2_jpeg = {
.cap_coding = HAVE_MJPEG,
.type = VPU_CLIENT_VEPU2_JPEG,
.type = VPU_CLIENT_VEPU2,
.cap_fbc = 0,
.cap_4k = 0,
.cap_8k = 0,
@@ -537,6 +537,17 @@ static const MppEncHwCap vepu2_jpeg = {
.reserved = 0,
};
static const MppEncHwCap vepu2_jpeg_enhanced = {
.cap_coding = HAVE_MJPEG,
.type = VPU_CLIENT_VEPU2_JPEG,
.cap_fbc = 0,
.cap_4k = 1,
.cap_8k = 0,
.cap_hw_osd = 0,
.cap_hw_roi = 0,
.reserved = 0,
};
static const MppEncHwCap vepu22 = {
.cap_coding = CAP_CODING_HEVC,
.type = VPU_CLIENT_VEPU22,
@@ -806,7 +817,7 @@ static const MppSocInfo mpp_soc_infos[] = {
*/
"rv1109",
ROCKCHIP_SOC_RV1109,
HAVE_VDPU2 | HAVE_VEPU2_JPEG | HAVE_RKVDEC | HAVE_RKVENC,
HAVE_VDPU2 | HAVE_VEPU2 | HAVE_RKVDEC | HAVE_RKVENC,
{ &vdpu2_jpeg_fix, &vdpu341_lite, NULL, NULL, NULL, NULL, },
{ &vepu2_jpeg, &vepu541, NULL, NULL, },
},
@@ -818,7 +829,7 @@ static const MppSocInfo mpp_soc_infos[] = {
*/
"rv1126",
ROCKCHIP_SOC_RV1126,
HAVE_VDPU2 | HAVE_VEPU2_JPEG | HAVE_RKVDEC | HAVE_RKVENC,
HAVE_VDPU2 | HAVE_VEPU2 | HAVE_RKVDEC | HAVE_RKVENC,
{ &vdpu2_jpeg_fix, &vdpu341_lite, NULL, NULL, NULL, NULL, },
{ &vepu2_jpeg, &vepu541, NULL, NULL, },
},
@@ -904,7 +915,7 @@ static const MppSocInfo mpp_soc_infos[] = {
HAVE_VDPU2 | HAVE_VDPU2_PP | HAVE_VEPU2 | HAVE_RKVDEC | HAVE_RKVENC |
HAVE_JPEG_DEC | HAVE_AV1DEC | HAVE_AVSDEC | HAVE_VEPU2_JPEG,
{ &vdpu38x, &rkjpegd, &vdpu2, &vdpu2_jpeg_pp_fix, &av1d, &avspd},
{ &vepu58x, &vepu2, &vepu2_jpeg, NULL, },
{ &vepu58x, &vepu2, &vepu2_jpeg_enhanced, NULL, },
},
{ /*
* rk3528a has codec:
@@ -1073,7 +1084,8 @@ MppSocService::MppSocService()
mpp_dbg_platform("coding caps: dec %08x enc %08x\n",
dec_coding_cap, enc_coding_cap);
mpp_dbg_platform("vcodec type: %08x\n", soc_info->vcodec_type);
mpp_dbg_platform("vcodec type from cap: %08x, from soc_info %08x\n",
vcodec_type, soc_info->vcodec_type);
mpp_assert(soc_info->vcodec_type == vcodec_type);
}