Put a global lock around glFenceSync/glDeleteSync calls, to workaround apitrace bug...

[nageru] / mixer.cpp

diff --git a/mixer.cpp b/mixer.cpp
index 081bad513d689e02cce914c1fd18e535afc16393..3d4cccb4a6b4a372ca6e7e36c8442925334ac324 100644 (file)
--- a/mixer.cpp
+++ b/mixer.cpp
@@ -139,7 +139,7 @@ void QueueLengthPolicy::update_policy(int queue_length)
 }
 
 Mixer::Mixer(const QSurfaceFormat &format, unsigned num_cards)
-       : httpd(WIDTH, HEIGHT),
+       : httpd(),
          num_cards(num_cards),
          mixer_surface(create_surface(format)),
          h264_encoder_surface(create_surface(format)),
@@ -148,9 +148,6 @@ Mixer::Mixer(const QSurfaceFormat &format, unsigned num_cards)
          limiter(OUTPUT_FREQUENCY),
          compressor(OUTPUT_FREQUENCY)
 {
-       httpd.open_output_file(generate_local_dump_filename(/*frame=*/0).c_str());
-       httpd.start(9095);
-
        CHECK(init_movit(MOVIT_SHADER_DIR, MOVIT_DEBUG_OFF));
        check_error();
 
@@ -178,6 +175,10 @@ Mixer::Mixer(const QSurfaceFormat &format, unsigned num_cards)
        display_chain->finalize();
 
        h264_encoder.reset(new H264Encoder(h264_encoder_surface, global_flags.va_display, WIDTH, HEIGHT, &httpd));
+       h264_encoder->open_output_file(generate_local_dump_filename(/*frame=*/0).c_str());
+
+       // Start listening for clients only once H264Encoder has written its header, if any.
+       httpd.start(9095);
 
        // First try initializing the PCI devices, then USB, until we have the desired number of cards.
        unsigned num_pci_devices = 0, num_usb_devices = 0;
@@ -692,10 +693,10 @@ void Mixer::thread_func()
                if (should_cut.exchange(false)) {  // Test and clear.
                        string filename = generate_local_dump_filename(frame);
                        printf("Starting new recording: %s\n", filename.c_str());
+                       h264_encoder->close_output_file();
                        h264_encoder->shutdown();
-                       httpd.close_output_file();
-                       httpd.open_output_file(filename.c_str());
                        h264_encoder.reset(new H264Encoder(h264_encoder_surface, global_flags.va_display, WIDTH, HEIGHT, &httpd));
+                       h264_encoder->open_output_file(filename.c_str());
                }
 
 #if 0
@@ -1204,3 +1205,5 @@ void Mixer::OutputChannel::set_frame_ready_callback(Mixer::new_frame_ready_callb
        new_frame_ready_callback = callback;
        has_new_frame_ready_callback = true;
 }
+
+mutex RefCountedGLsync::fence_lock;