Add global headers if the mux wants it. (Although I am not sure if it might be a...

[nageru] / mixer.cpp

diff --git a/mixer.cpp b/mixer.cpp
index f0b06941225fb78d2e8f1ac35ac89698a7077413..0817ff9a15b49829c27bb7e80346d25faf52256f 100644 (file)
--- a/mixer.cpp
+++ b/mixer.cpp
@@ -114,15 +114,19 @@ string generate_local_dump_filename(int frame)
 void QueueLengthPolicy::update_policy(int queue_length)
 {
        if (queue_length < 0) {  // Starvation.
-               if (safe_queue_length < 5) {
+               if (been_at_safe_point_since_last_starvation && safe_queue_length < 5) {
                        ++safe_queue_length;
                        fprintf(stderr, "Card %u: Starvation, increasing safe limit to %u frames\n",
                                card_index, safe_queue_length);
                }
                frames_with_at_least_one = 0;
+               been_at_safe_point_since_last_starvation = false;
                return;
        }
        if (queue_length > 0) {
+               if (queue_length >= int(safe_queue_length)) {
+                       been_at_safe_point_since_last_starvation = true;
+               }
                if (++frames_with_at_least_one >= 50 && safe_queue_length > 0) {
                        --safe_queue_length;
                        fprintf(stderr, "Card %u: Spare frames for more than 50 frames, reducing safe limit to %u frames\n",
@@ -529,7 +533,7 @@ void Mixer::bm_frame(unsigned card_index, uint16_t timecode,
 
                GLuint pbo = userdata->pbo;
                check_error();
-               glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, pbo);
+               glBindBuffer(GL_PIXEL_UNPACK_BUFFER, pbo);
                check_error();
                glFlushMappedBufferRange(GL_PIXEL_UNPACK_BUFFER, 0, video_frame.size);
                check_error();
@@ -544,7 +548,7 @@ void Mixer::bm_frame(unsigned card_index, uint16_t timecode,
                check_error();
                glBindTexture(GL_TEXTURE_2D, 0);
                check_error();
-               glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, 0);
+               glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0);
                check_error();
                RefCountedGLsync fence(GL_SYNC_GPU_COMMANDS_COMPLETE, /*flags=*/0);
                check_error();