X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=futatabi%2Fvideo_stream.cpp;h=7c2f8f90464c3af487c119bf8962830ae299b831;hb=4b0234d5b2bce39ce701d0bf264ab2257e7ddd01;hp=27e2c4a81e499ddc031b21434c05fd0490f1f37f;hpb=94a228f7473325130704e96c82937b690703615b;p=nageru

diff --git a/futatabi/video_stream.cpp b/futatabi/video_stream.cpp
index 27e2c4a..7c2f8f9 100644
--- a/futatabi/video_stream.cpp
+++ b/futatabi/video_stream.cpp
@@ -264,8 +264,7 @@ void VideoStream::start()
 
 	size_t width = global_flags.width, height = global_flags.height;  // Doesn't matter for MJPEG.
 	mux.reset(new Mux(avctx, width, height, Mux::CODEC_MJPEG, /*video_extradata=*/"", /*audio_codec_parameters=*/nullptr,
-		AVCOL_SPC_BT709, Mux::WITHOUT_AUDIO,
-		COARSE_TIMEBASE, /*write_callback=*/nullptr, Mux::WRITE_FOREGROUND, {}));
+		AVCOL_SPC_BT709, COARSE_TIMEBASE, /*write_callback=*/nullptr, Mux::WRITE_FOREGROUND, {}));
 
 	encode_thread = thread(&VideoStream::encode_thread_func, this);
 }
@@ -283,7 +282,7 @@ void VideoStream::clear_queue()
 	deque<QueuedFrame> q;
 
 	{
-		unique_lock<mutex> lock(queue_lock);
+		lock_guard<mutex> lock(queue_lock);
 		q = move(frame_queue);
 	}
 
@@ -324,7 +323,7 @@ void VideoStream::schedule_original_frame(steady_clock::time_point local_pts,
 	qf.display_func = move(display_func);
 	qf.queue_spot_holder = move(queue_spot_holder);
 
-	unique_lock<mutex> lock(queue_lock);
+	lock_guard<mutex> lock(queue_lock);
 	frame_queue.push_back(move(qf));
 	queue_changed.notify_all();
 }
@@ -343,7 +342,7 @@ void VideoStream::schedule_faded_frame(steady_clock::time_point local_pts, int64
 	// separate pools around.)
 	BorrowedInterpolatedFrameResources resources;
 	{
-		unique_lock<mutex> lock(queue_lock);
+		lock_guard<mutex> lock(queue_lock);
 		if (interpolate_resources.empty()) {
 			fprintf(stderr, "WARNING: Too many interpolated frames already in transit; dropping one.\n");
 			return;
@@ -392,7 +391,7 @@ void VideoStream::schedule_faded_frame(steady_clock::time_point local_pts, int64
 	qf.resources = move(resources);
 	qf.local_pts = local_pts;
 
-	unique_lock<mutex> lock(queue_lock);
+	lock_guard<mutex> lock(queue_lock);
 	frame_queue.push_back(move(qf));
 	queue_changed.notify_all();
 }
@@ -412,7 +411,7 @@ void VideoStream::schedule_interpolated_frame(steady_clock::time_point local_pts
 	// Get the temporary OpenGL resources we need for doing the interpolation.
 	BorrowedInterpolatedFrameResources resources;
 	{
-		unique_lock<mutex> lock(queue_lock);
+		lock_guard<mutex> lock(queue_lock);
 		if (interpolate_resources.empty()) {
 			fprintf(stderr, "WARNING: Too many interpolated frames already in transit; dropping one.\n");
 			return;
@@ -518,7 +517,7 @@ void VideoStream::schedule_interpolated_frame(steady_clock::time_point local_pts
 	check_error();
 	qf.resources = move(resources);
 
-	unique_lock<mutex> lock(queue_lock);
+	lock_guard<mutex> lock(queue_lock);
 	frame_queue.push_back(move(qf));
 	queue_changed.notify_all();
 }
@@ -533,7 +532,7 @@ void VideoStream::schedule_refresh_frame(steady_clock::time_point local_pts,
 	qf.display_func = move(display_func);
 	qf.queue_spot_holder = move(queue_spot_holder);
 
-	unique_lock<mutex> lock(queue_lock);
+	lock_guard<mutex> lock(queue_lock);
 	frame_queue.push_back(move(qf));
 	queue_changed.notify_all();
 }