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

diff --git a/mixer.cpp b/mixer.cpp
index ca55be0..59f520a 100644
--- a/mixer.cpp
+++ b/mixer.cpp
@@ -71,7 +71,8 @@ void convert_fixed24_to_fp32(float *dst, size_t out_channels, const uint8_t *src
 }  // namespace
 
 Mixer::Mixer(const QSurfaceFormat &format)
-	: mixer_surface(create_surface(format)),
+	: httpd("test.ts", WIDTH, HEIGHT),
+	  mixer_surface(create_surface(format)),
 	  h264_encoder_surface(create_surface(format))
 {
 	httpd.start(9095);
@@ -99,12 +100,12 @@ 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.ts", &httpd));
+	h264_encoder.reset(new H264Encoder(h264_encoder_surface, WIDTH, HEIGHT, &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 = new BMUSBCapture(card_index);
 		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(WIDTH * (HEIGHT+EXTRAHEIGHT) * 2 + 44, WIDTH, HEIGHT));
 		card->usb->set_video_frame_allocator(card->frame_allocator.get());
@@ -117,7 +118,6 @@ Mixer::Mixer(const QSurfaceFormat &format)
 					printf("failed to create bmusb context\n");
 					exit(1);
 				}
-				printf("inited!\n");
 			},
 			[this]{
 				resource_pool->clean_context();