X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=mixer.cpp;h=e928ed9945319b38eec6585e3b8b11fb3deb8a8d;hb=42b11cadbe511cb6f33dd9619ade70e2c785a95e;hp=384047a6b63b2df30f056b7daf0ec1d73dc98d37;hpb=a4adb2fc87296268a86e2303f77ca0fe20664ca2;p=nageru

diff --git a/mixer.cpp b/mixer.cpp
index 384047a..e928ed9 100644
--- a/mixer.cpp
+++ b/mixer.cpp
@@ -146,8 +146,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.
@@ -388,10 +386,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();
@@ -562,6 +558,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);