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

fixed some major audio bugs

Browse Source
This commit is contained in:
itsmattkc
2018-09-29 13:19:45 +10:00
parent ee7b5476bf
commit 8f67b46714
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
playback/cacher.cpp
+11 -9
View File
@@ -96,13 +96,19 @@ void cache_audio_worker(Clip* c, Clip* nest) {
}
new_frame = true;
if (c->frame_sample_index < 0) {
c->frame_sample_index = 0;
} else {
c->frame_sample_index -= nb_bytes;
}
nb_bytes = av_samples_get_buffer_size(NULL, frame->channels, frame->nb_samples, static_cast<AVSampleFormat>(frame->format), 1);
if (c->audio_just_reset) {
// get precise sample offset for the elected clip_in from this audio frame
double target_sts = 0;
if (c->audio_target_frame < timeline_in) {
target_sts = clip_frame_to_seconds(c, c->clip_in);
target_sts = ((double) c->clip_in / c->sequence->frame_rate);
} else {
target_sts = playhead_to_seconds(c, c->audio_target_frame);
}
@@ -114,13 +120,11 @@ void cache_audio_worker(Clip* c, Clip* nest) {
c->frame_sample_index = av_samples_get_buffer_size(NULL, av_get_channel_layout_nb_channels(c->sequence->audio_layout), nb_samples, AV_SAMPLE_FMT_S16, 1);
}
c->audio_just_reset = false;
} else {
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;
int offset = (audio_ibuffer_read + 2048) - c->audio_buffer_write;
if (offset > 0) {
c->audio_buffer_write += offset;
c->frame_sample_index += offset;
@@ -162,6 +166,7 @@ void cache_audio_worker(Clip* c, Clip* nest) {
} else {
long buffer_timeline_out = get_buffer_offset_from_frame(timeline_out);
audio_write_lock.lock();
qDebug() << "starting to write:" << audio_ibuffer_read;
while (c->frame_sample_index < nb_bytes
&& c->audio_buffer_write < audio_ibuffer_read+audio_ibuffer_size
&& c->audio_buffer_write < buffer_timeline_out) {
@@ -234,7 +239,6 @@ void reset_cache(Clip* c, long target_frame) {
if (c->stream->codecpar->codec_type == AVMEDIA_TYPE_VIDEO) {
// seeks to nearest keyframe (target_frame represents internal clip frame)
qint64 seek_start = QDateTime::currentMSecsSinceEpoch();
av_seek_frame(c->formatCtx, ms->file_index, (int64_t) qFloor(clip_frame_to_seconds(c, target_frame) / timebase), AVSEEK_FLAG_BACKWARD);
// play up to the frame we actually want
@@ -243,14 +247,12 @@ void reset_cache(Clip* c, long target_frame) {
do {
retrieve_next_frame(c, temp);
if (retrieved_frame == 0) {
if (target_frame != 0) retrieved_frame = floor(temp->pts * timebase * av_q2d(av_guess_frame_rate(c->formatCtx, c->stream, temp)));
if (target_frame != 0) retrieved_frame = floor(temp->pts * timebase * av_q2d(c->stream->avg_frame_rate));
} else {
retrieved_frame++;
}
} while (retrieved_frame < target_frame);
stat_seek_time = (QDateTime::currentMSecsSinceEpoch() - seek_start);
av_frame_free(&temp);
} else if (c->stream->codecpar->codec_type == AVMEDIA_TYPE_AUDIO) {
// seek (target_frame represents timeline timecode in frames, not clip timecode)
@@ -350,7 +352,7 @@ void open_clip_worker(Clip* clip) {
);
// create memory cache for video
clip->cache_size = (ms->infinite_length) ? 1 : ceil(av_q2d(av_guess_frame_rate(clip->formatCtx, clip->stream, NULL))/4); // cache is half a second in total
clip->cache_size = (ms->infinite_length) ? 1 : ceil(av_q2d(clip->stream->avg_frame_rate)/4); // cache is half a second in total
// infinite length doesn't need cache B
clip->cache_A.frames = new AVFrame* [clip->cache_size];
playback/playback.cpp
+2 -2
View File
@@ -224,7 +224,7 @@ double playhead_to_seconds(Clip* c, long playhead) {
long seconds_to_clip_frame(Clip* c, double seconds) {
// returns time as frame number (according to clip's frame rate)
if (c->stream->codecpar->codec_type == AVMEDIA_TYPE_VIDEO) {
return floor(seconds*av_q2d(av_guess_frame_rate(c->formatCtx, c->stream, c->frame)));
return floor(seconds*av_q2d(c->stream->avg_frame_rate));
} else {
qDebug() << "[ERROR] seconds_to_clip_frame only works on video streams";
return 0;
@@ -233,7 +233,7 @@ long seconds_to_clip_frame(Clip* c, double seconds) {
double clip_frame_to_seconds(Clip* c, long clip_frame) {
// returns frame number in decimal seconds
return (double) clip_frame / av_q2d(av_guess_frame_rate(c->formatCtx, c->stream, c->frame));
return (double) clip_frame / av_q2d(c->stream->avg_frame_rate);
}
int retrieve_next_frame(Clip* c, AVFrame* f) {