X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=mixer.cpp;h=efd4952b7e565f379128673e11f2a7089d46c644;hb=dcbd18f44037f097b26aed93fde11392906d86ea;hp=081bad513d689e02cce914c1fd18e535afc16393;hpb=91a7ea89794ae1868b949d902a4acc6d670d1bbd;p=nageru

diff --git a/mixer.cpp b/mixer.cpp
index 081bad5..efd4952 100644
--- a/mixer.cpp
+++ b/mixer.cpp
@@ -33,7 +33,7 @@
 #include "decklink_capture.h"
 #include "defs.h"
 #include "flags.h"
-#include "h264encode.h"
+#include "quicksync_encoder.h"
 #include "pbo_frame_allocator.h"
 #include "ref_counted_gl_sync.h"
 #include "timebase.h"
@@ -139,7 +139,7 @@ void QueueLengthPolicy::update_policy(int queue_length)
 }
 
 Mixer::Mixer(const QSurfaceFormat &format, unsigned num_cards)
-	: httpd(WIDTH, HEIGHT),
+	: httpd(),
 	  num_cards(num_cards),
 	  mixer_surface(create_surface(format)),
 	  h264_encoder_surface(create_surface(format)),
@@ -148,9 +148,6 @@ Mixer::Mixer(const QSurfaceFormat &format, unsigned num_cards)
 	  limiter(OUTPUT_FREQUENCY),
 	  compressor(OUTPUT_FREQUENCY)
 {
-	httpd.open_output_file(generate_local_dump_filename(/*frame=*/0).c_str());
-	httpd.start(9095);
-
 	CHECK(init_movit(MOVIT_SHADER_DIR, MOVIT_DEBUG_OFF));
 	check_error();
 
@@ -177,7 +174,11 @@ Mixer::Mixer(const QSurfaceFormat &format, unsigned num_cards)
 	display_chain->set_dither_bits(0);  // Don't bother.
 	display_chain->finalize();
 
-	h264_encoder.reset(new H264Encoder(h264_encoder_surface, global_flags.va_display, WIDTH, HEIGHT, &httpd));
+	quicksync_encoder.reset(new QuickSyncEncoder(h264_encoder_surface, global_flags.va_display, WIDTH, HEIGHT, &httpd));
+	quicksync_encoder->open_output_file(generate_local_dump_filename(/*frame=*/0).c_str());
+
+	// Start listening for clients only once H264Encoder has written its header, if any.
+	httpd.start(9095);
 
 	// First try initializing the PCI devices, then USB, until we have the desired number of cards.
 	unsigned num_pci_devices = 0, num_usb_devices = 0;
@@ -291,7 +292,7 @@ Mixer::~Mixer()
 		cards[card_index].capture->stop_dequeue_thread();
 	}
 
-	h264_encoder.reset(nullptr);
+	quicksync_encoder.reset(nullptr);
 }
 
 void Mixer::configure_card(unsigned card_index, const QSurfaceFormat &format, CaptureInterface *capture)
@@ -675,9 +676,10 @@ void Mixer::thread_func()
 			}
 		}
 
-		render_one_frame();
+		int64_t duration = new_frames[master_card_index].length;
+		render_one_frame(duration);
 		++frame;
-		pts_int += new_frames[master_card_index].length;
+		pts_int += duration;
 
 		clock_gettime(CLOCK_MONOTONIC, &now);
 		double elapsed = now.tv_sec - start.tv_sec +
@@ -692,10 +694,10 @@ void Mixer::thread_func()
 		if (should_cut.exchange(false)) {  // Test and clear.
 			string filename = generate_local_dump_filename(frame);
 			printf("Starting new recording: %s\n", filename.c_str());
-			h264_encoder->shutdown();
-			httpd.close_output_file();
-			httpd.open_output_file(filename.c_str());
-			h264_encoder.reset(new H264Encoder(h264_encoder_surface, global_flags.va_display, WIDTH, HEIGHT, &httpd));
+			quicksync_encoder->close_output_file();
+			quicksync_encoder->shutdown();
+			quicksync_encoder.reset(new QuickSyncEncoder(h264_encoder_surface, global_flags.va_display, WIDTH, HEIGHT, &httpd));
+			quicksync_encoder->open_output_file(filename.c_str());
 		}
 
 #if 0
@@ -773,7 +775,7 @@ void Mixer::schedule_audio_resampling_tasks(unsigned dropped_frames, int num_sam
 	}
 }
 
-void Mixer::render_one_frame()
+void Mixer::render_one_frame(int64_t duration)
 {
 	// Get the main chain from the theme, and set its state immediately.
 	Theme::Chain theme_main_chain = theme->get_chain(0, pts(), WIDTH, HEIGHT, input_state);
@@ -782,7 +784,7 @@ void Mixer::render_one_frame()
 	//theme_main_chain.chain->enable_phase_timing(true);
 
 	GLuint y_tex, cbcr_tex;
-	bool got_frame = h264_encoder->begin_frame(&y_tex, &cbcr_tex);
+	bool got_frame = quicksync_encoder->begin_frame(&y_tex, &cbcr_tex);
 	assert(got_frame);
 
 	// Render main chain.
@@ -804,7 +806,7 @@ void Mixer::render_one_frame()
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
 
 	const int64_t av_delay = TIMEBASE / 10;  // Corresponds to the fixed delay in resampling_queue.h. TODO: Make less hard-coded.
-	RefCountedGLsync fence = h264_encoder->end_frame(pts_int + av_delay, theme_main_chain.input_frames);
+	RefCountedGLsync fence = quicksync_encoder->end_frame(pts_int + av_delay, duration, theme_main_chain.input_frames);
 
 	// The live frame just shows the RGBA texture we just rendered.
 	// It owns rgba_tex now.
@@ -1025,7 +1027,7 @@ void Mixer::process_audio_one_frame(int64_t frame_pts_int, int num_samples)
 	}
 
 	// And finally add them to the output.
-	h264_encoder->add_audio(frame_pts_int, move(samples_out));
+	quicksync_encoder->add_audio(frame_pts_int, move(samples_out));
 }
 
 void Mixer::subsample_chroma(GLuint src_tex, GLuint dst_tex)
@@ -1204,3 +1206,5 @@ void Mixer::OutputChannel::set_frame_ready_callback(Mixer::new_frame_ready_callb
 	new_frame_ready_callback = callback;
 	has_new_frame_ready_callback = true;
 }
+
+mutex RefCountedGLsync::fence_lock;