X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=futatabi%2Fvideo_stream.cpp;h=66323b88749afc17a7142c51cc7b2e017ee61758;hb=2b37c51ea17b77b88e2f7fda443109acc260aa8f;hp=dcf44f8e452fb9277e25bd08eafd681d0ed286b4;hpb=b2313d869262960aa3bcaaf3f45f2a3b90d1fc18;p=nageru

diff --git a/futatabi/video_stream.cpp b/futatabi/video_stream.cpp
index dcf44f8..66323b8 100644
--- a/futatabi/video_stream.cpp
+++ b/futatabi/video_stream.cpp
@@ -6,14 +6,14 @@ extern "C" {
 }
 
 #include "chroma_subsampler.h"
-#include "shared/context.h"
 #include "flags.h"
 #include "flow.h"
-#include "shared/httpd.h"
 #include "jpeg_frame_view.h"
 #include "movit/util.h"
-#include "shared/mux.h"
 #include "player.h"
+#include "shared/context.h"
+#include "shared/httpd.h"
+#include "shared/mux.h"
 #include "util.h"
 #include "ycbcr_converter.h"
 
@@ -264,7 +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, 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);
 }
@@ -282,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);
 	}
 
@@ -323,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();
 }
@@ -342,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;
@@ -391,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();
 }
@@ -411,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;
@@ -517,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();
 }
@@ -532,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();
 }
@@ -585,7 +585,7 @@ void VideoStream::encode_thread_func()
 			unique_lock<mutex> lock(queue_lock);
 
 			// Wait until we have a frame to play.
-			queue_changed.wait(lock, [this]{
+			queue_changed.wait(lock, [this] {
 				return !frame_queue.empty() || should_quit;
 			});
 			if (should_quit) {
@@ -599,7 +599,7 @@ void VideoStream::encode_thread_func()
 			if (output_fast_forward) {
 				aborted = frame_queue.empty() || frame_queue.front().local_pts != frame_start;
 			} else {
-				aborted = queue_changed.wait_until(lock, frame_start, [this, frame_start]{
+				aborted = queue_changed.wait_until(lock, frame_start, [this, frame_start] {
 					return frame_queue.empty() || frame_queue.front().local_pts != frame_start;
 				});
 			}