From eb3236c8d1cde1716873a3dd1ce3c65da8d43af9 Mon Sep 17 00:00:00 2001 From: ChenHengming Date: Mon, 12 Oct 2015 23:21:50 +0000 Subject: [PATCH] [mpp]: return get_frame error on non-block mode git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@373 6e48237b-75ef-9749-8fc9-41990f28c85a --- mpp/mpp.cpp | 5 +++-- test/mpi_test.c | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/mpp/mpp.cpp b/mpp/mpp.cpp index efd96cfd..fac6a4b9 100644 --- a/mpp/mpp.cpp +++ b/mpp/mpp.cpp @@ -199,9 +199,10 @@ MPP_RET Mpp::get_frame(MppFrame *frame) prev = next; } } + *frame = first; + return MPP_OK; } - *frame = first; - return MPP_OK; + return MPP_NOK; } MPP_RET Mpp::put_frame(MppFrame frame) diff --git a/test/mpi_test.c b/test/mpi_test.c index 84afce73..7ce25fd8 100644 --- a/test/mpi_test.c +++ b/test/mpi_test.c @@ -46,6 +46,7 @@ int mpi_test() MpiCmd cmd = MPP_CMD_BASE; MppParam param = NULL; + RK_U32 output_block = 1; RK_S32 i; char *buf = NULL; @@ -71,7 +72,8 @@ int mpi_test() } // NOTE: decoder do not need control function - + cmd = MPP_SET_OUTPUT_BLOCK; + param = &output_block; ret = mpi->control(ctx, cmd, param); if (MPP_OK != ret) { mpp_err("mpi->control failed\n");