X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_ring_buffers.cc;h=63c52ee068879c0b262268ca94589b8c80928781;hb=ff639b3cf30afcc097bfd21d39c8d15f466cadd6;hp=bfec507ea4f84a5b22e82271e5966e33e9771e2a;hpb=c4403784febdbdd42e9c32e67fadb147f11fe566;p=dcpomatic.git

diff --git a/src/lib/video_ring_buffers.cc b/src/lib/video_ring_buffers.cc
index bfec507ea..63c52ee06 100644
--- a/src/lib/video_ring_buffers.cc
+++ b/src/lib/video_ring_buffers.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2016-2017 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2016-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,41 +18,45 @@
 
 */
 
+
 #include "video_ring_buffers.h"
 #include "player_video.h"
 #include "compose.hpp"
-#include <boost/foreach.hpp>
 #include <list>
 #include <iostream>
 
+
 using std::list;
 using std::make_pair;
 using std::cout;
 using std::pair;
 using std::string;
-using boost::shared_ptr;
+using std::shared_ptr;
 using boost::optional;
 using namespace dcpomatic;
 
+
 void
 VideoRingBuffers::put (shared_ptr<PlayerVideo> frame, DCPTime time)
 {
 	boost::mutex::scoped_lock lm (_mutex);
-	_data.push_back (make_pair (frame, time));
+	_data.push_back (make_pair(frame, time));
 }
 
+
 pair<shared_ptr<PlayerVideo>, DCPTime>
 VideoRingBuffers::get ()
 {
 	boost::mutex::scoped_lock lm (_mutex);
 	if (_data.empty ()) {
-		return make_pair(shared_ptr<PlayerVideo>(), DCPTime());
+		return {};
 	}
-	pair<shared_ptr<PlayerVideo>, DCPTime> const r = _data.front ();
+	auto const r = _data.front();
 	_data.pop_front ();
 	return r;
 }
 
+
 Frame
 VideoRingBuffers::size () const
 {
@@ -60,6 +64,7 @@ VideoRingBuffers::size () const
 	return _data.size ();
 }
 
+
 bool
 VideoRingBuffers::empty () const
 {
@@ -67,6 +72,7 @@ VideoRingBuffers::empty () const
 	return _data.empty ();
 }
 
+
 void
 VideoRingBuffers::clear ()
 {
@@ -74,12 +80,25 @@ VideoRingBuffers::clear ()
 	_data.clear ();
 }
 
+
 pair<size_t, string>
 VideoRingBuffers::memory_used () const
 {
+	boost::mutex::scoped_lock lm (_mutex);
 	size_t m = 0;
-	for (list<pair<shared_ptr<PlayerVideo>, DCPTime> >::const_iterator i = _data.begin(); i != _data.end(); ++i) {
-		m += i->first->memory_used();
+	for (auto const& i: _data) {
+		m += i.first->memory_used();
 	}
 	return make_pair(m, String::compose("%1 frames", _data.size()));
 }
+
+
+void
+VideoRingBuffers::reset_metadata (shared_ptr<const Film> film, dcp::Size player_video_container_size)
+{
+	boost::mutex::scoped_lock lm (_mutex);
+	for (auto const& i: _data) {
+		i.first->reset_metadata (film, player_video_container_size);
+	}
+}
+