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

[mpp]: fix missing unlock on reset

Browse Source 
git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@404 6e48237b-75ef-9749-8fc9-41990f28c85a
This commit is contained in:
ChenHengming
2015-10-20 22:28:44 +00:00
parent 7708015713
commit f6caca5e61
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
mpp/mpp.cpp
View File

@@ -238,6 +238,7 @@ MPP_RET Mpp::get_packet(MppPacket *packet)
}
return MPP_OK;
}
MPP_RET Mpp::control(MpiCmd cmd, MppParam param)
{
switch (cmd) {
@@ -270,24 +271,24 @@ MPP_RET Mpp::control(MpiCmd cmd, MppParam param)
MPP_RET Mpp::reset()
{
{
Mutex::Autolock autoLock(mPackets->mutex());
mPackets->lock();
mPackets->flush();
}
{
Mutex::Autolock autoLock(mFrames->mutex());
mPackets->unlock();
mFrames->lock();
mFrames->flush();
}
mFrames->unlock();
mThreadCodec->reset_lock();
if (mType == MPP_CTX_DEC) {
mpp_dec_reset(mDec);
mThreadCodec->signal();
mThreadCodec->reset_wait();
mThreadCodec->reset_unlock();
} else {
mpp_dec_reset(mEnc);
}
mThreadCodec->reset_unlock();
return MPP_OK;
}