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

[mpp]: Add temporally patch for blocking issue

Browse Source 
There is a bug of stucking on decoder parser thread:
When decoder parser thread is block by info change and enter waiting.
There is no way to wake up parser thread to continue decoding.
The put_packet only signal sem on packets. May be it better to use
sem on info change too.

Change-Id: I3a3c45629a55d438ae9fee1968db27a94bafb20d
Signed-off-by: Herman Chen <herman.chen@rock-chips.com>
This commit is contained in:
Herman Chen
2018-03-31 20:31:09 +08:00
parent 19e2b0f748
commit 3b4c3eaf2f
1 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
mpp/mpp.cpp
View File

@@ -292,7 +292,7 @@ MPP_RET Mpp::get_frame(MppFrame *frame)
if (!mInitDone) if (!mInitDone)
return MPP_ERR_INIT; return MPP_ERR_INIT;
AutoMutex autoLock(mFrames->mutex()); AutoMutex autoFrameLock(mFrames->mutex());
MppFrame first = NULL; MppFrame first = NULL;
if (0 == mFrames->list_size()) { if (0 == mFrames->list_size()) {
@@ -330,7 +330,18 @@ MPP_RET Mpp::get_frame(MppFrame *frame)
prev = next; prev = next;
} }
} }
} else {
// NOTE: Add signal here is not efficient
// This is for fix bug of stucking on decoder parser thread
// When decoder parser thread is block by info change and enter waiting.
// There is no way to wake up parser thread to continue decoding.
// The put_packet only signal sem on may be it better to use sem on info
// change too.
AutoMutex autoPacketLock(mPackets->mutex());
if (mPackets->list_size())
mThreadCodec->signal();
} }
*frame = first; *frame = first;
return MPP_OK; return MPP_OK;
} }
@@ -703,6 +714,10 @@ MPP_RET Mpp::control_dec(MpiCmd cmd, MppParam param)
mFrameGroup = (MppBufferGroup)param; mFrameGroup = (MppBufferGroup)param;
if (param) { if (param) {
mExternalFrameGroup = 1; mExternalFrameGroup = 1;
if (mpp_debug & MPP_DBG_INFO)
mpp_log("using external buffer group %p\n", mFrameGroup);
if (mThreadCodec) { if (mThreadCodec) {
ret = mpp_buffer_group_set_listener((MppBufferGroupImpl *)param, ret = mpp_buffer_group_set_listener((MppBufferGroupImpl *)param,
(void *)mThreadCodec); (void *)mThreadCodec);
@@ -724,6 +739,9 @@ MPP_RET Mpp::control_dec(MpiCmd cmd, MppParam param)
} }
} break; } break;
case MPP_DEC_SET_INFO_CHANGE_READY: { case MPP_DEC_SET_INFO_CHANGE_READY: {
if (mpp_debug & MPP_DBG_INFO)
mpp_log("set info change ready\n");
ret = mpp_buf_slot_ready(mDec->frame_slots); ret = mpp_buf_slot_ready(mDec->frame_slots);
mThreadCodec->signal(); mThreadCodec->signal();
} break; } break;