Switch to memory barriers, now that Mesa 11.1 has them (ATI always had problems with...

[nageru] / mixer.cpp

diff --git a/mixer.cpp b/mixer.cpp
index 57cd5bdaf2d30daeabc370bffdffaa7703239ef7..f28ea378f8f48410ad890f24df1c144da07a6162 100644 (file)
--- a/mixer.cpp
+++ b/mixer.cpp
@@ -59,6 +59,22 @@ void convert_fixed24_to_fp32(float *dst, size_t out_channels, const uint8_t *src
        }
 }
 
+void insert_new_frame(RefCountedFrame frame, unsigned field_num, bool interlaced, unsigned card_index, InputState *input_state)
+{
+       if (interlaced) {
+               for (unsigned frame_num = FRAME_HISTORY_LENGTH; frame_num --> 1; ) {  // :-)
+                       input_state->buffered_frames[card_index][frame_num] =
+                               input_state->buffered_frames[card_index][frame_num - 1];
+               }
+               input_state->buffered_frames[card_index][0] = { frame, field_num };
+       } else {
+               for (unsigned frame_num = 0; frame_num < FRAME_HISTORY_LENGTH; ++frame_num) {
+                       input_state->buffered_frames[card_index][frame_num] = { frame, field_num };
+               }
+       }
+}
+
+
 }  // namespace
 
 Mixer::Mixer(const QSurfaceFormat &format, unsigned num_cards)
@@ -143,7 +159,8 @@ Mixer::Mixer(const QSurfaceFormat &format, unsigned num_cards)
                "void main() { \n"
                "    gl_FragColor = texture2D(cbcr_tex, tc0); \n"
                "} \n";
-       cbcr_program_num = resource_pool->compile_glsl_program(cbcr_vert_shader, cbcr_frag_shader);
+       vector<string> frag_shader_outputs;
+       cbcr_program_num = resource_pool->compile_glsl_program(cbcr_vert_shader, cbcr_frag_shader, frag_shader_outputs);
 
        r128.init(2, OUTPUT_FREQUENCY);
        r128.integr_start();
@@ -371,10 +388,8 @@ void Mixer::bm_frame(unsigned card_index, uint16_t timecode,
                check_error();
                glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, pbo);
                check_error();
-               glFlushMappedBufferRange(GL_PIXEL_UNPACK_BUFFER, 0, video_frame.size);
+               glMemoryBarrier(GL_CLIENT_MAPPED_BUFFER_BARRIER_BIT);
                check_error();
-               //glMemoryBarrier(GL_CLIENT_MAPPED_BUFFER_BARRIER_BIT);
-               //check_error();
 
                glBindTexture(GL_TEXTURE_2D, userdata->tex_cbcr[field]);
                check_error();
@@ -493,6 +508,7 @@ void Mixer::thread_func()
                }
 
                if (audio_level_callback != nullptr) {
+                       unique_lock<mutex> lock(r128_mutex);
                        double loudness_s = r128.loudness_S();
                        double loudness_i = r128.integrated();
                        double loudness_range_low = r128.range_min();
@@ -527,16 +543,7 @@ void Mixer::thread_func()
                                continue;
 
                        assert(card->new_frame != nullptr);
-                       if (card->new_frame_interlaced) {
-                               for (unsigned frame_num = FRAME_HISTORY_LENGTH; frame_num --> 1; ) {  // :-)
-                                       buffered_frames[card_index][frame_num] = buffered_frames[card_index][frame_num - 1];
-                               }
-                               buffered_frames[card_index][0] = { card->new_frame, card->new_frame_field };
-                       } else {
-                               for (unsigned frame_num = 0; frame_num < FRAME_HISTORY_LENGTH; ++frame_num) {
-                                       buffered_frames[card_index][frame_num] = { card->new_frame, card->new_frame_field };
-                               }
-                       }
+                       insert_new_frame(card->new_frame, card->new_frame_field, card->new_frame_interlaced, card_index, &input_state);
                        check_error();
 
                        // The new texture might still be uploaded,
@@ -550,7 +557,7 @@ void Mixer::thread_func()
                }
 
                // Get the main chain from the theme, and set its state immediately.
-               Theme::Chain theme_main_chain = theme->get_chain(0, pts(), WIDTH, HEIGHT);
+               Theme::Chain theme_main_chain = theme->get_chain(0, pts(), WIDTH, HEIGHT, input_state);
                EffectChain *chain = theme_main_chain.chain;
                theme_main_chain.setup_chain();
 
@@ -599,7 +606,7 @@ void Mixer::thread_func()
                // Set up preview and any additional channels.
                for (int i = 1; i < theme->get_num_channels() + 2; ++i) {
                        DisplayFrame display_frame;
-                       Theme::Chain chain = theme->get_chain(i, pts(), WIDTH, HEIGHT);  // FIXME: dimensions
+                       Theme::Chain chain = theme->get_chain(i, pts(), WIDTH, HEIGHT, input_state);  // FIXME: dimensions
                        display_frame.chain = chain.chain;
                        display_frame.setup_chain = chain.setup_chain;
                        display_frame.ready_fence = fence;
@@ -743,7 +750,10 @@ void Mixer::process_audio_one_frame(int64_t frame_pts_int, int num_samples)
        vector<float> left, right;
        deinterleave_samples(samples_out, &left, &right);
        float *ptrs[] = { left.data(), right.data() };
-       r128.process(left.size(), ptrs);
+       {
+               unique_lock<mutex> lock(r128_mutex);
+               r128.process(left.size(), ptrs);
+       }
 
        // Send the samples to the sound card.
        if (alsa) {