blender
/
blender
136
418
Fork 600
Code Issues 6.3k Pull Requests 780 Projects 19 Wiki Activity

VSE: Process audio strips waveforms in parallel #108877

Merged
Richard Antalik merged 13 commits from Yup_Lucas/blender:Yup_Lucas/vse-waveform-task-pool into main 2023-07-13 03:22:58 +02:00
Conversation 17 Commits 13 Files Changed 1 +23 -11
1 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ddb36604b5 - Show all commits

34
source/blender/editors/space_sequencer/sequencer_preview.c
View File

@ -65,10 +65,11 @@ static void free_preview_job(void *data)
MEM_freeN(pj);
}
static void clear_sound_waveform_loading_tag(bSound *sound) {
BLI_spin_lock(sound->spinlock);
sound->tags &= ~SOUND_TAGS_WAVEFORM_LOADING;
BLI_spin_unlock(sound->spinlock);
static void clear_sound_waveform_loading_tag(bSound *sound)
{
BLI_spin_lock(sound->spinlock);
sound->tags &= ~SOUND_TAGS_WAVEFORM_LOADING;
BLI_spin_unlock(sound->spinlock);
}
static void free_read_sound_waveform_task(struct TaskPool *__restrict task_pool, void *data)
@ -115,7 +116,8 @@ static void preview_startjob(void *data, bool *stop, bool *do_update, float *pro
BLI_mutex_unlock(pj->mutex);
while (keep_looping) {
/* Wait until there's either a new audio job to process or one of the previously submitted jobs is done.*/
/* Wait until there's either a new audio job to process or one of the previously submitted jobs
* is done.*/
Yup_Lucas marked this conversation as resolved Outdated
Richard Antalik commented 2023-07-04 02:00:45 +02:00
Outdated
Review
Copy Link

Use BLI_listbase_is_empty(&pj->previews)

I was bit confused by previous_processed == pj->processed part. Unless I missed something, this is only for updating progress, so I would suggest following:

    while (BLI_listbase_is_empty(&pj->previews) && pj->processed != pj->total) {
      float current_progress = (pj->total > 0) ? (float)pj->processed / (float)pj->total : 1.0f;

      if (current_progress != *progress) {
        *progress = current_progress;
        *do_update = true;
      }

      BLI_condition_wait(&pj->preview_suspend_cond, pj->mutex);
    }

Having update_progress() function would be even better.

Use `BLI_listbase_is_empty(&pj->previews)` I was bit confused by `previous_processed == pj->processed` part. Unless I missed something, this is only for updating progress, so I would suggest following: ``` while (BLI_listbase_is_empty(&pj->previews) && pj->processed != pj->total) { float current_progress = (pj->total > 0) ? (float)pj->processed / (float)pj->total : 1.0f; if (current_progress != *progress) { *progress = current_progress; *do_update = true; } BLI_condition_wait(&pj->preview_suspend_cond, pj->mutex); } ``` Having `update_progress()` function would be even better.
👍 1
BLI_mutex_lock(pj->mutex);
while (pj->previews.first == NULL && previous_processed == pj->processed) {
BLI_condition_wait(&pj->preview_suspend_cond, pj->mutex);
@ -132,11 +134,14 @@ static void preview_startjob(void *data, bool *stop, bool *do_update, float *pro
if (pj->processed == pj->total) {
keep_looping = false;
pj->running = false;
} else if (*stop || G.is_break) {
}
else if (*stop || G.is_break) {
BLI_task_pool_cancel(task_pool);
Yup_Lucas marked this conversation as resolved Outdated
Richard Antalik commented 2023-07-04 02:23:01 +02:00
Outdated
Review
Copy Link

You can use LISTBASE_FOREACH macro here, it's bit less noisy than plain for loop:
LISTBASE_FOREACH (PreviewJobAudio *, previewjb, &pj->previews){}

You can use `LISTBASE_FOREACH` macro here, it's bit less noisy than plain for loop: `LISTBASE_FOREACH (PreviewJobAudio *, previewjb, &pj->previews){}`
👍 1
/* Clear all pending jobs data. */
for (PreviewJobAudio *previewjb = pj->previews.first; previewjb != NULL; previewjb = previewjb->next) {
for (PreviewJobAudio *previewjb = pj->previews.first; previewjb != NULL;
previewjb = previewjb->next)
{
clear_sound_waveform_loading_tag(previewjb->sound);
}
BLI_freelistN(&pj->previews);
@ -145,18 +150,24 @@ static void preview_startjob(void *data, bool *stop, bool *do_update, float *pro
keep_looping = false;
Yup_Lucas marked this conversation as resolved Outdated
Richard Antalik commented 2023-07-04 02:25:08 +02:00
Outdated
Review
Copy Link

Foreach macro can be used here too, just use LISTBASE_FOREACH_MUTABLE since you are modifying linked list.

Also if you make function for pushing task, you won't need to clarify what code does with comment:

    LISTBASE_FOREACH_MUTABLE (PreviewJobAudio *, previewjb, &pj->previews) {
      push_task(task_pool, pj, previewjb);
    }
Foreach macro can be used here too, just use `LISTBASE_FOREACH_MUTABLE` since you are modifying linked list. Also if you make function for pushing task, you won't need to clarify what code does with comment: ``` LISTBASE_FOREACH_MUTABLE (PreviewJobAudio *, previewjb, &pj->previews) { push_task(task_pool, pj, previewjb); } ```
👍 1
pj->running = false;
} else {
}
else {
/* Push all available jobs to the processing queue. */
PreviewJobAudio *previewjb = pj->previews.first;
while (previewjb) {
ReadSoundWaveformTask *task = (ReadSoundWaveformTask *)MEM_mallocN(sizeof(ReadSoundWaveformTask), "read sound waveform task");
ReadSoundWaveformTask *task = (ReadSoundWaveformTask *)MEM_mallocN(
sizeof(ReadSoundWaveformTask), "read sound waveform task");
task->wm_job = pj;
task->wm_progress = progress;
task->wm_do_update = do_update;
task->preview_job_audio = previewjb;
task->stop = stop;
BLI_task_pool_push(task_pool, execute_read_sound_waveform_task, task, true, free_read_sound_waveform_task);
BLI_task_pool_push(task_pool,
execute_read_sound_waveform_task,
task,
true,
free_read_sound_waveform_task);
PreviewJobAudio *next_previewjb = previewjb->next;
BLI_remlink(&pj->previews, previewjb);
@ -209,7 +220,8 @@ void sequencer_preview_add_sound(const bContext *C, Sequence *seq)
}
BLI_mutex_unlock(pj->mutex);
} else { /* There's no existig preview job. */
}
else { /* There's no existig preview job. */
pj = MEM_callocN(sizeof(PreviewJob), "preview rebuild job");
pj->mutex = BLI_mutex_alloc();