X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=mixer.cpp;h=1f1035bf84065ef9c7ccca19afb8a5a51a1075e0;hb=d7cb604a0df5b367fe79dcfdf245bed088cc3ad3;hp=84335aa7f39be226750a013e58d0bf7736a27554;hpb=c86f05364052dad02972a3d5be68c64e68c07221;p=nageru

diff --git a/mixer.cpp b/mixer.cpp
index 84335aa..1f1035b 100644
--- 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",
@@ -155,7 +159,7 @@ Mixer::Mixer(const QSurfaceFormat &format, unsigned num_cards)
 	movit_texel_subpixel_precision /= 2.0;
 
 	resource_pool.reset(new ResourcePool);
-	theme.reset(new Theme("theme.lua", resource_pool.get(), num_cards));
+	theme.reset(new Theme(global_flags.theme_filename.c_str(), resource_pool.get(), num_cards));
 	for (unsigned i = 0; i < NUM_OUTPUTS; ++i) {
 		output_channel[i].parent = this;
 	}
@@ -257,6 +261,14 @@ Mixer::Mixer(const QSurfaceFormat &format, unsigned num_cards)
 
 	locut.init(FILTER_HPF, 2);
 
+	// If --flat-audio is given, turn off everything that messes with the sound,
+	// except the final makeup gain.
+	if (global_flags.flat_audio) {
+		set_locut_enabled(false);
+		set_limiter_enabled(false);
+		set_compressor_enabled(false);
+	}
+
 	// hlen=16 is pretty low quality, but we use quite a bit of CPU otherwise,
 	// and there's a limit to how important the peak meter is.
 	peak_resampler.setup(OUTPUT_FREQUENCY, OUTPUT_FREQUENCY * 4, /*num_channels=*/2, /*hlen=*/16, /*frel=*/1.0);
@@ -473,7 +485,6 @@ void Mixer::bm_frame(unsigned card_index, uint16_t timecode,
 			new_frame.frame = RefCountedFrame(FrameAllocator::Frame());
 			new_frame.length = frame_length;
 			new_frame.interlaced = false;
-			new_frame.ready_fence = nullptr;
 			new_frame.dropped_frames = dropped_frames;
 			card->new_frames.push(move(new_frame));
 			card->new_frames_changed.notify_all();
@@ -530,9 +541,9 @@ 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();
-		glMemoryBarrier(GL_CLIENT_MAPPED_BUFFER_BARRIER_BIT);
+		glFlushMappedBufferRange(GL_PIXEL_UNPACK_BUFFER, 0, video_frame.size);
 		check_error();
 
 		glBindTexture(GL_TEXTURE_2D, userdata->tex_cbcr[field]);
@@ -545,11 +556,11 @@ 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();
-		GLsync fence = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, /*flags=*/0);
+		RefCountedGLsync fence(GL_SYNC_GPU_COMMANDS_COMPLETE, /*flags=*/0);
 		check_error();
-		assert(fence != nullptr);
+		assert(fence.get() != nullptr);
 
 		if (field == 1) {
 			// Don't upload the second field as fast as we can; wait until
@@ -647,9 +658,9 @@ void Mixer::thread_func()
 			// The new texture might still be uploaded,
 			// tell the GPU to wait until it's there.
 			if (new_frame->ready_fence) {
-				glWaitSync(new_frame->ready_fence, /*flags=*/0, GL_TIMEOUT_IGNORED);
+				glWaitSync(new_frame->ready_fence.get(), /*flags=*/0, GL_TIMEOUT_IGNORED);
 				check_error();
-				glDeleteSync(new_frame->ready_fence);
+				new_frame->ready_fence.reset();
 				check_error();
 			}
 		}