/*
- Copyright (C) 2013-2018 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-2021 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
*/
+
#include "audio_content.h"
-#include "film.h"
-#include "exceptions.h"
+#include "compose.hpp"
#include "config.h"
+#include "exceptions.h"
+#include "film.h"
#include "frame_rate_change.h"
-#include "compose.hpp"
#include <dcp/raw_convert.h>
#include <libcxml/cxml.h>
#include <libxml++/libxml++.h>
-#include <boost/foreach.hpp>
#include <iostream>
#include "i18n.h"
-using std::string;
+
using std::cout;
-using std::vector;
+using std::dynamic_pointer_cast;
using std::fixed;
using std::list;
+using std::make_shared;
using std::pair;
using std::setprecision;
-using boost::shared_ptr;
-using boost::dynamic_pointer_cast;
+using std::shared_ptr;
+using std::string;
+using std::vector;
using boost::optional;
using dcp::raw_convert;
+using namespace dcpomatic;
+
/** Something stream-related has changed */
int const AudioContentProperty::STREAMS = 200;
int const AudioContentProperty::GAIN = 201;
int const AudioContentProperty::DELAY = 202;
+
AudioContent::AudioContent (Content* parent)
: ContentPart (parent)
- , _gain (0)
- , _delay (Config::instance()->default_audio_delay ())
+ , _delay (Config::instance()->default_audio_delay())
{
}
+
shared_ptr<AudioContent>
AudioContent::from_xml (Content* parent, cxml::ConstNodePtr node, int version)
{
audio streams, so check for that.
*/
if (node->string_child("Type") == "FFmpeg" && node->node_children("AudioStream").empty()) {
- return shared_ptr<AudioContent> ();
+ return {};
}
/* Otherwise we can drop through to the newer logic */
}
if (!node->optional_number_child<double> ("AudioGain")) {
- return shared_ptr<AudioContent> ();
+ return {};
}
- return shared_ptr<AudioContent> (new AudioContent (parent, node));
+ return make_shared<AudioContent>(parent, node);
}
+
AudioContent::AudioContent (Content* parent, cxml::ConstNodePtr node)
: ContentPart (parent)
{
_delay = node->number_child<int> ("AudioDelay");
/* Backwards compatibility */
- optional<double> r = node->optional_number_child<double> ("AudioVideoFrameRate");
+ auto r = node->optional_number_child<double>("AudioVideoFrameRate");
if (r) {
- _parent->set_video_frame_rate (r.get ());
+ _parent->set_video_frame_rate (r.get());
}
}
+
AudioContent::AudioContent (Content* parent, vector<shared_ptr<Content> > c)
: ContentPart (parent)
{
- shared_ptr<AudioContent> ref = c[0]->audio;
+ auto ref = c[0]->audio;
DCPOMATIC_ASSERT (ref);
for (size_t i = 1; i < c.size(); ++i) {
_streams = ref->streams ();
}
+
void
AudioContent::as_xml (xmlpp::Node* node) const
{
boost::mutex::scoped_lock lm (_mutex);
- node->add_child("AudioGain")->add_child_text (raw_convert<string> (_gain));
- node->add_child("AudioDelay")->add_child_text (raw_convert<string> (_delay));
+ node->add_child("AudioGain")->add_child_text(raw_convert<string>(_gain));
+ node->add_child("AudioDelay")->add_child_text(raw_convert<string>(_delay));
}
+
void
AudioContent::set_gain (double g)
{
maybe_set (_gain, g, AudioContentProperty::GAIN);
}
+
void
AudioContent::set_delay (int d)
{
maybe_set (_delay, d, AudioContentProperty::DELAY);
}
+
string
AudioContent::technical_summary () const
{
string s = "audio: ";
- BOOST_FOREACH (AudioStreamPtr i, streams ()) {
+ for (auto i: streams()) {
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);
+ ContentChangeSignaller cc (_parent, AudioContentProperty::STREAMS);
int c = 0;
- BOOST_FOREACH (AudioStreamPtr i, streams ()) {
- AudioMapping stream_mapping (i->channels (), MAX_DCP_AUDIO_CHANNELS);
+ for (auto i: streams()) {
+ AudioMapping stream_mapping (i->channels(), MAX_DCP_AUDIO_CHANNELS);
for (int j = 0; j < i->channels(); ++j) {
for (int k = 0; k < MAX_DCP_AUDIO_CHANNELS; ++k) {
- stream_mapping.set (j, k, mapping.get (c, k));
+ stream_mapping.set (j, k, mapping.get(c, k));
}
++c;
}
}
}
+
AudioMapping
AudioContent::mapping () const
{
int channels = 0;
- BOOST_FOREACH (AudioStreamPtr i, streams ()) {
+ for (auto i: streams()) {
channels += i->channels ();
}
int c = 0;
int s = 0;
- BOOST_FOREACH (AudioStreamPtr i, streams ()) {
- AudioMapping mapping = i->mapping ();
+ for (auto i: streams()) {
+ auto mapping = i->mapping ();
for (int j = 0; j < mapping.input_channels(); ++j) {
for (int k = 0; k < MAX_DCP_AUDIO_CHANNELS; ++k) {
if (k < mapping.output_channels()) {
- merged.set (c, k, mapping.get (j, k));
+ merged.set (c, k, mapping.get(j, k));
}
}
++c;
return merged;
}
+
/** @return the frame rate that this content should be resampled to in order
* that it is in sync with the active video content at its start time.
*/
int
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(film), 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 (shared_ptr<const Film> film) const
{
- if (streams().empty ()) {
+ if (streams().empty()) {
return "";
}
bool same = true;
optional<int> common_frame_rate;
- BOOST_FOREACH (AudioStreamPtr i, streams()) {
+ for (auto i: streams()) {
if (i->frame_rate() != resampled_frame_rate(film)) {
resampled = true;
} else {
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>
+vector<NamedChannel>
AudioContent::channel_names () const
{
- vector<string> n;
+ vector<NamedChannel> n;
- int t = 1;
- BOOST_FOREACH (AudioStreamPtr i, streams ()) {
+ int index = 0;
+ int stream = 1;
+ for (auto i: streams()) {
for (int j = 0; j < i->channels(); ++j) {
- n.push_back (String::compose ("%1:%2", t, j + 1));
+ n.push_back (NamedChannel(String::compose ("%1:%2", stream, j + 1), index++));
}
- ++t;
+ ++stream;
}
return n;
}
+
void
AudioContent::add_properties (shared_ptr<const Film> film, list<UserProperty>& p) const
{
shared_ptr<const AudioStream> stream;
if (streams().size() == 1) {
- stream = streams().front ();
+ stream = streams().front();
}
if (stream) {
- p.push_back (UserProperty (UserProperty::AUDIO, _("Channels"), stream->channels ()));
- p.push_back (UserProperty (UserProperty::AUDIO, _("Content audio sample rate"), stream->frame_rate(), _("Hz")));
+ p.push_back (UserProperty(UserProperty::AUDIO, _("Channels"), stream->channels()));
+ p.push_back (UserProperty(UserProperty::AUDIO, _("Content audio sample rate"), stream->frame_rate(), _("Hz")));
}
FrameRateChange const frc (_parent->active_video_frame_rate(film), film->video_frame_rate());
);
}
- 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)));
+ 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) {
p.push_back (
}
}
+
void
AudioContent::set_streams (vector<AudioStreamPtr> streams)
{
- ChangeSignaller<Content> cc (_parent, AudioContentProperty::STREAMS);
+ ContentChangeSignaller cc (_parent, AudioContentProperty::STREAMS);
{
boost::mutex::scoped_lock lm (_mutex);
}
}
+
AudioStreamPtr
AudioContent::stream () const
{
return _streams.front ();
}
+
void
AudioContent::add_stream (AudioStreamPtr stream)
{
- ChangeSignaller<Content> cc (_parent, AudioContentProperty::STREAMS);
+ ContentChangeSignaller cc (_parent, AudioContentProperty::STREAMS);
{
boost::mutex::scoped_lock lm (_mutex);
}
}
+
void
AudioContent::set_stream (AudioStreamPtr stream)
{
- ChangeSignaller<Content> cc (_parent, AudioContentProperty::STREAMS);
+ ContentChangeSignaller cc (_parent, AudioContentProperty::STREAMS);
{
boost::mutex::scoped_lock lm (_mutex);
}
}
+
void
AudioContent::take_settings_from (shared_ptr<const AudioContent> c)
{
}
}
+
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
{
projects / dcpomatic.git / blobdiff