hashirama/uvg266
1
0
Fork 0
mirror of https://github.com/ultravideo/uvg266.git synced 2024-11-27 19:24:06 +00:00
Code Issues Actions Projects Releases Wiki Activity

Fix crash with WPP when threads are disabled

Browse source 
When WPP is enabled, a reference to SAO reconstruction job is copied
from the wavefront to the main encoder state. However, when threads are
disabled, the job is a null pointer and dereferencing it crashes the
encoder. Fixed by adding a null pointer check.
This commit is contained in:
Arttu Ylä-Outinen 2017-04-24 12:50:44 +03:00
parent 2991962033
commit a9c878b535
1 changed files with 32 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
src/encoderstate.c
View file

@ -725,35 +725,38 @@ static void encoder_state_encode(encoder_state_t * const main_state) {
data->encoder_state = main_state; data->encoder_state = main_state;
job = kvz_threadqueue_submit(main_state->encoder_control->threadqueue, encoder_state_worker_sao_reconstruct_lcu, data, 1, job_description); job = kvz_threadqueue_submit(main_state->encoder_control->threadqueue, encoder_state_worker_sao_reconstruct_lcu, data, 1, job_description);
// This dependancy is needed, because the pre-SAO pixels from the LCU row // If job object was returned, add dependancies and allow it to run.
// below this one are read straigh from the frame. if (job) {
if (previous_job) { // This dependancy is needed, because the pre-SAO pixels from the LCU row
kvz_threadqueue_job_dep_add(job, previous_job); // below this one are read straigh from the frame.
} if (previous_job) {
previous_job = job; kvz_threadqueue_job_dep_add(job, previous_job);
}
// This depepndancy ensures that the bottom edge of this LCU row previous_job = job;
// has been fully deblocked.
if (y < frame->height_in_lcu - 1) { // This depepndancy ensures that the bottom edge of this LCU row
// Not last row: depend on the last LCU of the row below. // has been fully deblocked.
kvz_threadqueue_job_dep_add(job, main_state->tile->wf_jobs[(y + 1) * frame->width_in_lcu + frame->width_in_lcu - 1]); if (y < frame->height_in_lcu - 1) {
} else { // Not last row: depend on the last LCU of the row below.
// Last row: depend on the last LCU of the row kvz_threadqueue_job_dep_add(job, main_state->tile->wf_jobs[(y + 1) * frame->width_in_lcu + frame->width_in_lcu - 1]);
kvz_threadqueue_job_dep_add(job, main_state->tile->wf_jobs[(y + 0) * frame->width_in_lcu + frame->width_in_lcu - 1]); } else {
} // Last row: depend on the last LCU of the row
kvz_threadqueue_job_unwait_job(main_state->encoder_control->threadqueue, job); kvz_threadqueue_job_dep_add(job, main_state->tile->wf_jobs[(y + 0) * frame->width_in_lcu + frame->width_in_lcu - 1]);
}
// The wavefront row is finished, when the SAO-reconstruction is kvz_threadqueue_job_unwait_job(main_state->encoder_control->threadqueue, job);
// finished.
kvz_threadqueue_free_job(&main_state->children[y].tqj_recon_done); // The wavefront row is finished, when the SAO-reconstruction is
main_state->children[y].tqj_recon_done = job; // finished.
kvz_threadqueue_free_job(&main_state->children[y].tqj_recon_done);
if (y == frame->height_in_lcu - 1) { main_state->children[y].tqj_recon_done = job;
// This tile is finished, when the reconstruction of the last
// WPP-row is finished. if (y == frame->height_in_lcu - 1) {
assert(!main_state->tqj_recon_done); // This tile is finished, when the reconstruction of the last
main_state->tqj_recon_done = kvz_threadqueue_copy_ref(job); // WPP-row is finished.
assert(!main_state->tqj_recon_done);
main_state->tqj_recon_done = kvz_threadqueue_copy_ref(job);
}
} }
} }
} }