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

fixed #118

Browse Source
This commit is contained in:
itsmattkc
2018-09-06 16:47:22 +10:00
parent 84287a7448
commit 2326fb43f3
5 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
playback/cacher.cpp
+2 -2
View File
@@ -332,7 +332,7 @@ void open_clip_worker(Clip* clip) {
if (av_frame_get_buffer(clip->cache_A.frames[i], 0)) {
qDebug() << "[ERROR] Could not allocate buffer for sws_frame";
}
clip->cache_A.frames[i]->linesize[0] = dstW*4;
// clip->cache_A.frames[i]->linesize[0] = dstW*4;
clip->cache_B.frames[i] = av_frame_alloc();
av_frame_make_writable(clip->cache_B.frames[i]);
@@ -342,7 +342,7 @@ void open_clip_worker(Clip* clip) {
if (av_frame_get_buffer(clip->cache_B.frames[i], 0)) {
qDebug() << "[ERROR] Could not allocate buffer for sws_frame";
}
clip->cache_B.frames[i]->linesize[0] = dstW*4;
// clip->cache_B.frames[i]->linesize[0] = dstW*4;
}
} else if (clip->stream->codecpar->codec_type == AVMEDIA_TYPE_AUDIO) {
// if FFmpeg can't pick up the channel layout (usually WAV), assume
playback/playback.cpp
+2
View File
@@ -190,7 +190,9 @@ bool get_clip_frame(Clip* c, long playhead) {
c->texture->allocateStorage(QOpenGLTexture::RGBA, QOpenGLTexture::UInt8);
}
glPixelStorei(GL_UNPACK_ROW_LENGTH, current_frame->linesize[0]/4);
c->texture->setData(0, QOpenGLTexture::RGBA, QOpenGLTexture::UInt8, current_frame->data[0]);
glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
c->texture_frame = clip_time;
return true;