X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_content.cc;h=516962936238824775970f5796dc97c10ca6f62e;hb=f4e42377cfce59a6b88dcb29c3be2d95c5045b29;hp=7f1c75a936915d3ea440cd24ccb4b6c2ffde2e75;hpb=8fedaaa75c4586a4cc7ffb393bd71d1fdb091dc8;p=dcpomatic.git
diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc
index 7f1c75a93..516962936 100644
--- a/src/lib/ffmpeg_content.cc
+++ b/src/lib/ffmpeg_content.cc
@@ -16,6 +16,7 @@
You should have received a copy of the GNU General Public License
along with DCP-o-matic. If not, see .
+
*/
#include "ffmpeg_content.h"
@@ -45,6 +46,7 @@ extern "C" {
#include "i18n.h"
+
using std::string;
using std::vector;
using std::list;
@@ -59,17 +61,20 @@ using boost::optional;
using dcp::raw_convert;
using namespace dcpomatic;
+
int const FFmpegContentProperty::SUBTITLE_STREAMS = 100;
int const FFmpegContentProperty::SUBTITLE_STREAM = 101;
int const FFmpegContentProperty::FILTERS = 102;
int const FFmpegContentProperty::KDM = 103;
+
FFmpegContent::FFmpegContent (boost::filesystem::path p)
: Content (p)
{
}
+
template
optional
get_optional_enum (cxml::ConstNodePtr node, string name)
@@ -81,6 +86,7 @@ get_optional_enum (cxml::ConstNodePtr node, string name)
return static_cast(*v);
}
+
FFmpegContent::FFmpegContent (cxml::ConstNodePtr node, int version, list& notes)
: Content (node)
{
@@ -125,7 +131,8 @@ FFmpegContent::FFmpegContent (cxml::ConstNodePtr node, int version, list
_bits_per_pixel = node->optional_number_child ("BitsPerPixel");
}
-FFmpegContent::FFmpegContent (vector > c)
+
+FFmpegContent::FFmpegContent (vector> c)
: Content (c)
{
auto i = c.begin ();
@@ -186,10 +193,11 @@ FFmpegContent::FFmpegContent (vector > c)
_bits_per_pixel = ref->_bits_per_pixel;
}
+
void
FFmpegContent::as_xml (xmlpp::Node* node, bool with_paths) const
{
- node->add_child("Type")->add_child_text ("FFmpeg");
+ node->add_child("Type")->add_child_text("FFmpeg");
Content::as_xml (node, with_paths);
if (video) {
@@ -199,7 +207,7 @@ FFmpegContent::as_xml (xmlpp::Node* node, bool with_paths) const
if (audio) {
audio->as_xml (node);
- for (auto i: audio->streams ()) {
+ for (auto i: audio->streams()) {
auto f = dynamic_pointer_cast (i);
DCPOMATIC_ASSERT (f);
f->as_xml (node->add_child("AudioStream"));
@@ -225,31 +233,32 @@ FFmpegContent::as_xml (xmlpp::Node* node, bool with_paths) const
}
if (_first_video) {
- node->add_child("FirstVideo")->add_child_text (raw_convert (_first_video.get().get()));
+ node->add_child("FirstVideo")->add_child_text(raw_convert(_first_video.get().get()));
}
if (_color_range) {
- node->add_child("ColorRange")->add_child_text (raw_convert (static_cast (*_color_range)));
+ node->add_child("ColorRange")->add_child_text(raw_convert(static_cast(*_color_range)));
}
if (_color_primaries) {
- node->add_child("ColorPrimaries")->add_child_text (raw_convert (static_cast (*_color_primaries)));
+ node->add_child("ColorPrimaries")->add_child_text(raw_convert(static_cast(*_color_primaries)));
}
if (_color_trc) {
- node->add_child("ColorTransferCharacteristic")->add_child_text (raw_convert (static_cast (*_color_trc)));
+ node->add_child("ColorTransferCharacteristic")->add_child_text(raw_convert(static_cast(*_color_trc)));
}
if (_colorspace) {
- node->add_child("Colorspace")->add_child_text (raw_convert (static_cast (*_colorspace)));
+ node->add_child("Colorspace")->add_child_text(raw_convert(static_cast(*_colorspace)));
}
if (_bits_per_pixel) {
- node->add_child("BitsPerPixel")->add_child_text (raw_convert (*_bits_per_pixel));
+ node->add_child("BitsPerPixel")->add_child_text(raw_convert(*_bits_per_pixel));
}
}
+
void
FFmpegContent::examine (shared_ptr film, shared_ptr job)
{
- ChangeSignaller cc1 (this, FFmpegContentProperty::SUBTITLE_STREAMS);
- ChangeSignaller cc2 (this, FFmpegContentProperty::SUBTITLE_STREAM);
+ ContentChangeSignaller cc1 (this, FFmpegContentProperty::SUBTITLE_STREAMS);
+ ContentChangeSignaller cc2 (this, FFmpegContentProperty::SUBTITLE_STREAM);
if (job) {
job->set_progress_unknown ();
@@ -290,7 +299,7 @@ FFmpegContent::examine (shared_ptr film, shared_ptr job)
}
}
- if (!examiner->audio_streams().empty ()) {
+ if (!examiner->audio_streams().empty()) {
audio = make_shared(this);
for (auto i: examiner->audio_streams()) {
@@ -324,20 +333,22 @@ FFmpegContent::examine (shared_ptr film, shared_ptr job)
}
}
+
string
FFmpegContent::summary () const
{
if (video && audio) {
- return String::compose (_("%1 [movie]"), path_summary ());
+ return String::compose (_("%1 [movie]"), path_summary());
} else if (video) {
- return String::compose (_("%1 [video]"), path_summary ());
+ return String::compose (_("%1 [video]"), path_summary());
} else if (audio) {
- return String::compose (_("%1 [audio]"), path_summary ());
+ return String::compose (_("%1 [audio]"), path_summary());
}
return path_summary ();
}
+
string
FFmpegContent::technical_summary () const
{
@@ -372,10 +383,11 @@ FFmpegContent::technical_summary () const
);
}
+
void
FFmpegContent::set_subtitle_stream (shared_ptr s)
{
- ChangeSignaller cc (this, FFmpegContentProperty::SUBTITLE_STREAM);
+ ContentChangeSignaller cc (this, FFmpegContentProperty::SUBTITLE_STREAM);
{
boost::mutex::scoped_lock lm (_mutex);
@@ -383,18 +395,21 @@ FFmpegContent::set_subtitle_stream (shared_ptr s)
}
}
+
bool
operator== (FFmpegStream const & a, FFmpegStream const & b)
{
return a._id == b._id;
}
+
bool
operator!= (FFmpegStream const & a, FFmpegStream const & b)
{
return a._id != b._id;
}
+
DCPTime
FFmpegContent::full_length (shared_ptr film) const
{
@@ -413,9 +428,10 @@ FFmpegContent::full_length (shared_ptr film) const
/* XXX: subtitle content? */
- return DCPTime();
+ return {};
}
+
DCPTime
FFmpegContent::approximate_length () const
{
@@ -433,10 +449,11 @@ FFmpegContent::approximate_length () const
return DCPTime::from_frames (longest, 24);
}
+
void
FFmpegContent::set_filters (vector const & filters)
{
- ChangeSignaller cc (this, FFmpegContentProperty::FILTERS);
+ ContentChangeSignaller cc (this, FFmpegContentProperty::FILTERS);
{
boost::mutex::scoped_lock lm (_mutex);
@@ -444,6 +461,7 @@ FFmpegContent::set_filters (vector const & filters)
}
}
+
string
FFmpegContent::identifier () const
{
@@ -470,6 +488,7 @@ FFmpegContent::identifier () const
return s;
}
+
void
FFmpegContent::set_default_colour_conversion ()
{
@@ -505,6 +524,7 @@ FFmpegContent::set_default_colour_conversion ()
}
}
+
void
FFmpegContent::add_properties (shared_ptr film, list& p) const
{
@@ -649,6 +669,7 @@ FFmpegContent::add_properties (shared_ptr film, list&
}
}
+
/** Our subtitle streams have colour maps, which can be changed, but
* they have no way of signalling that change. As a hack, we have this
* method which callers can use when they've modified one of our subtitle
@@ -658,23 +679,25 @@ void
FFmpegContent::signal_subtitle_stream_changed ()
{
/* XXX: this is too late; really it should be before the change */
- ChangeSignaller cc (this, FFmpegContentProperty::SUBTITLE_STREAM);
+ ContentChangeSignaller cc (this, FFmpegContentProperty::SUBTITLE_STREAM);
}
-vector >
+
+vector>
FFmpegContent::ffmpeg_audio_streams () const
{
- vector > fa;
+ vector> fa;
if (audio) {
for (auto i: audio->streams()) {
- fa.push_back (dynamic_pointer_cast (i));
+ fa.push_back (dynamic_pointer_cast(i));
}
}
return fa;
}
+
void
FFmpegContent::take_settings_from (shared_ptr c)
{