Merge branch 'new-env-test'

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

diff --git a/src/lib/util.cc b/src/lib/util.cc
index cc201a0af4df6c6ebe169a8be6dfa489ba6b8938..2194418653b96d4a753e54218bdf3ce3dc1e98e5 100644 (file)
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -36,6 +36,7 @@
 #include <boost/bind.hpp>
 #include <boost/lambda/lambda.hpp>
 #include <boost/lexical_cast.hpp>
+#include <boost/thread.hpp>
 #include <openjpeg.h>
 #include <openssl/md5.h>
 #include <magick/MagickCore.h>
@@ -56,7 +57,6 @@ extern "C" {
 #include "dcp_content_type.h"
 #include "filter.h"
 #include "screen.h"
-#include "film_state.h"
 #include "sound_processor.h"
 #ifndef DVDOMATIC_DISABLE_PLAYER
 #include "player_manager.h"
@@ -65,6 +65,8 @@ extern "C" {
 using namespace std;
 using namespace boost;
 
+thread::id ui_thread;
+
 /** Convert some number of seconds to a string representation
  *  in hours, minutes and seconds.
  *
@@ -189,37 +191,6 @@ stacktrace (ostream& out, int levels)
 }
 #endif
 
-/** @param s Sample format.
- *  @return String representation.
- */
-string
-audio_sample_format_to_string (AVSampleFormat s)
-{
-       /* Our sample format handling is not exactly complete */
-       
-       switch (s) {
-       case AV_SAMPLE_FMT_S16:
-               return "S16";
-       default:
-               break;
-       }
-
-       return "Unknown";
-}
-
-/** @param s String representation of a sample format, as returned from audio_sample_format_to_string().
- *  @return Sample format.
- */
-AVSampleFormat
-audio_sample_format_from_string (string s)
-{
-       if (s == "S16") {
-               return AV_SAMPLE_FMT_S16;
-       }
-
-       return AV_SAMPLE_FMT_NONE;
-}
-
 /** @return Version of vobcopy that is on the path (and hence that we will use) */
 static string
 vobcopy_version ()
@@ -296,7 +267,9 @@ sigchld_handler (int, siginfo_t* info, void *)
 }
 #endif
 
-/** Call the required functions to set up DVD-o-matic's static arrays, etc. */
+/** Call the required functions to set up DVD-o-matic's static arrays, etc.
+ *  Must be called from the UI thread, if there is one.
+ */
 void
 dvdomatic_setup ()
 {
@@ -306,6 +279,8 @@ dvdomatic_setup ()
        Filter::setup_filters ();
        SoundProcessor::setup_sound_processors ();
 
+       ui_thread = this_thread::get_id ();
+
 #ifdef DVDOMATIC_POSIX 
        struct sigaction sa;
        sa.sa_flags = SA_SIGINFO;
@@ -399,6 +374,24 @@ md5_digest (string file)
        return s.str ();
 }
 
+DCPFrameRate
+dcp_frame_rate (float fps)
+{
+       DCPFrameRate dfr;
+
+       dfr.run_fast = (fps != rint (fps));
+       dfr.frames_per_second = rint (fps);
+       dfr.skip = 1;
+
+       /* XXX: somewhat arbitrary */
+       if (fps == 50) {
+               dfr.frames_per_second = 25;
+               dfr.skip = 2;
+       }
+
+       return dfr;
+}
+
 /** @param An arbitrary sampling rate.
  *  @return The appropriate DCP-approved sampling rate (48kHz or 96kHz).
  */
@@ -412,6 +405,11 @@ dcp_audio_sample_rate (int fs)
        return 96000;
 }
 
+bool operator== (Size const & a, Size const & b)
+{
+       return (a.width == b.width && a.height == b.height);
+}
+
 bool operator== (Crop const & a, Crop const & b)
 {
        return (a.left == b.left && a.right == b.right && a.top == b.top && a.bottom == b.bottom);
@@ -602,13 +600,13 @@ Socket::read_indefinite (uint8_t* data, int size, int timeout)
        memcpy (data, _buffer, size);
 }
 
-Rectangle
-Rectangle::intersection (Rectangle const & other) const
+Rect
+Rect::intersection (Rect const & other) const
 {
        int const tx = max (x, other.x);
        int const ty = max (y, other.y);
        
-       return Rectangle (
+       return Rect (
                tx, ty,
                min (x + width, other.x + other.width) - tx,
                min (y + height, other.y + other.height) - ty
@@ -724,3 +722,102 @@ get_optional_int (multimap<string, string> const & kv, string k)
 
        return lexical_cast<int> (i->second);
 }
+
+AudioBuffers::AudioBuffers (int channels, int frames)
+       : _channels (channels)
+       , _frames (frames)
+       , _allocated_frames (frames)
+{
+       _data = new float*[_channels];
+       for (int i = 0; i < _channels; ++i) {
+               _data[i] = new float[frames];
+       }
+}
+
+AudioBuffers::AudioBuffers (AudioBuffers const & other)
+       : _channels (other._channels)
+       , _frames (other._frames)
+       , _allocated_frames (other._frames)
+{
+       _data = new float*[_channels];
+       for (int i = 0; i < _channels; ++i) {
+               _data[i] = new float[_frames];
+               memcpy (_data[i], other._data[i], _frames * sizeof (float));
+       }
+}
+
+AudioBuffers::~AudioBuffers ()
+{
+       for (int i = 0; i < _channels; ++i) {
+               delete[] _data[i];
+       }
+
+       delete[] _data;
+}
+
+float*
+AudioBuffers::data (int c) const
+{
+       assert (c >= 0 && c < _channels);
+       return _data[c];
+}
+       
+void
+AudioBuffers::set_frames (int f)
+{
+       assert (f <= _allocated_frames);
+       _frames = f;
+}
+
+void
+AudioBuffers::make_silent ()
+{
+       for (int i = 0; i < _channels; ++i) {
+               for (int j = 0; j < _frames; ++j) {
+                       _data[i][j] = 0;
+               }
+       }
+}
+
+void
+AudioBuffers::copy_from (AudioBuffers* from, int frames_to_copy, int read_offset, int write_offset)
+{
+       assert (from->channels() == channels());
+
+       for (int i = 0; i < _channels; ++i) {
+               memcpy (_data[i] + write_offset, from->_data[i] + read_offset, frames_to_copy * sizeof(float));
+       }
+}
+
+void
+AudioBuffers::move (int from, int to, int frames)
+{
+       if (frames == 0) {
+               return;
+       }
+       
+       assert (from >= 0);
+       assert (from < _frames);
+       assert (to >= 0);
+       assert (to < _frames);
+       assert (frames > 0);
+       assert (frames <= _frames);
+       assert ((from + frames) <= _frames);
+       assert ((to + frames) <= _frames);
+       
+       for (int i = 0; i < _channels; ++i) {
+               memmove (_data[i] + to, _data[i] + from, frames * sizeof(float));
+       }
+}
+
+void
+ensure_ui_thread ()
+{
+       assert (this_thread::get_id() == ui_thread);
+}
+
+int64_t
+video_frames_to_audio_frames (SourceFrame v, float audio_sample_rate, float frames_per_second)
+{
+       return ((int64_t) v * audio_sample_rate / frames_per_second);
+}