X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=mixer.cpp;h=ca55be0c470f44234f307e09572b08fd30679f1a;hb=b4f16ea9f8969a3ba14be8cd9c88cfe00d19533b;hp=4a758c0defc7c567caad281c5dc0097e200ea297;hpb=02083dca89292d6ba95642cf8957f1cee8826313;p=nageru

diff --git a/mixer.cpp b/mixer.cpp
index 4a758c0..ca55be0 100644
--- a/mixer.cpp
+++ b/mixer.cpp
@@ -1,5 +1,6 @@
 #define WIDTH 1280
 #define HEIGHT 720
+#define EXTRAHEIGHT 30
 
 #undef Success
 
@@ -73,6 +74,8 @@ Mixer::Mixer(const QSurfaceFormat &format)
 	: mixer_surface(create_surface(format)),
 	  h264_encoder_surface(create_surface(format))
 {
+	httpd.start(9095);
+
 	CHECK(init_movit(MOVIT_SHADER_DIR, MOVIT_DEBUG_OFF));
 	check_error();
 
@@ -96,14 +99,14 @@ Mixer::Mixer(const QSurfaceFormat &format)
 	display_chain->set_dither_bits(0);  // Don't bother.
 	display_chain->finalize();
 
-	h264_encoder.reset(new H264Encoder(h264_encoder_surface, WIDTH, HEIGHT, "test.mp4"));
+	h264_encoder.reset(new H264Encoder(h264_encoder_surface, WIDTH, HEIGHT, "test.ts", &httpd));
 
 	for (int card_index = 0; card_index < NUM_CARDS; ++card_index) {
 		printf("Configuring card %d...\n", card_index);
 		CaptureCard *card = &cards[card_index];
 		card->usb = new BMUSBCapture(0x1edb, card_index == 0 ? 0xbd3b : 0xbd4f);
 		card->usb->set_frame_callback(bind(&Mixer::bm_frame, this, card_index, _1, _2, _3, _4, _5, _6, _7));
-		card->frame_allocator.reset(new PBOFrameAllocator(1280 * 750 * 2 + 44, 1280, 720));
+		card->frame_allocator.reset(new PBOFrameAllocator(WIDTH * (HEIGHT+EXTRAHEIGHT) * 2 + 44, WIDTH, HEIGHT));
 		card->usb->set_video_frame_allocator(card->frame_allocator.get());
 		card->surface = create_surface(format);
 		card->usb->set_dequeue_thread_callbacks(
@@ -241,7 +244,7 @@ void Mixer::bm_frame(int card_index, uint16_t timecode,
 		if (card->should_quit) return;
 	}
 
-	if (video_frame.len - video_offset != 1280 * 750 * 2) {
+	if (video_frame.len - video_offset != WIDTH * (HEIGHT+EXTRAHEIGHT) * 2) {
 		if (video_frame.len != 0) {
 			printf("Card %d: Dropping video frame with wrong length (%ld)\n",
 				card_index, video_frame.len - video_offset);
@@ -276,11 +279,11 @@ void Mixer::bm_frame(int card_index, uint16_t timecode,
 	// Upload the textures.
 	glBindTexture(GL_TEXTURE_2D, userdata->tex_y);
 	check_error();
-	glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 1280, 720, GL_RED, GL_UNSIGNED_BYTE, BUFFER_OFFSET((1280 * 750 * 2 + 44) / 2 + 1280 * 25 + 22));
+	glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, WIDTH, HEIGHT, GL_RED, GL_UNSIGNED_BYTE, BUFFER_OFFSET((WIDTH * (HEIGHT+EXTRAHEIGHT) * 2 + 44) / 2 + WIDTH * 25 + 22));
 	check_error();
 	glBindTexture(GL_TEXTURE_2D, userdata->tex_cbcr);
 	check_error();
-	glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 1280/2, 720, GL_RG, GL_UNSIGNED_BYTE, BUFFER_OFFSET(1280 * 25 + 22));
+	glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, WIDTH/2, HEIGHT, GL_RG, GL_UNSIGNED_BYTE, BUFFER_OFFSET(WIDTH * 25 + 22));
 	check_error();
 	glBindTexture(GL_TEXTURE_2D, 0);
 	check_error();
@@ -424,7 +427,8 @@ void Mixer::thread_func()
 		for (int card_index = 0; card_index < NUM_CARDS; ++card_index) {
 			input_frames.push_back(bmusb_current_rendering_frame[card_index]);
 		}
-		h264_encoder->end_frame(fence, pts_int, input_frames);
+		const int64_t av_delay = TIMEBASE / 10;  // Corresponds to the fixed delay in resampler.h. TODO: Make less hard-coded.
+		h264_encoder->end_frame(fence, pts_int + av_delay, input_frames);
 		++frame;
 		pts_int += TIMEBASE / 60;