Allow specification of video bit rate separately for J2K and MPEG2.

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

diff --git a/src/lib/film.h b/src/lib/film.h
index 036bbed7ef3ad8e0a13aa6c24ea5223bbbc52b1b..e2e88e2c9fe294569c40b165e88f51e7e68a68dd 100644 (file)
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -32,6 +32,7 @@
 #include "change_signaller.h"
 #include "dcp_text_track.h"
 #include "dcpomatic_time.h"
+#include "enum_indexed_vector.h"
 #include "film_property.h"
 #include "frame_rate_change.h"
 #include "named_channel.h"
@@ -41,6 +42,7 @@
 #include "transcode_job.h"
 #include "types.h"
 #include "util.h"
+#include "video_encoding.h"
 #include <dcp/encrypted_kdm.h>
 #include <dcp/file.h>
 #include <dcp/key.h>
@@ -186,7 +188,7 @@ public:
                return _playlist;
        }
 
-       std::list<dcpomatic::DCPTimePeriod> reels () const;
+       std::vector<dcpomatic::DCPTimePeriod> reels() const;
        std::list<int> mapped_audio_channels () const;
 
        boost::optional<dcp::LanguageTag> audio_language () const {
@@ -250,8 +252,8 @@ public:
                return _key;
        }
 
-       int j2k_bandwidth () const {
-               return _j2k_bandwidth;
+       int video_bit_rate(VideoEncoding encoding) const {
+               return _video_bit_rate[encoding];
        }
 
        /** @return The frame rate of the DCP */
@@ -275,6 +277,10 @@ public:
                return _interop;
        }
 
+       VideoEncoding video_encoding() const {
+               return _video_encoding;
+       }
+
        bool limit_to_smpte_bv20() const {
                return _limit_to_smpte_bv20;
        }
@@ -291,6 +297,10 @@ public:
                return _reel_length;
        }
 
+       std::vector<dcpomatic::DCPTime> custom_reel_boundaries() const {
+               return _custom_reel_boundaries;
+       }
+
        std::string context_id () const {
                return _context_id;
        }
@@ -397,17 +407,19 @@ public:
        void set_container (Ratio const *, bool user_explicit = true);
        void set_resolution (Resolution, bool user_explicit = true);
        void set_encrypted (bool);
-       void set_j2k_bandwidth (int);
+       void set_video_bit_rate(VideoEncoding encoding, int64_t);
        void set_video_frame_rate (int rate, bool user_explicit = false);
        void set_audio_channels (int);
        void set_three_d (bool);
        void set_isdcf_date_today ();
        void set_sequence (bool);
        void set_interop (bool);
+       void set_video_encoding(VideoEncoding encoding);
        void set_limit_to_smpte_bv20(bool);
        void set_audio_processor (AudioProcessor const * processor);
        void set_reel_type (ReelType);
        void set_reel_length (int64_t);
+       void set_custom_reel_boundaries(std::vector<dcpomatic::DCPTime> boundaries);
        void set_reencode_j2k (bool);
        void set_marker (dcp::Marker type, dcpomatic::DCPTime time);
        void unset_marker (dcp::Marker type);
@@ -510,8 +522,8 @@ private:
         *  re-start picture MXF encodes.
         */
        std::string _context_id;
-       /** bandwidth for J2K files in bits per second */
-       int _j2k_bandwidth;
+       /** bit rate for encoding video using in bits per second */
+       EnumIndexedVector<int64_t, VideoEncoding> _video_bit_rate;
        /** Frames per second to run our DCP at */
        int _video_frame_rate;
        /** The date that we should use in a ISDCF name */
@@ -524,11 +536,14 @@ private:
        bool _three_d;
        bool _sequence;
        bool _interop;
+       VideoEncoding _video_encoding;
        bool _limit_to_smpte_bv20;
        AudioProcessor const * _audio_processor;
        ReelType _reel_type;
-       /** Desired reel length in bytes, if _reel_type == REELTYPE_BY_LENGTH */
+       /** Desired reel length in bytes, if _reel_type == BY_LENGTH */
        int64_t _reel_length;
+       /** Reel boundaries (excluding those at the start and end, sorted in ascending order) if _reel_type == CUSTOM */
+       std::vector<dcpomatic::DCPTime> _custom_reel_boundaries;
        bool _reencode_j2k;
        /** true if the user has ever explicitly set the video frame rate of this film */
        bool _user_explicit_video_frame_rate;