Tests pass again.

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

diff --git a/src/lib/util.h b/src/lib/util.h
index f2087b3f042476d4d42c286dfb834cf6b9c7d02d..bb68b627355cf1604aada40a2cd1d51460802e0f 100644 (file)
--- a/src/lib/util.h
+++ b/src/lib/util.h
@@ -36,11 +36,13 @@ extern "C" {
 #include "compose.hpp"
 
 #ifdef DVDOMATIC_DEBUG
-#define TIMING(...) _log->microsecond_log (String::compose (__VA_ARGS__), Log::TIMING);
+#define TIMING(...) _film->log()->microsecond_log (String::compose (__VA_ARGS__), Log::TIMING);
 #else
 #define TIMING(...)
 #endif
 
+#define MAX_AUDIO_CHANNELS 6
+
 class Scaler;
 
 extern std::string seconds_to_hms (int);
@@ -52,6 +54,16 @@ extern void dvdomatic_setup ();
 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 ();
+
+typedef int SourceFrame;
+
+struct DCPFrameRate
+{
+       int frames_per_second;
+       int skip;
+       bool run_fast;
+};
 
 enum ContentType {
        STILL,
@@ -82,6 +94,8 @@ struct Size
        int height;
 };
 
+extern bool operator== (Size const & a, Size const & b);
+
 /** A description of the crop of an image or video. */
 struct Crop
 {
@@ -154,8 +168,10 @@ struct Rect
 
 extern std::string crop_string (Position, Size);
 extern int dcp_audio_sample_rate (int);
+extern DCPFrameRate dcp_frame_rate (float);
 extern std::string colour_lut_index_to_name (int index);
-extern int round_up (int, int);
+extern int stride_round_up (int, int const *, int);
+extern int stride_lookup (int c, int const * stride);
 extern std::multimap<std::string, std::string> read_key_value (std::istream& s);
 extern int get_required_int (std::multimap<std::string, std::string> const & kv, std::string k);
 extern float get_required_float (std::multimap<std::string, std::string> const & kv, std::string k);
@@ -203,5 +219,42 @@ private:
        int _buffer_data;
 };
 
+class AudioBuffers
+{
+public:
+       AudioBuffers (int channels, int frames);
+       AudioBuffers (AudioBuffers const &);
+       ~AudioBuffers ();
+
+       float** data () const {
+               return _data;
+       }
+       
+       float* data (int) const;
+
+       int channels () const {
+               return _channels;
+       }
+
+       int frames () const {
+               return _frames;
+       }
+
+       void set_frames (int f);
+
+       void make_silent ();
+
+       void copy_from (AudioBuffers* from, int frames_to_copy, int read_offset, int write_offset);
+       void move (int from, int to, int frames);
+
+private:
+       int _channels;
+       int _frames;
+       int _allocated_frames;
+       float** _data;
+};
+
+extern int64_t video_frames_to_audio_frames (SourceFrame v, float audio_sample_rate, float frames_per_second);
+
 #endif