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

[vpu_api]: fix MppFrameFormat translation error in vpuapi layer

Browse Source 
git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@1162 6e48237b-75ef-9749-8fc9-41990f28c85a
This commit is contained in:
ChenHengming
2016-08-05 10:10:26 +00:00
parent 71910fd795
commit 472d2b585b
2 changed files with 62 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
mpp/legacy/vpu_api_legacy.cpp
View File

@@ -169,13 +169,15 @@ RK_S32 VpuApiLegacy::init(VpuCodecContext *ctx, RK_U8 *extraData, RK_U32 extra_s
mpp_assert(param->width); mpp_assert(param->width);
mpp_assert(param->height); mpp_assert(param->height);
perform(INPUT_FORMAT_MAP, &param->format);
RK_S32 tmp_fmt = param->format;
perform(INPUT_FORMAT_MAP, &tmp_fmt);
outData = mpp_malloc(RK_U8, (param->width * param->height)); outData = mpp_malloc(RK_U8, (param->width * param->height));
mpp_cfg.width = param->width; mpp_cfg.width = param->width;
mpp_cfg.height = param->height; mpp_cfg.height = param->height;
mpp_cfg.format = param->format; mpp_cfg.format = tmp_fmt;
mpp_cfg.rc_mode = param->rc_mode; mpp_cfg.rc_mode = param->rc_mode;
mpp_cfg.skip_cnt = 0; mpp_cfg.skip_cnt = 0;
mpp_cfg.bps = param->bitRate; mpp_cfg.bps = param->bitRate;
@@ -785,41 +787,67 @@ FUNC_RET:
return ret; return ret;
} }
static MppFrameFormat vpu_pic_type_remap_to_mpp(EncInputPictureType type)
{
MppFrameFormat ret = MPP_FMT_BUTT;
switch (type) {
case ENC_INPUT_YUV420_PLANAR : {
ret = MPP_FMT_YUV420P;
} break;
case ENC_INPUT_YUV420_SEMIPLANAR : {
ret = MPP_FMT_YUV420SP;
} break;
case ENC_INPUT_YUV422_INTERLEAVED_YUYV : {
ret = MPP_FMT_YUV422_YUYV;
} break;
case ENC_INPUT_YUV422_INTERLEAVED_UYVY : {
ret = MPP_FMT_YUV422_UYVY;
} break;
case ENC_INPUT_RGB565 : {
ret = MPP_FMT_RGB565;
} break;
case ENC_INPUT_BGR565 : {
ret = MPP_FMT_BGR565;
} break;
case ENC_INPUT_RGB555 : {
ret = MPP_FMT_RGB555;
} break;
case ENC_INPUT_BGR555 : {
ret = MPP_FMT_BGR555;
} break;
case ENC_INPUT_RGB444 : {
ret = MPP_FMT_RGB444;
} break;
case ENC_INPUT_BGR444 : {
ret = MPP_FMT_BGR444;
} break;
case ENC_INPUT_RGB888 : {
ret = MPP_FMT_RGB888;
} break;
case ENC_INPUT_BGR888 : {
ret = MPP_FMT_BGR888;
} break;
case ENC_INPUT_RGB101010 : {
ret = MPP_FMT_RGB101010;
} break;
case ENC_INPUT_BGR101010 : {
ret = MPP_FMT_BGR101010;
} break;
default : {
mpp_err("There is no match format, err!!!!!!");
} break;
}
return ret;
}
RK_S32 VpuApiLegacy::perform(PerformCmd cmd, RK_S32 *data) RK_S32 VpuApiLegacy::perform(PerformCmd cmd, RK_S32 *data)
{ {
vpu_api_dbg_func("enter\n"); vpu_api_dbg_func("enter\n");
switch (cmd) { switch (cmd) {
case INPUT_FORMAT_MAP : { case INPUT_FORMAT_MAP : {
if ((EncInputPictureType)(*data) == ENC_INPUT_YUV420_PLANAR) EncInputPictureType vpu_frame_fmt = *(EncInputPictureType *)data;
*data = MPP_FMT_YUV420P; MppFrameFormat mpp_frame_fmt = vpu_pic_type_remap_to_mpp(vpu_frame_fmt);
else if ((EncInputPictureType)(*data) == ENC_INPUT_YUV420_SEMIPLANAR) *(MppFrameFormat *)data = mpp_frame_fmt;
*data = MPP_FMT_YUV420SP;
else if ((EncInputPictureType)(*data) == ENC_INPUT_YUV422_INTERLEAVED_YUYV)
*data = MPP_FMT_YUV422_YUYV;
else if ((EncInputPictureType)(*data) == ENC_INPUT_YUV422_INTERLEAVED_UYVY)
*data = MPP_FMT_YUV422_UYVY;
else if ((EncInputPictureType)(*data) == ENC_INPUT_RGB565)
*data = MPP_FMT_RGB565;
else if ((EncInputPictureType)(*data) == ENC_INPUT_BGR565)
*data = MPP_FMT_BGR565;
else if ((EncInputPictureType)(*data) == ENC_INPUT_RGB555)
*data = MPP_FMT_RGB555;
else if ((EncInputPictureType)(*data) == ENC_INPUT_BGR555)
*data = MPP_FMT_BGR555;
else if ((EncInputPictureType)(*data) == ENC_INPUT_RGB444)
*data = MPP_FMT_RGB444;
else if ((EncInputPictureType)(*data) == ENC_INPUT_BGR444)
*data = MPP_FMT_BGR444;
else if ((EncInputPictureType)(*data) == ENC_INPUT_RGB888)
*data = MPP_FMT_RGB888;
else if ((EncInputPictureType)(*data) == ENC_INPUT_BGR888)
*data = MPP_FMT_BGR888;
else if ((EncInputPictureType)(*data) == ENC_INPUT_RGB101010)
*data = MPP_FMT_RGB101010;
else if ((EncInputPictureType)(*data) == ENC_INPUT_BGR101010)
*data = MPP_FMT_BGR101010;
else
mpp_err("There is no match format, err!!!!!!");
} break; } break;
default: default:
mpp_err("cmd can not match with any option!"); mpp_err("cmd can not match with any option!");
@@ -850,7 +878,7 @@ RK_S32 VpuApiLegacy::control(VpuCodecContext *ctx, VPU_API_CMD cmd, void *param)
mpp_cfg.height = cfg->height; mpp_cfg.height = cfg->height;
mpp_cfg.hor_stride = MPP_ALIGN(cfg->width, 16); mpp_cfg.hor_stride = MPP_ALIGN(cfg->width, 16);
mpp_cfg.ver_stride = MPP_ALIGN(cfg->height, 16); mpp_cfg.ver_stride = MPP_ALIGN(cfg->height, 16);
mpp_cfg.format = (RK_S32)enc_in_fmt; mpp_cfg.format = vpu_pic_type_remap_to_mpp(enc_in_fmt);
mpp_cfg.rc_mode = cfg->rc_mode; mpp_cfg.rc_mode = cfg->rc_mode;
mpp_cfg.skip_cnt = 0; mpp_cfg.skip_cnt = 0;
mpp_cfg.bps = cfg->bitRate; mpp_cfg.bps = cfg->bitRate;

1
test/vpu_api_test.c
View File

@@ -341,6 +341,7 @@ static RK_S32 vpu_encode_demo(VpuApiDemoCmdContext_t *cmd)
enc_param = (EncParameter_t*)ctx->private_data; enc_param = (EncParameter_t*)ctx->private_data;
enc_param->width = cmd->width; enc_param->width = cmd->width;
enc_param->height = cmd->height; enc_param->height = cmd->height;
enc_param->format = ENC_INPUT_YUV420_PLANAR;
enc_param->rc_mode = 0; enc_param->rc_mode = 0;
enc_param->bitRate = 100000; enc_param->bitRate = 100000;
enc_param->framerate = 25; enc_param->framerate = 25;