X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=nageru%2Fmixer.cpp;h=c91857e62fbab09b3677fcebba41402235feabc6;hb=9ffd4f03f314cc6e0254449593def95c9bc203d6;hp=d1b52ef2dc54b4a9db8ad84e755bbadc4ac76411;hpb=39889eeed810016fd7d277d8bbfcc58e6f305c82;p=nageru

diff --git a/nageru/mixer.cpp b/nageru/mixer.cpp
index d1b52ef..c91857e 100644
--- a/nageru/mixer.cpp
+++ b/nageru/mixer.cpp
@@ -432,7 +432,7 @@ Mixer::Mixer(const QSurfaceFormat &format, unsigned num_cards)
 	for (unsigned video_card_index = 0; video_card_index < video_inputs.size(); ++card_index, ++video_card_index) {
 		if (card_index >= MAX_VIDEO_CARDS) {
 			fprintf(stderr, "ERROR: Not enough card slots available for the videos the theme requested.\n");
-			exit(1);
+			abort();
 		}
 		configure_card(card_index, video_inputs[video_card_index], CardType::FFMPEG_INPUT, /*output=*/nullptr);
 		video_inputs[video_card_index]->set_card_index(card_index);
@@ -445,7 +445,7 @@ Mixer::Mixer(const QSurfaceFormat &format, unsigned num_cards)
 	for (unsigned html_card_index = 0; html_card_index < html_inputs.size(); ++card_index, ++html_card_index) {
 		if (card_index >= MAX_VIDEO_CARDS) {
 			fprintf(stderr, "ERROR: Not enough card slots available for the HTML inputs the theme requested.\n");
-			exit(1);
+			abort();
 		}
 		configure_card(card_index, html_inputs[html_card_index], CardType::CEF_INPUT, /*output=*/nullptr);
 		html_inputs[html_card_index]->set_card_index(card_index);
@@ -466,7 +466,7 @@ Mixer::Mixer(const QSurfaceFormat &format, unsigned num_cards)
 		if (!v210Converter::has_hardware_support()) {
 			fprintf(stderr, "ERROR: --ten-bit-input requires support for OpenGL compute shaders\n");
 			fprintf(stderr, "       (OpenGL 4.3, or GL_ARB_compute_shader + GL_ARB_shader_image_load_store).\n");
-			exit(1);
+			abort();
 		}
 		v210_converter.reset(new v210Converter());
 
@@ -483,7 +483,7 @@ Mixer::Mixer(const QSurfaceFormat &format, unsigned num_cards)
 		if (!v210Converter::has_hardware_support()) {
 			fprintf(stderr, "ERROR: --ten-bit-output requires support for OpenGL compute shaders\n");
 			fprintf(stderr, "       (OpenGL 4.3, or GL_ARB_compute_shader + GL_ARB_shader_image_load_store).\n");
-			exit(1);
+			abort();
 		}
 	}
 
@@ -551,7 +551,7 @@ void Mixer::configure_card(unsigned card_index, CaptureInterface *capture, CardT
 
 	card->capture->set_frame_callback(bind(&Mixer::bm_frame, this, card_index, _1, _2, _3, _4, _5, _6, _7));
 	if (card->frame_allocator == nullptr) {
-		card->frame_allocator.reset(new PBOFrameAllocator(pixel_format, 8 << 20, global_flags.width, global_flags.height));  // 8 MB.
+		card->frame_allocator.reset(new PBOFrameAllocator(pixel_format, 8 << 20, global_flags.width, global_flags.height, card_index, mjpeg_encoder.get()));  // 8 MB.
 	}
 	card->capture->set_video_frame_allocator(card->frame_allocator.get());
 	if (card->surface == nullptr) {
@@ -824,7 +824,7 @@ void Mixer::bm_frame(unsigned card_index, uint16_t timecode,
 	if (video_frame.len - video_offset == 0 ||
 	    video_frame.len - video_offset != expected_length) {
 		if (video_frame.len != 0) {
-			printf("%s: Dropping video frame with wrong length (%ld; expected %ld)\n",
+			printf("%s: Dropping video frame with wrong length (%zu; expected %zu)\n",
 				spec_to_string(device).c_str(), video_frame.len - video_offset, expected_length);
 		}
 		if (video_frame.owner) {
@@ -998,7 +998,7 @@ void Mixer::thread_func()
 	QOpenGLContext *context = create_context(mixer_surface);
 	if (!make_current(context, mixer_surface)) {
 		printf("oops\n");
-		exit(1);
+		abort();
 	}
 
 	// Start the actual capture. (We don't want to do it before we're actually ready
@@ -1081,12 +1081,10 @@ void Mixer::thread_func()
 				new_frame->upload_func = nullptr;
 			}
 
-			// Only bother doing MJPEG encoding if there are any connected clients
-			// that want the stream. FIXME: We should also stop memcpy-ing if there are none!
-			if (httpd.get_num_connected_multicam_clients() > 0) {
-				auto stream_it = global_flags.card_to_mjpeg_stream_export.find(card_index);
-				if (stream_it != global_flags.card_to_mjpeg_stream_export.end()) {
-					mjpeg_encoder->upload_frame(pts_int, stream_it->second, new_frame->frame, new_frame->video_format, new_frame->y_offset, new_frame->cbcr_offset);
+			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);
 				}
 			}
 		}