/*
- Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
#include "ffmpeg_content.h"
#include "image_decoder.h"
#include "content_factory.h"
+#include "dcp_content.h"
#include "job.h"
#include "config.h"
#include "util.h"
#include <libxml++/libxml++.h>
#include <boost/shared_ptr.hpp>
#include <boost/foreach.hpp>
+#include <iostream>
#include "i18n.h"
void
Playlist::content_changed (weak_ptr<Content> content, int property, bool frequent)
{
- /* Don't respond to position changes here, as:
- - sequencing after earlier/later changes is handled by move_earlier/move_later
- - any other position changes will be timeline drags which should not result in content
- being sequenced.
- */
-
if (property == ContentProperty::LENGTH || property == VideoContentProperty::VIDEO_FRAME_TYPE) {
+ /* Don't respond to position changes here, as:
+ - sequencing after earlier/later changes is handled by move_earlier/move_later
+ - any other position changes will be timeline drags which should not result in content
+ being sequenced.
+ */
maybe_sequence_video ();
}
+ if (
+ property == ContentProperty::POSITION ||
+ property == ContentProperty::LENGTH ||
+ property == ContentProperty::TRIM_START ||
+ property == ContentProperty::TRIM_END) {
+
+ ContentList old = _content;
+ sort (_content.begin(), _content.end(), ContentSorter ());
+ if (_content != old) {
+ OrderChanged ();
+ }
+ }
+
ContentChanged (content, property, frequent);
}
if (vc->video_frame_type() == VIDEO_FRAME_TYPE_3D_RIGHT) {
vc->set_position (next_right);
- next_right = vc->end() + DCPTime::delta ();
+ next_right = vc->end();
} else {
vc->set_position (next_left);
- next_left = vc->end() + DCPTime::delta ();
+ next_left = vc->end();
}
}
_content.push_back (content_factory (film, i, version, notes));
}
+ /* This shouldn't be necessary but better safe than sorry (there could be old files) */
sort (_content.begin(), _content.end(), ContentSorter ());
reconnect ();
{
list<int> const allowed_dcp_frame_rates = Config::instance()->allowed_dcp_frame_rates ();
- /* Work out what rates we could manage, including those achieved by using skip / repeat. */
+ /* Work out what rates we could manage, including those achieved by using skip / repeat */
list<FrameRateCandidate> candidates;
/* Start with the ones without skip / repeat so they will get matched in preference to skipped/repeated ones */
float this_error = 0;
BOOST_FOREACH (shared_ptr<Content> j, _content) {
shared_ptr<VideoContent> vc = dynamic_pointer_cast<VideoContent> (j);
- if (!vc) {
+ if (!vc || !vc->has_own_video_frame_rate()) {
continue;
}
return best->dcp;
}
+/** @return length of the playlist from time 0 to the last thing on the playlist */
DCPTime
Playlist::length () const
{
return len;
}
+/** @return position of the first thing on the playlist, if it's not empty */
+optional<DCPTime>
+Playlist::start () const
+{
+ if (_content.empty ()) {
+ return optional<DCPTime> ();
+ }
+
+ DCPTime start = DCPTime::max ();
+ BOOST_FOREACH (shared_ptr<Content> i, _content) {
+ start = min (start, i->position ());
+ }
+
+ return start;
+}
+
void
Playlist::reconnect ()
{
bool
ContentSorter::operator() (shared_ptr<Content> a, shared_ptr<Content> b)
{
- return a->position() < b->position();
+ if (a->position() != b->position()) {
+ return a->position() < b->position();
+ }
+
+ /* Put video before audio if they start at the same time */
+ if (dynamic_pointer_cast<VideoContent>(a) && !dynamic_pointer_cast<VideoContent>(b)) {
+ return true;
+ } else if (!dynamic_pointer_cast<VideoContent>(a) && dynamic_pointer_cast<VideoContent>(b)) {
+ return false;
+ }
+
+ /* Last resort */
+ return a->digest() < b->digest();
}
-/** @return content in an undefined order */
+/** @return content in ascending order of position */
ContentList
Playlist::content () const
{
void
Playlist::move_earlier (shared_ptr<Content> c)
{
- sort (_content.begin(), _content.end(), ContentSorter ());
-
ContentList::iterator previous = _content.end ();
ContentList::iterator i = _content.begin();
while (i != _content.end() && *i != c) {
return;
}
+ shared_ptr<Content> previous_c = *previous;
- DCPTime const p = (*previous)->position ();
- (*previous)->set_position (p + c->length_after_trim ());
+ DCPTime const p = previous_c->position ();
+ previous_c->set_position (p + c->length_after_trim ());
c->set_position (p);
- sort (_content.begin(), _content.end(), ContentSorter ());
}
void
Playlist::move_later (shared_ptr<Content> c)
{
- sort (_content.begin(), _content.end(), ContentSorter ());
-
ContentList::iterator i = _content.begin();
while (i != _content.end() && *i != c) {
++i;
return;
}
- (*next)->set_position (c->position ());
- c->set_position (c->position() + (*next)->length_after_trim ());
- sort (_content.begin(), _content.end(), ContentSorter ());
+ shared_ptr<Content> next_c = *next;
+
+ next_c->set_position (c->position ());
+ c->set_position (c->position() + next_c->length_after_trim ());
+}
+
+int64_t
+Playlist::required_disk_space (int j2k_bandwidth, int audio_channels, int audio_frame_rate) const
+{
+ int64_t video = uint64_t (j2k_bandwidth / 8) * length().seconds ();
+ int64_t audio = uint64_t (audio_channels * audio_frame_rate * 3) * length().seconds ();
+
+ BOOST_FOREACH (shared_ptr<Content> i, _content) {
+ shared_ptr<DCPContent> d = dynamic_pointer_cast<DCPContent> (i);
+ if (d) {
+ if (d->reference_video()) {
+ video -= uint64_t (j2k_bandwidth / 8) * d->length_after_trim().seconds();
+ }
+ if (d->reference_audio()) {
+ audio -= uint64_t (audio_channels * audio_frame_rate * 3) * d->length_after_trim().seconds();
+ }
+ }
+ }
+
+ /* Add on 64k for bits and pieces (metadata, subs etc) */
+ return video + audio + 65536;
}
projects / dcpomatic.git / blobdiff