oak-team/oak-editor
3
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed audio effects sometimes being applied more than once

Browse Source
This commit is contained in:
itsmattkc
2018-06-20 02:40:45 -07:00
parent 37b5ee35c4
commit 6c0bf62f51
6 changed files with 47 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
playback/cacher.cpp
+7 -5
View File
@@ -32,6 +32,13 @@ void cache_audio_worker(Clip* c) {
// but there still may be samples in swresample
swr_convert_frame(c->swr_ctx, frame, NULL);
}
// perform all audio effects
int nb_bytes = av_samples_get_buffer_size(NULL, frame->channels, frame->nb_samples, static_cast<AVSampleFormat>(frame->format), 1);
for (int j=0;j<c->effects.size();j++) {
Effect* e = c->effects.at(j);
if (e->is_enabled()) e->process_audio(frame->data[0], nb_bytes);
}
}
if (frame->nb_samples == 0) {
@@ -39,11 +46,6 @@ void cache_audio_worker(Clip* c) {
} else {
int nb_bytes = av_samples_get_buffer_size(NULL, frame->channels, frame->nb_samples, static_cast<AVSampleFormat>(frame->format), 1);
// perform all audio effects
for (int j=0;j<c->effects.size();j++) {
c->effects.at(j)->process_audio(frame->data[0], nb_bytes);
}
if (c->audio_buffer_write == 0) c->audio_buffer_write = (((int)(audio_ibuffer_read/2))*2) + 1024;
int half_buffer = (audio_ibuffer_size/2);
while (c->frame_sample_index < nb_bytes) {