/*
- Copyright (C) 2016-2020 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2016-2021 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
*/
+
#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
{
return _data.size ();
}
+
bool
VideoRingBuffers::empty () const
{
return _data.empty ();
}
+
void
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()));
}
VideoRingBuffers::reset_metadata (shared_ptr<const Film> film, dcp::Size player_video_container_size)
{
boost::mutex::scoped_lock lm (_mutex);
- for (list<pair<shared_ptr<PlayerVideo>, DCPTime> >::const_iterator i = _data.begin(); i != _data.end(); ++i) {
- i->first->reset_metadata (film, player_video_container_size);
+ for (auto const& i: _data) {
+ i.first->reset_metadata (film, player_video_container_size);
}
}