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

fixed NULL audio glitches

Browse Source
This commit is contained in:
itsmattkc
2018-09-10 16:25:55 +10:00
parent 99df7879e3
commit cc8056842c
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
playback/cacher.cpp
+6 -3
View File
@@ -137,13 +137,18 @@ void cache_audio_worker(Clip* c, Clip* nest) {
case MEDIA_TYPE_TONE:
frame = c->frame;
nb_bytes = av_samples_get_buffer_size(NULL, frame->channels, frame->nb_samples, static_cast<AVSampleFormat>(frame->format), 1);
if (c->frame_sample_index < 0) {
if (c->frame_sample_index < 0 || c->frame_sample_index >= nb_bytes) {
// create "new frame"
memset(c->frame->data[0], 0, nb_bytes);
apply_audio_effects(c, bytes_to_seconds(frame->pts, frame->channels, frame->sample_rate), frame, nb_bytes);
c->frame->pts += nb_bytes;
c->frame_sample_index = 0;
if (c->audio_buffer_write == 0) c->audio_buffer_write = get_buffer_offset_from_frame(qMax(timeline_in, c->audio_target_frame));
int offset = audio_ibuffer_read - c->audio_buffer_write;
if (offset > 0) {
c->audio_buffer_write += offset;
c->frame_sample_index += offset;
}
}
break;
default: // shouldn't ever get here
@@ -151,8 +156,6 @@ void cache_audio_worker(Clip* c, Clip* nest) {
return;
}
qDebug() << c->audio_buffer_write << c->frame_sample_index;
// mix audio into internal buffer
if (frame->nb_samples == 0) {
break;