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

[test]: Update decoder test function

Browse Source 
1. Add buffer group clear when buffer group exists.
2. Add buf_size and limit to buffer group
3. Add max memory usage calc to mpi_dec_test
4. Set mpi_dec_multi_test default thread count to 1

Change-Id: Ia165c9a213b0aed9bc634121dd70776fd6c4801f
Signed-off-by: Herman Chen <herman.chen@rock-chips.com>
This commit is contained in:
Herman Chen
2018-05-23 10:46:13 +08:00
parent bed754e33f
commit b403830430
3 changed files with 121 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
test/mpi_dec_mt_test.c
View File

@@ -176,20 +176,41 @@ void *thread_output(void *arg)
mpp_log("decoder require buffer w:h [%d:%d] stride [%d:%d] size %d\n", mpp_log("decoder require buffer w:h [%d:%d] stride [%d:%d] size %d\n",
width, height, hor_stride, ver_stride, buf_size); width, height, hor_stride, ver_stride, buf_size);
ret = mpp_buffer_group_get_internal(&data->frm_grp, MPP_BUFFER_TYPE_ION); if (NULL == data->frm_grp) {
/* If buffer group is not set create one and limit it */
ret = mpp_buffer_group_get_internal(&data->frm_grp, MPP_BUFFER_TYPE_ION);
if (ret) {
mpp_err("get mpp buffer group failed ret %d\n", ret);
break;
}
/* Set buffer to mpp decoder */
ret = mpi->control(ctx, MPP_DEC_SET_EXT_BUF_GROUP, data->frm_grp);
if (ret) {
mpp_err("set buffer group failed ret %d\n", ret);
break;
}
} else {
/* If old buffer group exist clear it */
ret = mpp_buffer_group_clear(data->frm_grp);
if (ret) {
mpp_err("clear buffer group failed ret %d\n", ret);
break;
}
}
/* Use limit config to limit buffer count to 24 */
ret = mpp_buffer_group_limit_config(data->frm_grp, buf_size, 24);
if (ret) { if (ret) {
mpp_err("get mpp buffer group failed ret %d\n", ret); mpp_err("limit buffer group failed ret %d\n", ret);
break; break;
} }
// setup max frame buffer limit to 18 which is enough for most case ret = mpi->control(ctx, MPP_DEC_SET_INFO_CHANGE_READY, NULL);
ret = mpp_buffer_group_limit_config(data->frm_grp, buf_size, 18); if (ret) {
if (ret) mpp_err("info change ready failed ret %d\n", ret);
mpp_err("config buffer group limit failed ret %d\n", ret); break;
}
mpi->control(ctx, MPP_DEC_SET_EXT_BUF_GROUP, data->frm_grp);
mpi->control(ctx, MPP_DEC_SET_INFO_CHANGE_READY, NULL);
} else { } else {
// found normal output frame // found normal output frame
RK_U32 err_info = mpp_frame_get_errinfo(frame) | mpp_frame_get_discard(frame); RK_U32 err_info = mpp_frame_get_errinfo(frame) | mpp_frame_get_discard(frame);

46
test/mpi_dec_multi_test.c
View File

@@ -172,20 +172,51 @@ static int decode_simple(MpiDecCtx *data)
RK_U32 height = mpp_frame_get_height(frame); RK_U32 height = mpp_frame_get_height(frame);
RK_U32 hor_stride = mpp_frame_get_hor_stride(frame); RK_U32 hor_stride = mpp_frame_get_hor_stride(frame);
RK_U32 ver_stride = mpp_frame_get_ver_stride(frame); RK_U32 ver_stride = mpp_frame_get_ver_stride(frame);
RK_U32 buf_size = mpp_frame_get_buf_size(frame);
mpp_log("decode_get_frame get info changed found\n"); mpp_log("decode_get_frame get info changed found\n");
mpp_log("decoder require buffer w:h [%d:%d] stride [%d:%d]", mpp_log("decoder require buffer w:h [%d:%d] stride [%d:%d] buf_size %d",
width, height, hor_stride, ver_stride); width, height, hor_stride, ver_stride, buf_size);
ret = mpp_buffer_group_get_internal(&data->frm_grp, MPP_BUFFER_TYPE_ION); if (NULL == data->frm_grp) {
/* If buffer group is not set create one and limit it */
ret = mpp_buffer_group_get_internal(&data->frm_grp, MPP_BUFFER_TYPE_ION);
if (ret) {
mpp_err("get mpp buffer group failed ret %d\n", ret);
break;
}
/* Set buffer to mpp decoder */
ret = mpi->control(ctx, MPP_DEC_SET_EXT_BUF_GROUP, data->frm_grp);
if (ret) {
mpp_err("set buffer group failed ret %d\n", ret);
break;
}
} else {
/* If old buffer group exist clear it */
ret = mpp_buffer_group_clear(data->frm_grp);
if (ret) {
mpp_err("clear buffer group failed ret %d\n", ret);
break;
}
}
/* Use limit config to limit buffer count to 24 with buf_size */
ret = mpp_buffer_group_limit_config(data->frm_grp, buf_size, 24);
if (ret) { if (ret) {
mpp_err("get mpp buffer group failed ret %d\n", ret); mpp_err("limit buffer group failed ret %d\n", ret);
break; break;
} }
mpi->control(ctx, MPP_DEC_SET_EXT_BUF_GROUP, data->frm_grp); /*
* All buffer group config done. Set info change ready to let
mpi->control(ctx, MPP_DEC_SET_INFO_CHANGE_READY, NULL); * decoder continue decoding
*/
ret = mpi->control(ctx, MPP_DEC_SET_INFO_CHANGE_READY, NULL);
if (ret) {
mpp_err("info change ready failed ret %d\n", ret);
break;
}
} else { } else {
if (!data->first_frm) if (!data->first_frm)
data->first_frm = mpp_time(); data->first_frm = mpp_time();
@@ -727,6 +758,7 @@ int main(int argc, char **argv)
float total_rate = 0.0; float total_rate = 0.0;
memset((void*)cmd, 0, sizeof(*cmd)); memset((void*)cmd, 0, sizeof(*cmd));
cmd->nthreads = 1;
// parse the cmd option // parse the cmd option
ret = mpi_dec_multi_test_parse_options(argc, argv, cmd); ret = mpi_dec_multi_test_parse_options(argc, argv, cmd);

58
test/mpi_dec_test.c
View File

@@ -56,6 +56,7 @@ typedef struct {
FILE *fp_output; FILE *fp_output;
RK_S32 frame_count; RK_S32 frame_count;
RK_S32 frame_num; RK_S32 frame_num;
size_t max_usage;
} MpiDecLoopData; } MpiDecLoopData;
typedef struct { typedef struct {
@@ -72,6 +73,7 @@ typedef struct {
RK_U32 simple; RK_U32 simple;
RK_S32 timeout; RK_S32 timeout;
RK_S32 frame_num; RK_S32 frame_num;
size_t max_usage;
} MpiDecTestCmd; } MpiDecTestCmd;
static OptionInfo mpi_dec_cmd[] = { static OptionInfo mpi_dec_cmd[] = {
@@ -149,10 +151,11 @@ static int decode_simple(MpiDecLoopData *data)
RK_U32 height = mpp_frame_get_height(frame); RK_U32 height = mpp_frame_get_height(frame);
RK_U32 hor_stride = mpp_frame_get_hor_stride(frame); RK_U32 hor_stride = mpp_frame_get_hor_stride(frame);
RK_U32 ver_stride = mpp_frame_get_ver_stride(frame); RK_U32 ver_stride = mpp_frame_get_ver_stride(frame);
RK_U32 buf_size = mpp_frame_get_buf_size(frame);
mpp_log("decode_get_frame get info changed found\n"); mpp_log("decode_get_frame get info changed found\n");
mpp_log("decoder require buffer w:h [%d:%d] stride [%d:%d]", mpp_log("decoder require buffer w:h [%d:%d] stride [%d:%d] buf_size %d",
width, height, hor_stride, ver_stride); width, height, hor_stride, ver_stride, buf_size);
/* /*
* NOTE: We can choose decoder's buffer mode here. * NOTE: We can choose decoder's buffer mode here.
@@ -213,14 +216,46 @@ static int decode_simple(MpiDecLoopData *data)
* For H.264/H.265 20+ buffers will be enough. * For H.264/H.265 20+ buffers will be enough.
* For other codec 10 buffers will be enough. * For other codec 10 buffers will be enough.
*/ */
ret = mpp_buffer_group_get_internal(&data->frm_grp, MPP_BUFFER_TYPE_ION);
if (NULL == data->frm_grp) {
/* If buffer group is not set create one and limit it */
ret = mpp_buffer_group_get_internal(&data->frm_grp, MPP_BUFFER_TYPE_ION);
if (ret) {
mpp_err("get mpp buffer group failed ret %d\n", ret);
break;
}
/* Set buffer to mpp decoder */
ret = mpi->control(ctx, MPP_DEC_SET_EXT_BUF_GROUP, data->frm_grp);
if (ret) {
mpp_err("set buffer group failed ret %d\n", ret);
break;
}
} else {
/* If old buffer group exist clear it */
ret = mpp_buffer_group_clear(data->frm_grp);
if (ret) {
mpp_err("clear buffer group failed ret %d\n", ret);
break;
}
}
/* Use limit config to limit buffer count to 24 with buf_size */
ret = mpp_buffer_group_limit_config(data->frm_grp, buf_size, 24);
if (ret) { if (ret) {
mpp_err("get mpp buffer group failed ret %d\n", ret); mpp_err("limit buffer group failed ret %d\n", ret);
break; break;
} }
mpi->control(ctx, MPP_DEC_SET_EXT_BUF_GROUP, data->frm_grp);
mpi->control(ctx, MPP_DEC_SET_INFO_CHANGE_READY, NULL); /*
* All buffer group config done. Set info change ready to let
* decoder continue decoding
*/
ret = mpi->control(ctx, MPP_DEC_SET_INFO_CHANGE_READY, NULL);
if (ret) {
mpp_err("info change ready failed ret %d\n", ret);
break;
}
} else { } else {
err_info = mpp_frame_get_errinfo(frame) | mpp_frame_get_discard(frame); err_info = mpp_frame_get_errinfo(frame) | mpp_frame_get_discard(frame);
if (err_info) { if (err_info) {
@@ -238,6 +273,13 @@ static int decode_simple(MpiDecLoopData *data)
get_frm = 1; get_frm = 1;
} }
// try get runtime frame memory usage
{
size_t usage = mpp_buffer_group_usage(data->frm_grp);
if (usage > data->max_usage)
data->max_usage = usage;
}
// if last packet is send but last frame is not found continue // if last packet is send but last frame is not found continue
if (pkt_eos && pkt_done && !frm_eos) { if (pkt_eos && pkt_done && !frm_eos) {
msleep(10); msleep(10);
@@ -557,6 +599,8 @@ int mpi_dec_test_decode(MpiDecTestCmd *cmd)
} }
} }
cmd->max_usage = data.max_usage;
ret = mpi->reset(ctx); ret = mpi->reset(ctx);
if (MPP_OK != ret) { if (MPP_OK != ret) {
mpp_err("mpi->reset failed\n"); mpp_err("mpi->reset failed\n");
@@ -788,7 +832,7 @@ int main(int argc, char **argv)
ret = mpi_dec_test_decode(cmd); ret = mpi_dec_test_decode(cmd);
if (MPP_OK == ret) if (MPP_OK == ret)
mpp_log("test success\n"); mpp_log("test success max memory %.2f MB\n", cmd->max_usage / (float)(1 << 20));
else else
mpp_err("test failed ret %d\n", ret); mpp_err("test failed ret %d\n", ret);