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

[hal_h264e_vepu]: Fix width / stride relationship

Browse Source 
Vepu only support match width / stride configure. This should be setup
according to input format.

Change-Id: I2cd4e6bbf4c3888db0402096f80a6896c9a4bf53
Signed-off-by: Herman Chen <herman.chen@rock-chips.com>
This commit is contained in:
Herman Chen
2020-07-24 11:06:51 +08:00
parent bba530c27d
commit 4ca6be39eb
1 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
mpp/hal/vpu/h264e/hal_h264e_vepu_v2.c
View File

@@ -409,7 +409,8 @@ MPP_RET h264e_vepu_prep_setup(HalH264eVepuPrep *prep, MppEncPrepCfg *cfg)
} }
} }
RK_S32 hor_stride = cfg->hor_stride; /* NOTE: vepu only support 8bit encoding and stride must match with width align to 16 */
RK_S32 hor_stride = MPP_ALIGN(cfg->width, 16);
RK_S32 ver_stride = cfg->ver_stride; RK_S32 ver_stride = cfg->ver_stride;
prep->offset_cb = 0; prep->offset_cb = 0;
prep->offset_cr = 0; prep->offset_cr = 0;
@@ -419,22 +420,38 @@ MPP_RET h264e_vepu_prep_setup(HalH264eVepuPrep *prep, MppEncPrepCfg *cfg)
prep->offset_cb = hor_stride * ver_stride; prep->offset_cb = hor_stride * ver_stride;
prep->size_y = hor_stride * MPP_ALIGN(prep->src_h, 16); prep->size_y = hor_stride * MPP_ALIGN(prep->src_h, 16);
prep->size_c = hor_stride / 2 * MPP_ALIGN(prep->src_h / 2, 8); prep->size_c = hor_stride / 2 * MPP_ALIGN(prep->src_h / 2, 8);
if (cfg->hor_stride != MPP_ALIGN(cfg->width, 16))
mpp_log_f("vepu only support 16byte aligned YUV420SP horizontal stride %d vs width %d\n",
cfg->hor_stride, cfg->width);
} break; } break;
case MPP_FMT_YUV420P : { case MPP_FMT_YUV420P : {
prep->offset_cb = hor_stride * ver_stride; prep->offset_cb = hor_stride * ver_stride;
prep->offset_cr = prep->offset_cb + ((hor_stride * ver_stride) / 4); prep->offset_cr = prep->offset_cb + ((hor_stride * ver_stride) / 4);
prep->size_y = hor_stride * MPP_ALIGN(prep->src_h, 16); prep->size_y = hor_stride * MPP_ALIGN(prep->src_h, 16);
prep->size_c = hor_stride / 2 * MPP_ALIGN(prep->src_h / 2, 8); prep->size_c = hor_stride / 2 * MPP_ALIGN(prep->src_h / 2, 8);
if (cfg->hor_stride != MPP_ALIGN(cfg->width, 16))
mpp_log_f("vepu only support 16byte aligned YUV420P horizontal stride %d vs width %d\n",
cfg->hor_stride, cfg->width);
} break; } break;
case MPP_FMT_YUV422_YUYV : case MPP_FMT_YUV422_YUYV :
case MPP_FMT_YUV422_UYVY : { case MPP_FMT_YUV422_UYVY : {
prep->size_y = hor_stride * 2 * MPP_ALIGN(prep->src_h, 16); prep->size_y = hor_stride * 2 * MPP_ALIGN(prep->src_h, 16);
prep->size_c = 0; prep->size_c = 0;
if (cfg->hor_stride != (MPP_ALIGN(cfg->width, 16) * 2))
mpp_log_f("vepu only support 16 pixel aligned YUV422 horizontal stride %d vs width %d\n",
cfg->hor_stride, cfg->width);
} break; } break;
case MPP_FMT_RGB565 : case MPP_FMT_RGB565 :
case MPP_FMT_BGR444 : { case MPP_FMT_BGR444 : {
prep->size_y = hor_stride * 2 * MPP_ALIGN(prep->src_h, 16); prep->size_y = hor_stride * 2 * MPP_ALIGN(prep->src_h, 16);
prep->size_c = 0; prep->size_c = 0;
if (cfg->hor_stride != cfg->width * 2)
mpp_log_f("vepu only support matched 16bit pixel horizontal stride %d vs width %d\n",
cfg->hor_stride, cfg->width);
} break; } break;
case MPP_FMT_BGR888 : case MPP_FMT_BGR888 :
case MPP_FMT_RGB888 : case MPP_FMT_RGB888 :
@@ -443,6 +460,10 @@ MPP_RET h264e_vepu_prep_setup(HalH264eVepuPrep *prep, MppEncPrepCfg *cfg)
case MPP_FMT_BGR101010 : { case MPP_FMT_BGR101010 : {
prep->size_y = hor_stride * 4 * MPP_ALIGN(prep->src_h, 16); prep->size_y = hor_stride * 4 * MPP_ALIGN(prep->src_h, 16);
prep->size_c = 0; prep->size_c = 0;
if (cfg->hor_stride != cfg->width * 4)
mpp_log_f("vepu only support matched 32bit pixel horizontal stride %d vs width %d\n",
cfg->hor_stride, cfg->width);
} break; } break;
default: { default: {
mpp_err_f("invalid format %d", format); mpp_err_f("invalid format %d", format);