Move deinterleaving of audio into ffmpeg decoder.

[dcpomatic.git] / src / lib / film.h

diff --git a/src/lib/film.h b/src/lib/film.h
index eeaae2acdaba9b3dab123a22381f723349826559..168a5e0b207ce3f350549ba61e3bfb6b6fb89015 100644 (file)
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -87,7 +87,7 @@ public:
 
        std::string thumb_file (int) const;
        std::string thumb_base (int) const;
-       int thumb_frame (int) const;
+       SourceFrame thumb_frame (int) const;
 
        int target_audio_sample_rate () const;
        
@@ -95,7 +95,7 @@ public:
        void read_metadata ();
 
        Size cropped_size (Size) const;
-       boost::optional<int> dcp_length () const;
+       boost::optional<SourceFrame> dcp_length () const;
        std::string dci_name () const;
        std::string dcp_name () const;
 
@@ -120,7 +120,9 @@ public:
                DCP_TRIM_START,
                DCP_TRIM_END,
                DCP_AB,
+               USE_SOURCE_AUDIO,
                AUDIO_STREAM,
+               EXTERNAL_AUDIO,
                AUDIO_GAIN,
                AUDIO_DELAY,
                STILL_DURATION,
@@ -187,12 +189,12 @@ public:
                return _scaler;
        }
 
-       int dcp_trim_start () const {
+       SourceFrame dcp_trim_start () const {
                boost::mutex::scoped_lock lm (_state_mutex);
                return _dcp_trim_start;
        }
 
-       int dcp_trim_end () const {
+       SourceFrame dcp_trim_end () const {
                boost::mutex::scoped_lock lm (_state_mutex);
                return _dcp_trim_end;
        }
@@ -202,6 +204,11 @@ public:
                return _dcp_ab;
        }
 
+       bool use_source_audio () const {
+               boost::mutex::scoped_lock lm (_state_mutex);
+               return _use_source_audio;
+       }
+
        int audio_stream_index () const {
                boost::mutex::scoped_lock lm (_state_mutex);
                return _audio_stream;
@@ -212,6 +219,11 @@ public:
                assert (_audio_stream < int (_audio_streams.size()));
                return _audio_streams[_audio_stream];
        }
+
+       std::vector<std::string> external_audio () const {
+               boost::mutex::scoped_lock lm (_state_mutex);
+               return _external_audio;
+       }
        
        float audio_gain () const {
                boost::mutex::scoped_lock lm (_state_mutex);
@@ -289,7 +301,7 @@ public:
                return _package_type;
        }
 
-       std::vector<int> thumbs () const {
+       std::vector<SourceFrame> thumbs () const {
                boost::mutex::scoped_lock lm (_state_mutex);
                return _thumbs;
        }
@@ -299,7 +311,7 @@ public:
                return _size;
        }
 
-       boost::optional<int> length () const {
+       boost::optional<SourceFrame> length () const {
                boost::mutex::scoped_lock lm (_state_mutex);
                return _length;
        }
@@ -353,7 +365,9 @@ public:
        void set_dcp_trim_start (int);
        void set_dcp_trim_end (int);
        void set_dcp_ab (bool);
+       void set_use_source_audio (bool);
        void set_audio_stream (int);
+       void set_external_audio (std::vector<std::string>);
        void set_audio_gain (float);
        void set_audio_delay (int);
        void set_still_duration (int);
@@ -368,9 +382,9 @@ public:
        void set_studio (std::string);
        void set_facility (std::string);
        void set_package_type (std::string);
-       void set_thumbs (std::vector<int>);
+       void set_thumbs (std::vector<SourceFrame>);
        void set_size (Size);
-       void set_length (int);
+       void set_length (SourceFrame);
        void unset_length ();
        void set_audio_sample_rate (int);
        void set_content_digest (std::string);
@@ -390,13 +404,14 @@ private:
        /** Any running ExamineContentJob, or 0 */
        boost::shared_ptr<ExamineContentJob> _examine_content_job;
 
+       /** The date that we should use in a DCI name */
        boost::gregorian::date _dci_date;
 
-       std::string thumb_file_for_frame (int) const;
-       std::string thumb_base_for_frame (int) const;
+       std::string thumb_file_for_frame (SourceFrame) const;
+       std::string thumb_base_for_frame (SourceFrame) const;
        void signal_changed (Property);
        void examine_content_finished ();
-       
+
        /** Complete path to directory containing the film metadata;
         *  must not be relative.
         */
@@ -422,15 +437,19 @@ private:
        std::vector<Filter const *> _filters;
        /** Scaler algorithm to use */
        Scaler const * _scaler;
-       int _dcp_trim_start;
-       int _dcp_trim_end;
+       /** Frames to trim off the start of the source */
+       SourceFrame _dcp_trim_start;
+       /** Frames to trim off the end of the source */
+       SourceFrame _dcp_trim_end;
        /** true to create an A/B comparison DCP, where the left half of the image
            is the video without any filters or post-processing, and the right half
            has the specified filters and post-processing.
        */
        bool _dcp_ab;
+       bool _use_source_audio;
        /** An index into our _audio_streams vector for the stream to use for audio, or -1 if there is none */
        int _audio_stream;
+       std::vector<std::string> _external_audio;
        /** Gain to apply to audio in dB */
        float _audio_gain;
        /** Delay to apply to audio (positive moves audio later) in milliseconds */
@@ -460,11 +479,11 @@ private:
        /* Data which are cached to speed things up */
 
        /** Vector of frame indices for each of our `thumbnails' */
-       std::vector<int> _thumbs;
+       std::vector<SourceFrame> _thumbs;
        /** Size, in pixels, of the source (ignoring cropping) */
        Size _size;
        /** Actual length of the source (in video frames) from examining it */
-       boost::optional<int> _length;
+       boost::optional<SourceFrame> _length;
        /** Sample rate of the source audio, in Hz */
        int _audio_sample_rate;
        /** MD5 digest of our content file */