X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=nageru%2Fmixer.cpp;h=1457aa92316e56400563feeea8a0185b5c76fb4e;hb=0a338eed8f26adaf202e0cadc88b533ce9fa173d;hp=83d6eada183d8f0f787c1f9703211915db790917;hpb=533f00a9b992d06767737f9db236b4cf76b9c124;p=nageru

diff --git a/nageru/mixer.cpp b/nageru/mixer.cpp
index 83d6ead..1457aa9 100644
--- a/nageru/mixer.cpp
+++ b/nageru/mixer.cpp
@@ -4,6 +4,7 @@
 
 #include <assert.h>
 #include <epoxy/egl.h>
+#include <movit/effect.h>
 #include <movit/effect_chain.h>
 #include <movit/effect_util.h>
 #include <movit/flat_input.h>
@@ -153,11 +154,8 @@ void ensure_texture_resolution(PBOFrameAllocator::Userdata *userdata, unsigned f
 		case PixelFormat_8BitBGRA:
 			glBindTexture(GL_TEXTURE_2D, userdata->tex_rgba[field]);
 			check_error();
-			if (global_flags.can_disable_srgb_decoder) {  // See the comments in tweaked_inputs.h.
-				glTexImage2D(GL_TEXTURE_2D, 0, GL_SRGB8_ALPHA8, width, height, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, nullptr);
-			} else {
-				glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, width, height, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, nullptr);
-			}
+			// NOTE: sRGB may be disabled by sRGBSwitchingFlatInput.
+			glTexImage2D(GL_TEXTURE_2D, 0, GL_SRGB8_ALPHA8, width, height, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, nullptr);
 			check_error();
 			break;
 		default:
@@ -314,10 +312,11 @@ Mixer::Mixer(const QSurfaceFormat &format, unsigned num_cards)
 	CHECK(init_movit(MOVIT_SHADER_DIR, MOVIT_DEBUG_OFF));
 	check_error();
 
-	// This nearly always should be true.
-	global_flags.can_disable_srgb_decoder =
-		epoxy_has_gl_extension("GL_EXT_texture_sRGB_decode") &&
-		epoxy_has_gl_extension("GL_ARB_sampler_objects");
+	if (!epoxy_has_gl_extension("GL_EXT_texture_sRGB_decode") ||
+	    !epoxy_has_gl_extension("GL_ARB_sampler_objects")) {
+		fprintf(stderr, "Nageru requires GL_EXT_texture_sRGB_decode and GL_ARB_sampler_objects to run.\n");
+		exit(1);
+	}
 
 	// Since we allow non-bouncing 4:2:2 YCbCrInputs, effective subpixel precision
 	// will be halved when sampling them, and we need to compensate here.
@@ -1119,7 +1118,8 @@ void Mixer::thread_func()
 			if (new_frame->frame->data_copy != nullptr) {
 				int mjpeg_card_index = mjpeg_encoder->get_mjpeg_stream_for_card(card_index);
 				if (mjpeg_card_index != -1) {
-					mjpeg_encoder->upload_frame(pts_int, mjpeg_card_index, new_frame->frame, new_frame->video_format, new_frame->y_offset, new_frame->cbcr_offset, move(raw_audio[card_index]));
+					RGBTriplet white_balance = theme->get_white_balance_for_signal(card_index);
+					mjpeg_encoder->upload_frame(pts_int, mjpeg_card_index, new_frame->frame, new_frame->video_format, new_frame->y_offset, new_frame->cbcr_offset, move(raw_audio[card_index]), white_balance);
 				}
 			}
 		}
@@ -1272,7 +1272,7 @@ start:
 				// we dropped. (may_have_dropped_last_frame is set whenever we
 				// trim the queue completely away, and cleared when we actually
 				// get a new frame.)
-				((CEFCapture *)card->capture.get())->request_new_frame();
+				((CEFCapture *)card->capture.get())->request_new_frame(/*ignore_if_locked=*/true);
 			}
 #endif
 		} else {