Set pixel format on contexts we create; fixes issues with Qt 5.5.1.

[nageru] / mixer.cpp

diff --git a/mixer.cpp b/mixer.cpp
index cf2ed8311a001080641fabb2afc2ae077e7409cb..d1a788bab2e483eebc45edbfdb8e9b4373f6f5f1 100644 (file)
--- a/mixer.cpp
+++ b/mixer.cpp
@@ -7,27 +7,20 @@
 #include "mixer.h"
 
 #include <assert.h>
-#include <effect.h>
-#include <effect_chain.h>
-#include <effect_util.h>
 #include <epoxy/egl.h>
-#include <features.h>
-#include <image_format.h>
 #include <init.h>
-#include <overlay_effect.h>
-#include <padding_effect.h>
-#include <resample_effect.h>
-#include <resource_pool.h>
-#include <saturation_effect.h>
+#include <movit/effect_chain.h>
+#include <movit/effect_util.h>
+#include <movit/flat_input.h>
+#include <movit/image_format.h>
+#include <movit/resource_pool.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/time.h>
 #include <time.h>
 #include <util.h>
-#include <white_balance_effect.h>
-#include <ycbcr.h>
-#include <ycbcr_input.h>
+#include <algorithm>
 #include <cmath>
 #include <condition_variable>
 #include <cstddef>
@@ -35,6 +28,7 @@
 #include <mutex>
 #include <string>
 #include <thread>
+#include <utility>
 #include <vector>
 
 #include "bmusb/bmusb.h"
@@ -87,10 +81,9 @@ Mixer::Mixer(const QSurfaceFormat &format, unsigned num_cards)
 
        resource_pool.reset(new ResourcePool);
        theme.reset(new Theme("theme.lua", resource_pool.get(), num_cards));
-       output_channel[OUTPUT_LIVE].parent = this;
-       output_channel[OUTPUT_PREVIEW].parent = this;
-       output_channel[OUTPUT_INPUT0].parent = this;
-       output_channel[OUTPUT_INPUT1].parent = this;
+       for (unsigned i = 0; i < NUM_OUTPUTS; ++i) {
+               output_channel[i].parent = this;
+       }
 
        ImageFormat inout_format;
        inout_format.color_space = COLORSPACE_sRGB;
@@ -118,7 +111,7 @@ Mixer::Mixer(const QSurfaceFormat &format, unsigned num_cards)
                card->usb->set_dequeue_thread_callbacks(
                        [card]{
                                eglBindAPI(EGL_OPENGL_API);
-                               card->context = create_context();
+                               card->context = create_context(card->surface);
                                if (!make_current(card->context, card->surface)) {
                                        printf("failed to create bmusb context\n");
                                        exit(1);
@@ -336,7 +329,7 @@ void Mixer::bm_frame(unsigned card_index, uint16_t timecode,
 void Mixer::thread_func()
 {
        eglBindAPI(EGL_OPENGL_API);
-       QOpenGLContext *context = create_context();
+       QOpenGLContext *context = create_context(mixer_surface);
        if (!make_current(context, mixer_surface)) {
                printf("oops\n");
                exit(1);