Rename copy_thread to encode_thread.

[nageru] / glwidget.cpp

diff --git a/glwidget.cpp b/glwidget.cpp
index 8949d089fb7b9a2ef7e6cea4dfc8c2d7f24094bc..3d5b0f97abe86a494bedda4ee5607e14499a2be2 100644 (file)
--- a/glwidget.cpp
+++ b/glwidget.cpp
@@ -3,91 +3,65 @@
 #include <qtextstream.h>  // Needs to come before egl.h.
 #include <qcursor.h>  // Needs to come before egl.h.
 #include <qcoreevent.h>  // Needs to come before egl.h.
+#include <qevent.h>  // Needs to come before egl.h.
 #include <epoxy/gl.h>
 #include <epoxy/egl.h>
 #include <QSurfaceFormat>
+#include <movit/resource_pool.h>
 
 #include "glwidget.h"
 
-#include <movit/resource_pool.h>
 #include <stdio.h>
+#include <functional>
+#include <mutex>
 
 #include "context.h"
+#include "effect_chain.h"
+#include "flags.h"
+#include "mainwindow.h"
 #include "mixer.h"
+#include "qnamespace.h"
 #include "ref_counted_gl_sync.h"
 
-class QSurface;
+class QMouseEvent;
 class QWidget;
 
 #undef Success
 #include <movit/util.h>
 #include <string>
 
+using namespace std;
+
 GLWidget::GLWidget(QWidget *parent)
-    : QGLWidget(parent, global_share_widget),
-      resource_pool(new movit::ResourcePool)
+    : QGLWidget(parent, global_share_widget)
 {
 }
 
-GLWidget::~GLWidget()
+void GLWidget::clean_context()
 {
+       if (resource_pool != nullptr) {
+               makeCurrent();
+               resource_pool->clean_context();
+       }
 }
 
 void GLWidget::initializeGL()
 {
-       printf("egl context=%p\n", eglGetCurrentContext());
-       //printf("threads: %p %p\n", QThread::currentThread(), qGuiApp->thread());
-
-       global_mixer = new Mixer(QGLFormat::toSurfaceFormat(format()));
-       global_mixer->set_frame_ready_fallback([this]{
+       static once_flag flag;
+       call_once(flag, [this]{
+               global_mixer = new Mixer(QGLFormat::toSurfaceFormat(format()), global_flags.num_cards);
+               global_mainwindow->mixer_created(global_mixer);
+               global_mixer->start();
+       });
+       global_mixer->set_frame_ready_callback(output, [this]{
                QMetaObject::invokeMethod(this, "update", Qt::AutoConnection);
+               emit transition_names_updated(global_mixer->get_transition_names());
+               emit resolution_updated(output);
        });
-       global_mixer->start();
 
-       // Prepare the shaders to actually get the texture shown (ick).
        glDisable(GL_BLEND);
        glDisable(GL_DEPTH_TEST);
        glDepthMask(GL_FALSE);
-
-       std::string vert_shader =
-               "#version 130 \n"
-               "in vec2 position; \n"
-               "in vec2 texcoord; \n"
-               "out vec2 tc; \n"
-               " \n"
-               "void main() \n"
-               "{ \n"
-               "    gl_Position = vec4(2.0 * position.x - 1.0, 2.0 * position.y - 1.0, -1.0, 1.0); \n"
-               "    tc = texcoord; \n"
-               "    tc.y = 1.0 - tc.y; \n"
-               "} \n";
-       std::string frag_shader =
-               "#version 130 \n"
-               "in vec2 tc; \n"
-               "uniform sampler2D tex; \n"
-               "void main() { \n"
-               "    gl_FragColor = texture2D(tex, tc); \n"
-               "} \n";
-       program_num = resource_pool->compile_glsl_program(vert_shader, frag_shader);
-
-       static const float vertices[] = {
-               0.0f, 2.0f,
-               0.0f, 0.0f,
-               2.0f, 0.0f
-       };
-       glGenVertexArrays(1, &vao);
-       glBindVertexArray(vao);
-       position_vbo = movit::fill_vertex_attribute(program_num, "position", 2, GL_FLOAT, sizeof(vertices), vertices);
-       texcoord_vbo = movit::fill_vertex_attribute(program_num, "texcoord", 2, GL_FLOAT, sizeof(vertices), vertices);  // Same as vertices.
-
-#if 0
-       // Cleanup.
-       cleanup_vertex_attribute(phases[0]->glsl_program_num, "position", position_vbo);
-       cleanup_vertex_attribute(phases[0]->glsl_program_num, "texcoord", texcoord_vbo);
-
-       glDeleteVertexArrays(1, &vao);
-       nheck_error();
-#endif
 }
 
 void GLWidget::resizeGL(int width, int height)
@@ -98,20 +72,30 @@ void GLWidget::resizeGL(int width, int height)
 void GLWidget::paintGL()
 {
        Mixer::DisplayFrame frame;
-       if (!global_mixer->get_display_frame(&frame)) {
+       if (!global_mixer->get_display_frame(output, &frame)) {
                glClearColor(0.0f, 1.0f, 0.0f, 1.0f);
+               check_error();
                glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+               check_error();
                return;
        }
 
-       glUseProgram(program_num);
-       glActiveTexture(GL_TEXTURE0);
-       glBindTexture(GL_TEXTURE_2D, frame.texnum);
-       glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-       glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-       glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-
-       glBindVertexArray(vao);
+       check_error();
        glWaitSync(frame.ready_fence.get(), /*flags=*/0, GL_TIMEOUT_IGNORED);
-       glDrawArrays(GL_TRIANGLES, 0, 3);
+       check_error();
+       frame.setup_chain();
+       check_error();
+       frame.chain->render_to_screen();
+       check_error();
+
+       if (resource_pool == nullptr) {
+               resource_pool = frame.chain->get_resource_pool();
+       } else {
+               assert(resource_pool == frame.chain->get_resource_pool());
+       }
+}
+
+void GLWidget::mousePressEvent(QMouseEvent *event)
+{
+       emit clicked();
 }