/*
- Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-2018 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
#include "exceptions.h"
#include "config.h"
#include "frame_rate_change.h"
-#include "raw_convert.h"
#include "compose.hpp"
+#include <dcp/raw_convert.h>
#include <libcxml/cxml.h>
#include <libxml++/libxml++.h>
#include <boost/foreach.hpp>
using std::string;
using std::cout;
using std::vector;
-using std::stringstream;
using std::fixed;
using std::list;
using std::pair;
using boost::shared_ptr;
using boost::dynamic_pointer_cast;
using boost::optional;
+using dcp::raw_convert;
/** Something stream-related has changed */
int const AudioContentProperty::STREAMS = 200;
string
AudioContent::technical_summary () const
{
- string s = "audio :";
+ string s = "audio: ";
BOOST_FOREACH (AudioStreamPtr i, streams ()) {
- s += String::compose ("stream channels %1 rate %2", i->channels(), i->frame_rate());
+ s += String::compose ("stream channels %1 rate %2 ", i->channels(), i->frame_rate());
}
return s;
void
AudioContent::set_mapping (AudioMapping mapping)
{
+ ChangeSignaller<Content> cc (_parent, AudioContentProperty::STREAMS);
+
int c = 0;
BOOST_FOREACH (AudioStreamPtr i, streams ()) {
AudioMapping stream_mapping (i->channels (), MAX_DCP_AUDIO_CHANNELS);
}
i->set_mapping (stream_mapping);
}
-
- _parent->signal_changed (AudioContentProperty::STREAMS);
}
AudioMapping
* that it is in sync with the active video content at its start time.
*/
int
-AudioContent::resampled_frame_rate () const
+AudioContent::resampled_frame_rate (shared_ptr<const Film> film) const
{
- /* Resample to a DCI-approved sample rate */
- double t = has_rate_above_48k() ? 96000 : 48000;
+ double t = film->audio_frame_rate ();
- FrameRateChange frc (_parent->active_video_frame_rate(), _parent->film()->video_frame_rate());
+ FrameRateChange frc (film, _parent);
/* Compensate if the DCP is being run at a different frame rate
to the source; that is, if the video is run such that it will
}
string
-AudioContent::processing_description () const
+AudioContent::processing_description (shared_ptr<const Film> film) const
{
if (streams().empty ()) {
return "";
optional<int> common_frame_rate;
BOOST_FOREACH (AudioStreamPtr i, streams()) {
- if (i->frame_rate() != resampled_frame_rate()) {
+ if (i->frame_rate() != resampled_frame_rate(film)) {
resampled = true;
} else {
not_resampled = true;
}
if (not_resampled && resampled) {
- return String::compose (_("Some audio will be resampled to %1kHz"), resampled_frame_rate ());
+ return String::compose (_("Some audio will be resampled to %1Hz"), resampled_frame_rate(film));
}
if (!not_resampled && resampled) {
if (same) {
- return String::compose (_("Audio will be resampled from %1kHz to %2kHz"), common_frame_rate.get(), resampled_frame_rate ());
+ return String::compose (_("Audio will be resampled from %1Hz to %2Hz"), common_frame_rate.get(), resampled_frame_rate(film));
} else {
- return String::compose (_("Audio will be resampled to %1kHz"), resampled_frame_rate ());
+ return String::compose (_("Audio will be resampled to %1Hz"), resampled_frame_rate(film));
}
}
return "";
}
-/** @return true if any stream in this content has a sampling rate of more than 48kHz */
-bool
-AudioContent::has_rate_above_48k () const
-{
- BOOST_FOREACH (AudioStreamPtr i, streams ()) {
- if (i->frame_rate() > 48000) {
- return true;
- }
- }
-
- return false;
-}
-
/** @return User-visible names of each of our audio channels */
vector<string>
AudioContent::channel_names () const
}
void
-AudioContent::add_properties (list<UserProperty>& p) const
+AudioContent::add_properties (shared_ptr<const Film> film, list<UserProperty>& p) const
{
shared_ptr<const AudioStream> stream;
if (streams().size() == 1) {
p.push_back (UserProperty (UserProperty::AUDIO, _("Content audio sample rate"), stream->frame_rate(), _("Hz")));
}
- FrameRateChange const frc (_parent->active_video_frame_rate(), _parent->film()->video_frame_rate());
- ContentTime const c (_parent->full_length(), frc);
+ FrameRateChange const frc (_parent->active_video_frame_rate(film), film->video_frame_rate());
+ ContentTime const c (_parent->full_length(film), frc);
p.push_back (
UserProperty (UserProperty::LENGTH, _("Full length in video frames at content rate"), c.frames_round(frc.source))
);
}
- p.push_back (UserProperty (UserProperty::AUDIO, _("DCP frame rate"), resampled_frame_rate (), _("Hz")));
+ p.push_back (UserProperty (UserProperty::AUDIO, _("DCP sample rate"), resampled_frame_rate(film), _("Hz")));
p.push_back (UserProperty (UserProperty::LENGTH, _("Full length in video frames at DCP rate"), c.frames_round (frc.dcp)));
if (stream) {
UserProperty (
UserProperty::LENGTH,
_("Full length in audio samples at DCP rate"),
- c.frames_round (resampled_frame_rate ())
+ c.frames_round(resampled_frame_rate(film))
)
);
}
void
AudioContent::set_streams (vector<AudioStreamPtr> streams)
{
+ ChangeSignaller<Content> cc (_parent, AudioContentProperty::STREAMS);
+
{
boost::mutex::scoped_lock lm (_mutex);
_streams = streams;
}
-
- _parent->signal_changed (AudioContentProperty::STREAMS);
}
AudioStreamPtr
void
AudioContent::add_stream (AudioStreamPtr stream)
{
+ ChangeSignaller<Content> cc (_parent, AudioContentProperty::STREAMS);
+
{
boost::mutex::scoped_lock lm (_mutex);
_streams.push_back (stream);
}
-
- _parent->signal_changed (AudioContentProperty::STREAMS);
}
void
AudioContent::set_stream (AudioStreamPtr stream)
{
+ ChangeSignaller<Content> cc (_parent, AudioContentProperty::STREAMS);
+
{
boost::mutex::scoped_lock lm (_mutex);
_streams.clear ();
_streams.push_back (stream);
}
+}
+
+void
+AudioContent::take_settings_from (shared_ptr<const AudioContent> c)
+{
+ set_gain (c->_gain);
+ set_delay (c->_delay);
+
+ size_t i = 0;
+ size_t j = 0;
+
+ while (i < _streams.size() && j < c->_streams.size()) {
+ _streams[i]->set_mapping (c->_streams[j]->mapping());
+ ++i;
+ ++j;
+ }
+}
- _parent->signal_changed (AudioContentProperty::STREAMS);
+void
+AudioContent::modify_position (shared_ptr<const Film> film, DCPTime& pos) const
+{
+ pos = pos.round (film->audio_frame_rate());
+}
+
+void
+AudioContent::modify_trim_start (ContentTime& trim) const
+{
+ DCPOMATIC_ASSERT (!_streams.empty());
+ /* XXX: we're in trouble if streams have different rates */
+ trim = trim.round (_streams.front()->frame_rate());
}
projects / dcpomatic.git / blobdiff