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

[mpi]: Fix stuck on block output mode decode call

Browse Source 
When the output mode is set to block user call decode function the first
get_frame call will get stuck if there is no frame to get.
So when the output mode is block we need to put_packet first then get_frame.

Change-Id: I8cecb0e3f7b3aac2605301d6f2d35d5ca5f97756
Signed-off-by: Herman Chen <herman.chen@rock-chips.com>
This commit is contained in:
Herman Chen
2016-11-11 16:17:22 +08:00
parent 2f9b18b0bd
commit c35f72e154
3 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
mpp/mpi.cpp
View File

@@ -89,6 +89,7 @@ static MPP_RET mpi_decode(MppCtx ctx, MppPacket packet, MppFrame *frame)
mpi_dbg_func("enter ctx %p packet %p frame %p\n", ctx, packet, frame);
do {
RK_U32 packet_done = 0;
Mpp *mpp = p->ctx;
ret = check_mpp_ctx(p);
if (ret)
break;
@@ -103,11 +104,14 @@ static MPP_RET mpi_decode(MppCtx ctx, MppPacket packet, MppFrame *frame)
do {
/*
* if there is frame to return get the frame first
* If there is frame to return get the frame first
* But if the output mode is block then we need to send packet first
*/
ret = p->ctx->get_frame(frame);
if (ret || *frame)
break;
if (!mpp->mOutputBlock || packet_done) {
ret = mpp->get_frame(frame);
if (ret || *frame)
break;
}
/* when packet is send do one more get frame here */
if (packet_done)
@@ -116,7 +120,7 @@ static MPP_RET mpi_decode(MppCtx ctx, MppPacket packet, MppFrame *frame)
/*
* then send input stream with block mode
*/
ret = p->ctx->put_packet(packet);
ret = mpp->put_packet(packet);
if (MPP_OK == ret)
packet_done = 1;
} while (1);