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

[mpp buf]:release internal unused buf when require a big buf

Browse Source 
[mpp_dec]:discard the task when parser task invalid

git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@384 6e48237b-75ef-9749-8fc9-41990f28c85a
This commit is contained in:
ChenSiyong
2015-10-15 22:15:41 +00:00
parent 0701819302
commit 98c46b2209
2 changed files with 29 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
mpp/codec/mpp_dec.cpp
View File

@@ -90,6 +90,7 @@ void *mpp_dec_parser_thread(void *data)
prev_task_done = 1; prev_task_done = 1;
hal_task_hnd_set_status(task_prev, TASK_IDLE); hal_task_hnd_set_status(task_prev, TASK_IDLE);
task_prev = NULL; task_prev = NULL;
wait_on_prev = 0;
} else { } else {
usleep(5000); usleep(5000);
wait_on_prev = 1; wait_on_prev = 1;
@@ -240,6 +241,7 @@ void *mpp_dec_parser_thread(void *data)
hal_task_get_hnd(tasks, TASK_PROC_DONE, &task_prev); hal_task_get_hnd(tasks, TASK_PROC_DONE, &task_prev);
if (task_prev) { if (task_prev) {
prev_task_done = 1; prev_task_done = 1;
wait_on_prev = 0;
hal_task_hnd_set_status(task_prev, TASK_IDLE); hal_task_hnd_set_status(task_prev, TASK_IDLE);
task_prev = NULL; task_prev = NULL;
} else { } else {
@@ -276,6 +278,24 @@ void *mpp_dec_parser_thread(void *data)
info_task_done = 0; info_task_done = 0;
task_dec->flags.info_change = 0; task_dec->flags.info_change = 0;
if(task_dec->output < 0){
hal_task_hnd_set_status(task, TASK_IDLE);
mpp->mTaskPutCount++;
task = NULL;
if (pkt_buf_copyied) {
mpp_buf_slot_get_prop(packet_slots, task_dec->input, SLOT_BUFFER, &buffer);
if (buffer) {
mpp_buffer_put(buffer);
buffer = NULL;
}
mpp_buf_slot_clr_flag(packet_slots, task_dec->input, SLOT_HAL_INPUT);
pkt_buf_copyied = 0;
}
curr_task_ready = 0;
curr_task_parsed = 0;
hal_task_info_init(&task_local, MPP_CTX_DEC);
continue;
}
/* /*
* 5. chekc frame buffer group is internal or external * 5. chekc frame buffer group is internal or external
*/ */
@@ -403,10 +423,6 @@ void *mpp_dec_hal_thread(void *data)
mpp_hal_hw_wait(dec->hal, &task_info); mpp_hal_hw_wait(dec->hal, &task_info);
// TODO: may have risk here
hal_task_hnd_set_status(task, TASK_PROC_DONE);
task = NULL;
mpp->mThreadCodec->signal();
/* /*
@@ -423,6 +439,11 @@ void *mpp_dec_hal_thread(void *data)
} }
mpp_buf_slot_clr_flag(packet_slots, task_dec->input, SLOT_HAL_INPUT); mpp_buf_slot_clr_flag(packet_slots, task_dec->input, SLOT_HAL_INPUT);
// TODO: may have risk here
hal_task_hnd_set_status(task, TASK_PROC_DONE);
task = NULL;
mpp->mThreadCodec->signal();
mpp_buf_slot_clr_flag(frame_slots, task_dec->output, SLOT_HAL_OUTPUT); mpp_buf_slot_clr_flag(frame_slots, task_dec->output, SLOT_HAL_OUTPUT);
for (RK_U32 i = 0; i < MPP_ARRAY_ELEMS(task_dec->refer); i++) { for (RK_U32 i = 0; i < MPP_ARRAY_ELEMS(task_dec->refer); i++) {
RK_S32 index = task_dec->refer[i]; RK_S32 index = task_dec->refer[i];
@@ -439,7 +460,7 @@ void *mpp_dec_hal_thread(void *data)
MppFrame frame; MppFrame frame;
mpp_buf_slot_get_prop(frame_slots, index, SLOT_FRAME, &frame); mpp_buf_slot_get_prop(frame_slots, index, SLOT_FRAME, &frame);
if (!dec->reset_flag) { if (!dec->reset_flag) {
mpp_put_frame(mpp, frame); mpp_put_frame(mpp, frame);
} else { } else {
mpp_frame_deinit(&frame); mpp_frame_deinit(&frame);
} }

3
mpp/mpp_buffer_impl.cpp
View File

@@ -222,6 +222,9 @@ MppBufferImpl *mpp_buffer_get_unused(MppBufferGroupImpl *p, size_t size)
buffer = pos; buffer = pos;
inc_buffer_ref_no_lock(buffer); inc_buffer_ref_no_lock(buffer);
break; break;
}else{
if(MPP_BUFFER_INTERNAL == p->mode)
deinit_buffer_no_lock(pos);
} }
} }
} }