jkl playback is functional
This commit is contained in:
@@ -119,7 +119,8 @@ GLuint compose_sequence(Viewer* viewer,
|
||||
bool render_audio,
|
||||
Effect** gizmos,
|
||||
bool& texture_failed,
|
||||
bool rendering) {
|
||||
bool rendering,
|
||||
int playback_speed) {
|
||||
GLint current_fbo = 0;
|
||||
if (video) {
|
||||
glGetIntegerv(GL_DRAW_FRAMEBUFFER_BINDING, ¤t_fbo);
|
||||
@@ -286,7 +287,7 @@ GLuint compose_sequence(Viewer* viewer,
|
||||
// for nested sequences
|
||||
if (c->media->get_type()== MEDIA_TYPE_SEQUENCE) {
|
||||
nests.append(c);
|
||||
textureID = compose_sequence(viewer, ctx, seq, nests, video, render_audio, gizmos, texture_failed, rendering);
|
||||
textureID = compose_sequence(viewer, ctx, seq, nests, video, render_audio, gizmos, texture_failed, rendering, false);
|
||||
nests.removeLast();
|
||||
fbo_switcher = true;
|
||||
}
|
||||
@@ -440,12 +441,12 @@ GLuint compose_sequence(Viewer* viewer,
|
||||
if (render_audio || (config.enable_audio_scrubbing && audio_scrub && seq->playhead > c->timeline_in)) {
|
||||
if (c->media != nullptr && c->media->get_type() == MEDIA_TYPE_SEQUENCE) {
|
||||
nests.append(c);
|
||||
compose_sequence(viewer, ctx, seq, nests, video, render_audio, gizmos, texture_failed, rendering);
|
||||
compose_sequence(viewer, ctx, seq, nests, video, render_audio, gizmos, texture_failed, rendering, playback_speed);
|
||||
nests.removeLast();
|
||||
} else {
|
||||
if (c->lock.tryLock()) {
|
||||
// clip is not caching, start caching audio
|
||||
cache_clip(c, playhead, c->audio_reset, !render_audio, nests);
|
||||
cache_clip(c, playhead, c->audio_reset, !render_audio, nests, playback_speed);
|
||||
c->lock.unlock();
|
||||
}
|
||||
}
|
||||
@@ -484,8 +485,8 @@ GLuint compose_sequence(Viewer* viewer,
|
||||
return 0;
|
||||
}
|
||||
|
||||
void compose_audio(Viewer* viewer, Sequence* seq, bool render_audio) {
|
||||
void compose_audio(Viewer* viewer, Sequence* seq, bool render_audio, int playback_speed) {
|
||||
QVector<Clip*> nests;
|
||||
bool texture_failed;
|
||||
compose_sequence(viewer, nullptr, seq, nests, false, render_audio, nullptr, texture_failed, audio_rendering);
|
||||
compose_sequence(viewer, nullptr, seq, nests, false, render_audio, nullptr, texture_failed, audio_rendering, playback_speed);
|
||||
}
|
||||
|
||||
@@ -17,9 +17,10 @@ GLuint compose_sequence(Viewer* viewer,
|
||||
bool render_audio,
|
||||
Effect **gizmos,
|
||||
bool &texture_failed,
|
||||
bool rendering);
|
||||
bool rendering,
|
||||
int playback_speed);
|
||||
|
||||
void compose_audio(Viewer* viewer, Sequence* seq, bool render_audio);
|
||||
void compose_audio(Viewer* viewer, Sequence* seq, bool render_audio, int playback_speed);
|
||||
|
||||
void viewport_render();
|
||||
|
||||
|
||||
+4
-2
@@ -110,7 +110,7 @@ void RenderThread::paint() {
|
||||
|
||||
gizmos = nullptr;
|
||||
QVector<Clip*> nests;
|
||||
compose_sequence(nullptr, ctx, seq, nests, true, false, &gizmos, texture_failed, false);
|
||||
compose_sequence(nullptr, ctx, seq, nests, true, false, &gizmos, texture_failed, false, temp_reverse);
|
||||
|
||||
if (!save_fn.isEmpty()) {
|
||||
if (texture_failed) {
|
||||
@@ -138,12 +138,14 @@ void RenderThread::paint() {
|
||||
glDisable(GL_TEXTURE_2D);
|
||||
}
|
||||
|
||||
void RenderThread::start_render(QOpenGLContext *share, Sequence *s, const QString& save, GLvoid* pixels, int idivider) {
|
||||
void RenderThread::start_render(QOpenGLContext *share, Sequence *s, const QString& save, GLvoid* pixels, int idivider, bool itemp_reverse) {
|
||||
seq = s;
|
||||
|
||||
// stall any dependent actions
|
||||
texture_failed = true;
|
||||
|
||||
temp_reverse = itemp_reverse;
|
||||
|
||||
if (share != nullptr && (ctx == nullptr || ctx->shareContext() != share_ctx)) {
|
||||
share_ctx = share;
|
||||
delete_ctx();
|
||||
|
||||
+2
-1
@@ -22,7 +22,7 @@ public:
|
||||
GLuint texColorBuffer;
|
||||
Effect* gizmos;
|
||||
void paint();
|
||||
void start_render(QOpenGLContext* share, Sequence* s, const QString &save = nullptr, GLvoid *pixels = nullptr, int idivider = 0);
|
||||
void start_render(QOpenGLContext* share, Sequence* s, const QString &save = nullptr, GLvoid *pixels = nullptr, int idivider = 0, bool itemp_reverse = false);
|
||||
bool did_texture_fail();
|
||||
void cancel();
|
||||
|
||||
@@ -47,6 +47,7 @@ private:
|
||||
bool queued;
|
||||
bool texture_failed;
|
||||
bool running;
|
||||
bool temp_reverse;
|
||||
QString save_fn;
|
||||
GLvoid *pixel_buffer;
|
||||
};
|
||||
|
||||
+1
-1
@@ -230,7 +230,7 @@ void ViewerWidget::frame_update() {
|
||||
}
|
||||
|
||||
// render the audio
|
||||
compose_audio(viewer, viewer->seq, render_audio);
|
||||
compose_audio(viewer, viewer->seq, render_audio, viewer->get_playback_speed());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user