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

many comfort features and fixed audio bug

Browse Source
This commit is contained in:
itsmattkc
2018-07-06 16:07:01 +01:00
parent 77defa4ce9
commit 31da8e0a0f
11 changed files with 83 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
playback/cacher.cpp
+8 -2
View File
@@ -36,10 +36,9 @@ void cache_audio_worker(Clip* c) {
c->need_new_audio_frame = false;
if (c->audio_just_reset) {
// get precise sample offset for the elected clip_in from this audio frame
float target_sts = 0;
if (c->audio_target_frame < c->timeline_in) {
target_sts = playhead_to_seconds(c, c->clip_in);
target_sts = clip_frame_to_seconds(c, c->clip_in);
} else {
target_sts = playhead_to_seconds(c, c->audio_target_frame);
}
@@ -82,6 +81,13 @@ void cache_audio_worker(Clip* c) {
retrieve_next_frame_raw_data(c, frame);
nb_bytes = av_samples_get_buffer_size(NULL, frame->channels, frame->nb_samples, static_cast<AVSampleFormat>(frame->format), 1);
c->frame_sample_index -= nb_bytes;
// code DISGUSTINGLY copy/pasted from above
int offset = audio_ibuffer_read - c->audio_buffer_write;
if (offset > 0) {
c->audio_buffer_write += offset;
c->frame_sample_index += offset;
}
}
while (c->frame_sample_index < nb_bytes) {
if (c->audio_buffer_write >= audio_ibuffer_read+half_buffer || c->audio_buffer_write >= get_buffer_offset_from_frame(c->timeline_out)) {