Merge master.

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

diff --git a/src/lib/util.h b/src/lib/util.h
index 87735ea8e82b8bc27e77b17515da26eedc8155ee..ec67469c16ebb7fddc9c7731c4cc1f3a07e8f61a 100644 (file)
--- a/src/lib/util.h
+++ b/src/lib/util.h
@@ -29,6 +29,7 @@
 #include <vector>
 #include <boost/shared_ptr.hpp>
 #include <boost/asio.hpp>
+#include <boost/optional.hpp>
 #include <libdcp/util.h>
 extern "C" {
 #include <libavcodec/avcodec.h>
@@ -57,12 +58,13 @@ extern std::vector<std::string> split_at_spaces_considering_quotes (std::string)
 extern std::string md5_digest (std::string);
 extern std::string md5_digest (void const *, int);
 extern void ensure_ui_thread ();
+extern std::string audio_channel_name (int);
 
 typedef int SourceFrame;
 
-struct DCPFrameRate
+struct FrameRateConversion
 {
-       DCPFrameRate (float);
+       FrameRateConversion (float, int);
 
        /** @return factor by which to multiply a source frame rate
            to get the effective rate after any skip or repeat has happened.
@@ -76,15 +78,13 @@ struct DCPFrameRate
 
                return 1;
        }
-       
-       /** frames per second for the DCP */
-       int frames_per_second;
+
        /** true to skip every other frame */
        bool skip;
        /** true to repeat every frame once */
        bool repeat;
        /** true if this DCP will run its video faster or slower than the source
-        *  without taking into account `repeat'.
+        *  without taking into account `repeat' nor `skip'.
         *  (e.g. change_speed will be true if
         *          source is 29.97fps, DCP is 30fps
         *          source is 14.50fps, DCP is 30fps
@@ -93,8 +93,12 @@ struct DCPFrameRate
         *          source is 12.50fps, DCP is 25fps)
         */
        bool change_speed;
+
+       std::string description;
 };
 
+int best_dcp_frame_rate (float);
+
 enum ContentType {
        STILL, ///< content is still images
        VIDEO  ///< content is a video
@@ -178,7 +182,6 @@ struct Rect
 
 extern std::string crop_string (Position, libdcp::Size);
 extern int dcp_audio_sample_rate (int);
-extern int dcp_audio_channels (int);
 extern std::string colour_lut_index_to_name (int index);
 extern int stride_round_up (int, int const *, int);
 extern int stride_lookup (int c, int const * stride);
@@ -268,6 +271,19 @@ private:
        float** _data;
 };
 
+class AudioMapping
+{
+public:
+       AudioMapping (int);
+
+       boost::optional<libdcp::Channel> source_to_dcp (int c) const;
+       boost::optional<int> dcp_to_source (libdcp::Channel c) const;
+       int dcp_channels () const;
+
+private:
+       int _source_channels;
+};
+
 extern int64_t video_frames_to_audio_frames (SourceFrame v, float audio_sample_rate, float frames_per_second);
 extern bool still_image_file (std::string);
 extern std::pair<std::string, int> cpu_info ();