Merge master and multifarious hackery.

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

diff --git a/src/lib/ffmpeg_content.h b/src/lib/ffmpeg_content.h
index 3d69a2f994029f38e935d3c57bfc34ecb7f7e3e6..8f5c773eeb853ba7f7530268bef65d4188621969 100644 (file)
--- a/src/lib/ffmpeg_content.h
+++ b/src/lib/ffmpeg_content.h
@@ -1,3 +1,5 @@
+/* -*- c-basic-offset: 8; default-tab-width: 8; -*- */
+
 /*
     Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
 
@@ -17,35 +19,35 @@
 
 */
 
-#ifndef DVDOMATIC_FFMPEG_CONTENT_H
-#define DVDOMATIC_FFMPEG_CONTENT_H
+#ifndef DCPOMATIC_FFMPEG_CONTENT_H
+#define DCPOMATIC_FFMPEG_CONTENT_H
 
 #include <boost/enable_shared_from_this.hpp>
 #include "video_content.h"
 #include "audio_content.h"
 
+class Filter;
+
 class FFmpegAudioStream
 {
 public:
-        FFmpegAudioStream (std::string n, int i, int f, int64_t c)
+        FFmpegAudioStream (std::string n, int i, int f, int c)
                 : name (n)
                 , id (i)
                 , frame_rate (f)
-                , channel_layout (c)
+               , channels (c)
+               , mapping (c)
         {}
 
        FFmpegAudioStream (boost::shared_ptr<const cxml::Node>);
 
        void as_xml (xmlpp::Node *) const;
        
-        int channels () const {
-                return av_get_channel_layout_nb_channels (channel_layout);
-        }
-        
         std::string name;
         int id;
         int frame_rate;
-        int64_t channel_layout;
+       int channels;
+       AudioMapping mapping;
 };
 
 extern bool operator== (FFmpegAudioStream const & a, FFmpegAudioStream const & b);
@@ -75,55 +77,71 @@ public:
         static int const SUBTITLE_STREAM;
         static int const AUDIO_STREAMS;
         static int const AUDIO_STREAM;
+        static int const FILTERS;
 };
 
-class FFmpegContent : public VideoContent, public AudioContent, public boost::enable_shared_from_this<FFmpegContent>
+class FFmpegContent : public VideoContent, public AudioContent
 {
 public:
-       FFmpegContent (boost::filesystem::path);
-       FFmpegContent (boost::shared_ptr<const cxml::Node>);
+       FFmpegContent (boost::shared_ptr<const Film>, boost::filesystem::path);
+       FFmpegContent (boost::shared_ptr<const Film>, boost::shared_ptr<const cxml::Node>);
        FFmpegContent (FFmpegContent const &);
+
+       boost::shared_ptr<FFmpegContent> shared_from_this () {
+               return boost::dynamic_pointer_cast<FFmpegContent> (Content::shared_from_this ());
+       }
        
-       void examine (boost::shared_ptr<Film>, boost::shared_ptr<Job>, bool);
+       void examine (boost::shared_ptr<Job>);
        std::string summary () const;
        std::string information () const;
        void as_xml (xmlpp::Node *) const;
        boost::shared_ptr<Content> clone () const;
+       Time length () const;
 
         /* AudioContent */
         int audio_channels () const;
         ContentAudioFrame audio_length () const;
-        int audio_frame_rate () const;
-        int64_t audio_channel_layout () const;
+        int content_audio_frame_rate () const;
+        int output_audio_frame_rate () const;
+       AudioMapping audio_mapping () const;
+
+       void set_filters (std::vector<Filter const *> const &);
        
-        std::vector<FFmpegSubtitleStream> subtitle_streams () const {
+        std::vector<boost::shared_ptr<FFmpegSubtitleStream> > subtitle_streams () const {
                 boost::mutex::scoped_lock lm (_mutex);
                 return _subtitle_streams;
         }
 
-        boost::optional<FFmpegSubtitleStream> subtitle_stream () const {
+        boost::shared_ptr<FFmpegSubtitleStream> subtitle_stream () const {
                 boost::mutex::scoped_lock lm (_mutex);
                 return _subtitle_stream;
         }
 
-        std::vector<FFmpegAudioStream> audio_streams () const {
+        std::vector<boost::shared_ptr<FFmpegAudioStream> > audio_streams () const {
                 boost::mutex::scoped_lock lm (_mutex);
                 return _audio_streams;
         }
         
-        boost::optional<FFmpegAudioStream> audio_stream () const {
+        boost::shared_ptr<FFmpegAudioStream> audio_stream () const {
                 boost::mutex::scoped_lock lm (_mutex);
                 return _audio_stream;
         }
 
-        void set_subtitle_stream (FFmpegSubtitleStream);
-        void set_audio_stream (FFmpegAudioStream);
+       std::vector<Filter const *> filters () const {
+               boost::mutex::scoped_lock lm (_mutex);
+               return _filters;
+       }
+
+        void set_subtitle_stream (boost::shared_ptr<FFmpegSubtitleStream>);
+        void set_audio_stream (boost::shared_ptr<FFmpegAudioStream>);
        
 private:
-       std::vector<FFmpegSubtitleStream> _subtitle_streams;
-       boost::optional<FFmpegSubtitleStream> _subtitle_stream;
-       std::vector<FFmpegAudioStream> _audio_streams;
-       boost::optional<FFmpegAudioStream> _audio_stream;
+       std::vector<boost::shared_ptr<FFmpegSubtitleStream> > _subtitle_streams;
+       boost::shared_ptr<FFmpegSubtitleStream> _subtitle_stream;
+       std::vector<boost::shared_ptr<FFmpegAudioStream> > _audio_streams;
+       boost::shared_ptr<FFmpegAudioStream> _audio_stream;
+       /** Video filters that should be used when generating DCPs */
+       std::vector<Filter const *> _filters;
 };
 
 #endif