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

fixed some nesting issues

Browse Source
This commit is contained in:
itsmattkc
2018-08-28 20:40:37 +10:00
parent 083954cd06
commit 57fa7f1842
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
playback/cacher.cpp
+4 -4
View File
@@ -362,9 +362,9 @@ void open_clip_worker(Clip* clip) {
// init resampling context
clip->swr_ctx = swr_alloc_set_opts(
NULL,
clip->sequence->audio_layout,
sequence->audio_layout,
static_cast<AVSampleFormat>(sample_format),
clip->sequence->audio_frequency,
sequence->audio_frequency,
clip->codecCtx->channel_layout,
static_cast<AVSampleFormat>(clip->stream->codecpar->format),
clip->stream->codecpar->sample_rate,
@@ -377,9 +377,9 @@ void open_clip_worker(Clip* clip) {
clip->cache_A.frames = new AVFrame* [1];
clip->cache_A.frames[0] = av_frame_alloc();
clip->cache_A.frames[0]->format = sample_format;
clip->cache_A.frames[0]->channel_layout = clip->sequence->audio_layout;
clip->cache_A.frames[0]->channel_layout = sequence->audio_layout;
clip->cache_A.frames[0]->channels = av_get_channel_layout_nb_channels(clip->cache_A.frames[0]->channel_layout);
clip->cache_A.frames[0]->sample_rate = clip->sequence->audio_frequency;
clip->cache_A.frames[0]->sample_rate = sequence->audio_frequency;
av_frame_make_writable(clip->cache_A.frames[0]);
clip->audio_reset = true;
ui/viewerwidget.cpp
+3 -2
View File
@@ -183,8 +183,9 @@ GLuint ViewerWidget::compose_sequence(Clip* nest, bool render_audio) {
video_height = ms->video_height;
if (c->texture != NULL) textureID = c->texture->textureId();
} else if (c->media_type == MEDIA_TYPE_SEQUENCE) {
video_width = s->width;
video_height = s->height;
Sequence* cs = static_cast<Sequence*>(c->media);
video_width = cs->width;
video_height = cs->height;
textureID = compose_sequence(c, render_audio);
}