Various fixes to PTS mangling.

[dcpomatic.git] / src / lib / ffmpeg_content.cc

diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc
index 7a67ee5b8b5475cbb7e19b10baf02a37586b0393..f4e1b9e72b44be79d63a759d80ec00e24735e559 100644 (file)
--- a/src/lib/ffmpeg_content.cc
+++ b/src/lib/ffmpeg_content.cc
@@ -1,5 +1,3 @@
-/* -*- c-basic-offset: 8; default-tab-width: 8; -*- */
-
 /*
     Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
 
@@ -21,11 +19,12 @@
 
 #include <libcxml/cxml.h>
 #include "ffmpeg_content.h"
-#include "ffmpeg_decoder.h"
+#include "ffmpeg_examiner.h"
 #include "compose.hpp"
 #include "job.h"
 #include "util.h"
 #include "filter.h"
+#include "film.h"
 #include "log.h"
 
 #include "i18n.h"
@@ -48,6 +47,7 @@ FFmpegContent::FFmpegContent (shared_ptr<const Film> f, boost::filesystem::path
        : Content (f, p)
        , VideoContent (f, p)
        , AudioContent (f, p)
+       , SubtitleContent (f, p)
 {
 
 }
@@ -56,6 +56,7 @@ FFmpegContent::FFmpegContent (shared_ptr<const Film> f, shared_ptr<const cxml::N
        : Content (f, node)
        , VideoContent (f, node)
        , AudioContent (f, node)
+       , SubtitleContent (f, node)
 {
        list<shared_ptr<cxml::Node> > c = node->node_children ("SubtitleStream");
        for (list<shared_ptr<cxml::Node> >::const_iterator i = c.begin(); i != c.end(); ++i) {
@@ -77,12 +78,15 @@ FFmpegContent::FFmpegContent (shared_ptr<const Film> f, shared_ptr<const cxml::N
        for (list<shared_ptr<cxml::Node> >::iterator i = c.begin(); i != c.end(); ++i) {
                _filters.push_back (Filter::from_id ((*i)->content ()));
        }
+
+       _first_video = node->optional_number_child<double> ("FirstVideo");
 }
 
 FFmpegContent::FFmpegContent (FFmpegContent const & o)
        : Content (o)
        , VideoContent (o)
        , AudioContent (o)
+       , SubtitleContent (o)
        , _subtitle_streams (o._subtitle_streams)
        , _subtitle_stream (o._subtitle_stream)
        , _audio_streams (o._audio_streams)
@@ -98,6 +102,7 @@ FFmpegContent::as_xml (xmlpp::Node* node) const
        Content::as_xml (node);
        VideoContent::as_xml (node);
        AudioContent::as_xml (node);
+       SubtitleContent::as_xml (node);
 
        boost::mutex::scoped_lock lm (_mutex);
 
@@ -120,6 +125,10 @@ FFmpegContent::as_xml (xmlpp::Node* node) const
        for (vector<Filter const *>::const_iterator i = _filters.begin(); i != _filters.end(); ++i) {
                node->add_child("Filter")->add_child_text ((*i)->id ());
        }
+
+       if (_first_video) {
+               node->add_child("FirstVideo")->add_child_text (lexical_cast<string> (_first_video.get ()));
+       }
 }
 
 void
@@ -132,36 +141,38 @@ FFmpegContent::examine (shared_ptr<Job> job)
        shared_ptr<const Film> film = _film.lock ();
        assert (film);
 
-       shared_ptr<FFmpegDecoder> decoder (new FFmpegDecoder (film, shared_from_this (), true, false, false));
+       shared_ptr<FFmpegExaminer> examiner (new FFmpegExaminer (shared_from_this ()));
+
+       VideoContent::Frame video_length = 0;
+       video_length = examiner->video_length ();
+       film->log()->log (String::compose ("Video length obtained from header as %1 frames", video_length));
 
-       ContentVideoFrame video_length = 0;
-       video_length = decoder->video_length ();
-       film->log()->log (String::compose ("Video length obtained from header as %1 frames", decoder->video_length ()));
+       {
+               boost::mutex::scoped_lock lm (_mutex);
 
-        {
-                boost::mutex::scoped_lock lm (_mutex);
+               _video_length = video_length;
 
-                _video_length = video_length;
+               _subtitle_streams = examiner->subtitle_streams ();
+               if (!_subtitle_streams.empty ()) {
+                       _subtitle_stream = _subtitle_streams.front ();
+               }
+               
+               _audio_streams = examiner->audio_streams ();
+               if (!_audio_streams.empty ()) {
+                       _audio_stream = _audio_streams.front ();
+               }
 
-                _subtitle_streams = decoder->subtitle_streams ();
-                if (!_subtitle_streams.empty ()) {
-                        _subtitle_stream = _subtitle_streams.front ();
-                }
-                
-                _audio_streams = decoder->audio_streams ();
-                if (!_audio_streams.empty ()) {
-                        _audio_stream = _audio_streams.front ();
-                }
-        }
+               _first_video = examiner->first_video ();
+       }
 
-        take_from_video_decoder (decoder);
+       take_from_video_examiner (examiner);
 
-        signal_changed (ContentProperty::LENGTH);
-        signal_changed (FFmpegContentProperty::SUBTITLE_STREAMS);
-        signal_changed (FFmpegContentProperty::SUBTITLE_STREAM);
-        signal_changed (FFmpegContentProperty::AUDIO_STREAMS);
-        signal_changed (FFmpegContentProperty::AUDIO_STREAM);
-        signal_changed (AudioContentProperty::AUDIO_CHANNELS);
+       signal_changed (ContentProperty::LENGTH);
+       signal_changed (FFmpegContentProperty::SUBTITLE_STREAMS);
+       signal_changed (FFmpegContentProperty::SUBTITLE_STREAM);
+       signal_changed (FFmpegContentProperty::AUDIO_STREAMS);
+       signal_changed (FFmpegContentProperty::AUDIO_STREAM);
+       signal_changed (AudioContentProperty::AUDIO_CHANNELS);
 }
 
 string
@@ -188,38 +199,38 @@ FFmpegContent::information () const
 void
 FFmpegContent::set_subtitle_stream (shared_ptr<FFmpegSubtitleStream> s)
 {
-        {
-                boost::mutex::scoped_lock lm (_mutex);
-                _subtitle_stream = s;
-        }
+       {
+               boost::mutex::scoped_lock lm (_mutex);
+               _subtitle_stream = s;
+       }
 
-        signal_changed (FFmpegContentProperty::SUBTITLE_STREAM);
+       signal_changed (FFmpegContentProperty::SUBTITLE_STREAM);
 }
 
 void
 FFmpegContent::set_audio_stream (shared_ptr<FFmpegAudioStream> s)
 {
-        {
-                boost::mutex::scoped_lock lm (_mutex);
-                _audio_stream = s;
-        }
+       {
+               boost::mutex::scoped_lock lm (_mutex);
+               _audio_stream = s;
+       }
 
-        signal_changed (FFmpegContentProperty::AUDIO_STREAM);
+       signal_changed (FFmpegContentProperty::AUDIO_STREAM);
 }
 
-ContentAudioFrame
+AudioContent::Frame
 FFmpegContent::audio_length () const
 {
        int const cafr = content_audio_frame_rate ();
        int const vfr  = video_frame_rate ();
-       ContentVideoFrame const vl = video_length ();
+       VideoContent::Frame const vl = video_length ();
 
        boost::mutex::scoped_lock lm (_mutex);
-        if (!_audio_stream) {
-                return 0;
-        }
-        
-        return video_frames_to_audio_frames (vl, cafr, vfr);
+       if (!_audio_stream) {
+               return 0;
+       }
+       
+       return video_frames_to_audio_frames (vl, cafr, vfr);
 }
 
 int
@@ -227,11 +238,11 @@ FFmpegContent::audio_channels () const
 {
        boost::mutex::scoped_lock lm (_mutex);
        
-        if (!_audio_stream) {
-                return 0;
-        }
+       if (!_audio_stream) {
+               return 0;
+       }
 
-        return _audio_stream->channels;
+       return _audio_stream->channels;
 }
 
 int
@@ -239,11 +250,11 @@ FFmpegContent::content_audio_frame_rate () const
 {
        boost::mutex::scoped_lock lm (_mutex);
 
-        if (!_audio_stream) {
-                return 0;
-        }
+       if (!_audio_stream) {
+               return 0;
+       }
 
-        return _audio_stream->frame_rate;
+       return _audio_stream->frame_rate;
 }
 
 int
@@ -273,13 +284,13 @@ FFmpegContent::output_audio_frame_rate () const
 bool
 operator== (FFmpegSubtitleStream const & a, FFmpegSubtitleStream const & b)
 {
-        return a.id == b.id;
+       return a.id == b.id;
 }
 
 bool
 operator== (FFmpegAudioStream const & a, FFmpegAudioStream const & b)
 {
-        return a.id == b.id;
+       return a.id == b.id;
 }
 
 FFmpegAudioStream::FFmpegAudioStream (shared_ptr<const cxml::Node> node)
@@ -289,6 +300,7 @@ FFmpegAudioStream::FFmpegAudioStream (shared_ptr<const cxml::Node> node)
        frame_rate = node->number_child<int> ("FrameRate");
        channels = node->number_child<int64_t> ("Channels");
        mapping = AudioMapping (node->node_child ("Mapping"));
+       first_audio = node->optional_number_child<Time> ("FirstAudio");
 }
 
 void
@@ -298,6 +310,9 @@ FFmpegAudioStream::as_xml (xmlpp::Node* root) const
        root->add_child("Id")->add_child_text (lexical_cast<string> (id));
        root->add_child("FrameRate")->add_child_text (lexical_cast<string> (frame_rate));
        root->add_child("Channels")->add_child_text (lexical_cast<string> (channels));
+       if (first_audio) {
+               root->add_child("FirstAudio")->add_child_text (lexical_cast<string> (first_audio));
+       }
        mapping.as_xml (root->add_child("Mapping"));
 }
 
@@ -363,3 +378,23 @@ FFmpegContent::set_audio_mapping (AudioMapping m)
        audio_stream()->mapping = m;
        signal_changed (AudioContentProperty::AUDIO_MAPPING);
 }
+
+string
+FFmpegContent::identifier () const
+{
+       stringstream s;
+
+       s << VideoContent::identifier();
+
+       boost::mutex::scoped_lock lm (_mutex);
+
+       if (_subtitle_stream) {
+               s << "_" << _subtitle_stream->id;
+       }
+
+       for (vector<Filter const *>::const_iterator i = _filters.begin(); i != _filters.end(); ++i) {
+               s << "_" << (*i)->id ();
+       }
+
+       return s.str ();
+}