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

[vproc]: Simplify reset lock

Browse Source 
Signed-off-by: Herman Chen <herman.chen@rock-chips.com>
Change-Id: I7f53706e74a16658309b3c027fb7c49817c15d86
This commit is contained in:
Herman Chen
2022-12-09 10:12:09 +08:00
parent 9d317ee674
commit c22b65ef22
1 changed files with 9 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
mpp/vproc/mpp_dec_vproc.cpp
View File

@@ -568,22 +568,6 @@ static void dec_vproc_update_ref(MppDecVprocCtxImpl *ctx, MppFrame frm, RK_U32 i
return; return;
} }
static void dev_vproc_reset(MppThread *thd, MppDecVprocCtxImpl *ctx)
{
AutoMutex autolock_reset(thd->mutex(THREAD_CONTROL));
if (ctx->reset) {
vproc_dbg_reset("reset start\n");
dec_vproc_clr_prev(ctx);
ctx->reset = 0;
sem_post(&ctx->reset_sem);
ctx->task_status.val = 0;
ctx->task_wait.val = 0;
vproc_dbg_reset("reset done\n");
}
}
static void *dec_vproc_thread(void *data) static void *dec_vproc_thread(void *data)
{ {
MppDecVprocCtxImpl *ctx = (MppDecVprocCtxImpl *)data; MppDecVprocCtxImpl *ctx = (MppDecVprocCtxImpl *)data;
@@ -616,7 +600,15 @@ static void *dec_vproc_thread(void *data)
if (!ctx->task_status.task_rdy) { if (!ctx->task_status.task_rdy) {
if (hal_task_get_hnd(tasks, TASK_PROCESSING, &task)) { if (hal_task_get_hnd(tasks, TASK_PROCESSING, &task)) {
if (ctx->reset) { if (ctx->reset) {
dev_vproc_reset(thd, ctx); /* reset only on all task finished */
vproc_dbg_reset("reset start\n");
dec_vproc_clr_prev(ctx);
ctx->reset = 0;
sem_post(&ctx->reset_sem);
ctx->task_wait.val = 0;
vproc_dbg_reset("reset done\n");
continue; continue;
} }
@@ -933,9 +925,7 @@ MPP_RET dec_vproc_reset(MppDecVprocCtx ctx)
vproc_dbg_reset("reset contorl start\n"); vproc_dbg_reset("reset contorl start\n");
// wait reset finished // wait reset finished
thd->lock(); thd->lock();
thd->lock(THREAD_CONTROL);
p->reset = 1; p->reset = 1;
thd->unlock(THREAD_CONTROL);
thd->signal(); thd->signal();
thd->unlock(); thd->unlock();