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

[jpege]: Fix source format check error.

Browse Source 
1. move format check to HAL.
2. fix NV61 fmt config error.
3. fix I420 offset config error.

Signed-off-by: xueman.ruan <xueman.ruan@rock-chips.com>
Change-Id: Ia42a94fe56ccd9bc92bba3c1779defa163122cfa
This commit is contained in:
xueman.ruan
2022-11-25 18:14:11 +08:00
committed by Herman Chen
parent 4de5a6948c
commit 796ec28f6a
3 changed files with 3 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
mpp/codec/enc/jpeg/jpege_api_v2.c
View File

@@ -118,7 +118,6 @@ static MPP_RET jpege_proc_prep_cfg(MppEncPrepCfg *dst, MppEncPrepCfg *src)
mpp_assert(change); mpp_assert(change);
if (change) { if (change) {
MppEncPrepCfg bak = *dst; MppEncPrepCfg bak = *dst;
MppFrameFormat fmt;
RK_S32 mirroring; RK_S32 mirroring;
RK_S32 rotation; RK_S32 rotation;
@@ -178,19 +177,6 @@ static MPP_RET jpege_proc_prep_cfg(MppEncPrepCfg *dst, MppEncPrepCfg *src)
ret = MPP_NOK; ret = MPP_NOK;
} }
fmt = dst->format & MPP_FRAME_FMT_MASK;
if ((fmt != MPP_FMT_YUV420SP &&
fmt != MPP_FMT_YUV420P &&
fmt != MPP_FMT_YUV422SP_VU &&
fmt != MPP_FMT_YUV422_YUYV &&
fmt != MPP_FMT_YUV422_UYVY &&
fmt < MPP_FRAME_FMT_RGB) ||
fmt == MPP_FMT_RGB888 ||
fmt == MPP_FMT_BGR888) {
mpp_err_f("invalid format %d is not supportted\n", dst->format);
ret = MPP_NOK;
}
dst->change |= change; dst->change |= change;
// parameter checking // parameter checking

2
mpp/hal/rkenc/common/vepu540c_common.c
View File

@@ -148,7 +148,7 @@ static MPP_RET vepu540c_jpeg_set_patch_info(MppDev dev, JpegeSyntax *syn,
/* input cr addr */ /* input cr addr */
if (v_offset) if (v_offset)
mpp_dev_set_reg_offset(dev, 266, u_offset); mpp_dev_set_reg_offset(dev, 266, v_offset);
return ret; return ret;
} }

4
mpp/hal/rkenc/common/vepu541_common.c
View File

@@ -91,9 +91,9 @@ static VepuFmtCfg vepu541_yuv_cfg[MPP_FMT_YUV_BUTT] = {
.offset = zeros, .offset = zeros,
}, },
{ /* MPP_FMT_YUV422SP_VU */ { /* MPP_FMT_YUV422SP_VU */
.format = VEPU541_FMT_NONE, .format = VEPU541_FMT_YUV422SP,
.alpha_swap = 0, .alpha_swap = 0,
.rbuv_swap = 0, .rbuv_swap = 1,
.src_range = 1, .src_range = 1,
.src_endian = 0, .src_endian = 0,
.weight = zeros, .weight = zeros,