X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=mixer.cpp;h=1a4a3f9d3c292f4d4aaa85a4415c8420bc1083b7;hb=59d1397c90bd594efb80734a2e6f213fb8c5e584;hp=b6824d51ef3911034ac700d1a4a2295e3d57fa1b;hpb=196392c483a9cbf7fd7b572d9242aa283031453f;p=nageru

diff --git a/mixer.cpp b/mixer.cpp
index b6824d5..1a4a3f9 100644
--- a/mixer.cpp
+++ b/mixer.cpp
@@ -74,7 +74,6 @@ void insert_new_frame(RefCountedFrame frame, unsigned field_num, bool interlaced
 	}
 }
 
-
 }  // namespace
 
 Mixer::Mixer(const QSurfaceFormat &format, unsigned num_cards)
@@ -146,8 +145,6 @@ Mixer::Mixer(const QSurfaceFormat &format, unsigned num_cards)
 		cards[card_index].usb->start_bm_capture();
 	}
 
-	//chain->enable_phase_timing(true);
-
 	// Set up stuff for NV12 conversion.
 
 	// Cb/Cr shader.
@@ -159,7 +156,8 @@ Mixer::Mixer(const QSurfaceFormat &format, unsigned num_cards)
 		"void main() { \n"
 		"    gl_FragColor = texture2D(cbcr_tex, tc0); \n"
 		"} \n";
-	cbcr_program_num = resource_pool->compile_glsl_program(cbcr_vert_shader, cbcr_frag_shader);
+	vector<string> frag_shader_outputs;
+	cbcr_program_num = resource_pool->compile_glsl_program(cbcr_vert_shader, cbcr_frag_shader, frag_shader_outputs);
 
 	r128.init(2, OUTPUT_FREQUENCY);
 	r128.integr_start();
@@ -206,7 +204,7 @@ float find_peak(const float *samples, size_t num_samples)
 {
 	float m = fabs(samples[0]);
 	for (size_t i = 1; i < num_samples; ++i) {
-		m = std::max(m, fabs(samples[i]));
+		m = max(m, fabs(samples[i]));
 	}
 	return m;
 }
@@ -314,11 +312,12 @@ void Mixer::bm_frame(unsigned card_index, uint16_t timecode,
 		if (card->should_quit) return;
 	}
 
+	size_t expected_length = width * (height + extra_lines_top + extra_lines_bottom) * 2;
 	if (video_frame.len - video_offset == 0 ||
-	    video_frame.len - video_offset != size_t(width * (height + extra_lines_top + extra_lines_bottom) * 2)) {
+	    video_frame.len - video_offset != expected_length) {
 		if (video_frame.len != 0) {
-			printf("Card %d: Dropping video frame with wrong length (%ld)\n",
-				card_index, video_frame.len - video_offset);
+			printf("Card %d: Dropping video frame with wrong length (%ld; expected %ld)\n",
+				card_index, video_frame.len - video_offset, expected_length);
 		}
 		if (video_frame.owner) {
 			video_frame.owner->release_frame(video_frame);
@@ -344,9 +343,8 @@ void Mixer::bm_frame(unsigned card_index, uint16_t timecode,
 	unsigned num_fields = interlaced ? 2 : 1;
 	timespec frame_upload_start;
 	if (interlaced) {
-		// NOTE: This isn't deinterlacing. This is just sending the two fields along
-		// as separate frames without considering anything like the half-field offset.
-		// We'll need to add a proper deinterlacer on the receiving side to get this right.
+		// Send the two fields along as separate frames; the other side will need to add
+		// a deinterlacer to actually get this right.
 		assert(height % 2 == 0);
 		height /= 2;
 		assert(frame_length % 2 == 0);
@@ -354,6 +352,9 @@ void Mixer::bm_frame(unsigned card_index, uint16_t timecode,
 		num_fields = 2;
 		clock_gettime(CLOCK_MONOTONIC, &frame_upload_start);
 	}
+	userdata->last_interlaced = interlaced;
+	userdata->last_frame_rate_nom = frame_rate_nom;
+	userdata->last_frame_rate_den = frame_rate_den;
 	RefCountedFrame new_frame(video_frame);
 
 	// Upload the textures.
@@ -387,10 +388,8 @@ void Mixer::bm_frame(unsigned card_index, uint16_t timecode,
 		check_error();
 		glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, pbo);
 		check_error();
-		glFlushMappedBufferRange(GL_PIXEL_UNPACK_BUFFER, 0, video_frame.size);
+		glMemoryBarrier(GL_CLIENT_MAPPED_BUFFER_BARRIER_BIT);
 		check_error();
-		//glMemoryBarrier(GL_CLIENT_MAPPED_BUFFER_BARRIER_BIT);
-		//check_error();
 
 		glBindTexture(GL_TEXTURE_2D, userdata->tex_cbcr[field]);
 		check_error();
@@ -561,6 +560,7 @@ void Mixer::thread_func()
 		Theme::Chain theme_main_chain = theme->get_chain(0, pts(), WIDTH, HEIGHT, input_state);
 		EffectChain *chain = theme_main_chain.chain;
 		theme_main_chain.setup_chain();
+		//theme_main_chain.chain->enable_phase_timing(true);
 
 		GLuint y_tex, cbcr_tex;
 		bool got_frame = h264_encoder->begin_frame(&y_tex, &cbcr_tex);