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

[test]: modify to avoid encode dead loop

Browse Source 
modify ret val of read_yuv_img to avoid test_mpp_run
dead loop in mpi->poll.

Change-Id: If1b907584d0a79f9a5def168eec9358440e38aee
Signed-off-by: sliver.chen <sliver.chen@rock-chips.com>
This commit is contained in:
sliver.chen
2017-08-29 17:08:26 +08:00
committed by Herman Chen
parent e31f34a749
commit 033694705b
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
test/mpi_enc_test.c
View File

@@ -188,7 +188,7 @@ static MPP_RET read_yuv_image(RK_U8 *buf, MpiEncTestData *p)
} break; } break;
default : { default : {
mpp_err_f("read image do not support fmt %d\n", fmt); mpp_err_f("read image do not support fmt %d\n", fmt);
ret = MPP_NOK; ret = MPP_ERR_VALUE;
} break; } break;
} }
@@ -205,6 +205,7 @@ static MPP_RET fill_yuv_image(RK_U8 *buf, MpiEncTestData *c)
RK_U32 hor_stride = c->hor_stride; RK_U32 hor_stride = c->hor_stride;
RK_U32 ver_stride = c->ver_stride; RK_U32 ver_stride = c->ver_stride;
MppFrameFormat fmt = c->fmt; MppFrameFormat fmt = c->fmt;
RK_U32 frame_count = c->frame_count; RK_U32 frame_count = c->frame_count;
RK_U8 *buf_y = buf; RK_U8 *buf_y = buf;
RK_U8 *buf_c = buf + hor_stride * ver_stride; RK_U8 *buf_c = buf + hor_stride * ver_stride;
@@ -745,10 +746,11 @@ MPP_RET test_mpp_run(MpiEncTestData *p)
if (p->fp_input) { if (p->fp_input) {
ret = read_yuv_image(buf, p); ret = read_yuv_image(buf, p);
if (ret != MPP_OK || feof(p->fp_input)) { if (ret == MPP_NOK || feof(p->fp_input)) {
mpp_log("found last frame. feof %d\n", feof(p->fp_input)); mpp_log("found last frame. feof %d\n", feof(p->fp_input));
p->frm_eos = 1; p->frm_eos = 1;
} } else if (ret == MPP_ERR_VALUE)
goto RET;
} else { } else {
ret = fill_yuv_image(buf, p); ret = fill_yuv_image(buf, p);
if (ret) if (ret)