X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Futil.h;h=eb2af8381908648e092e7b97909f555af4a3defe;hb=abd57c6c2e8526eac93e9d0c9bd0b6080de1e6fa;hp=2785a5dc1fdad25a0e7e06285c78450acd5b002b;hpb=6726393a4b186333b8e1080f3f1c5c4b77d4c2e6;p=dcpomatic.git

diff --git a/src/lib/util.h b/src/lib/util.h
index 2785a5dc1..eb2af8381 100644
--- a/src/lib/util.h
+++ b/src/lib/util.h
@@ -33,29 +33,32 @@ extern "C" {
 #include <libavcodec/avcodec.h>
 #include <libavfilter/avfilter.h>
 }
+#include "compose.hpp"
+
+#ifdef DVDOMATIC_DEBUG
+#define TIMING(...) _film->log()->microsecond_log (String::compose (__VA_ARGS__), Log::TIMING);
+#else
+#define TIMING(...)
+#endif
 
 class Scaler;
 
 extern std::string seconds_to_hms (int);
 extern std::string seconds_to_approximate_hms (int);
 extern void stacktrace (std::ostream &, int);
-extern std::string audio_sample_format_to_string (AVSampleFormat);
-extern AVSampleFormat audio_sample_format_from_string (std::string);
 extern std::string dependency_version_summary ();
 extern double seconds (struct timeval);
 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 ();
 
 enum ContentType {
 	STILL,
 	VIDEO
 };
 
-#ifdef DEBUG_HASH
-extern void md5_data (std::string, void const *, int);
-#endif
-
 /** @class Size
  *  @brief Representation of the size of something */
 struct Size
@@ -80,19 +83,25 @@ struct Size
 	int height;
 };
 
+/** A description of the crop of an image or video. */
 struct Crop
 {
 	Crop () : left (0), right (0), top (0), bottom (0) {}
-	
+
+	/** Number of pixels to remove from the left-hand side */
 	int left;
+	/** Number of pixels to remove from the right-hand side */
 	int right;
+	/** Number of pixels to remove from the top */
 	int top;
+	/** Number of pixels to remove from the bottom */
 	int bottom;
 };
 
 extern bool operator== (Crop const & a, Crop const & b);
 extern bool operator!= (Crop const & a, Crop const & b);
 
+/** A position */
 struct Position
 {
 	Position ()
@@ -105,24 +114,76 @@ struct Position
 		, y (y_)
 	{}
 
+	/** x coordinate */
 	int x;
+	/** y coordinate */
 	int y;
 };
 
+/** A rectangle */
+struct Rect
+{
+	Rect ()
+		: x (0)
+		, y (0)
+		, width (0)
+		, height (0)
+	{}
+
+	Rect (int x_, int y_, int w_, int h_)
+		: x (x_)
+		, y (y_)
+		, width (w_)
+		, height (h_)
+	{}
+
+	int x;
+	int y;
+	int width;
+	int height;
+
+	Position position () const {
+		return Position (x, y);
+	}
+
+	Size size () const {
+		return Size (width, height);
+	}
+
+	Rect intersection (Rect const & other) const;
+};
+
 extern std::string crop_string (Position, Size);
 extern int dcp_audio_sample_rate (int);
 extern std::string colour_lut_index_to_name (int index);
-
-class DeadlineWrapper
+extern int round_up (int, int);
+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);
+extern std::string get_required_string (std::multimap<std::string, std::string> const & kv, std::string k);
+extern int get_optional_int (std::multimap<std::string, std::string> const & kv, std::string k);
+extern std::string get_optional_string (std::multimap<std::string, std::string> const & kv, std::string k);
+
+/** @class Socket
+ *  @brief A class to wrap a boost::asio::ip::tcp::socket with some things
+ *  that are useful for DVD-o-matic.
+ *
+ *  This class wraps some things that I could not work out how to do with boost;
+ *  most notably, sync read/write calls with timeouts, and the ability to peek into
+ *  data being read.
+ */
+class Socket
 {
 public:
-	DeadlineWrapper (boost::asio::io_service& io_service);
+	Socket ();
 
-	void set_socket (boost::shared_ptr<boost::asio::ip::tcp::socket> socket);
+	/** @return Our underlying socket */
+	boost::asio::ip::tcp::socket& socket () {
+		return _socket;
+	}
 
 	void connect (boost::asio::ip::basic_resolver_entry<boost::asio::ip::tcp> const & endpoint, int timeout);
 	void write (uint8_t const * data, int size, int timeout);
-	int read (uint8_t* data, int size, int timeout);
 	
 	void read_definite_and_consume (uint8_t* data, int size, int timeout);
 	void read_indefinite (uint8_t* data, int size, int timeout);
@@ -130,16 +191,47 @@ public:
 	
 private:
 	void check ();
+	int read (uint8_t* data, int size, int timeout);
 
-	DeadlineWrapper (DeadlineWrapper const &);
+	Socket (Socket const &);
 
-	boost::asio::io_service& _io_service;
+	boost::asio::io_service _io_service;
 	boost::asio::deadline_timer _deadline;
-	boost::shared_ptr<boost::asio::ip::tcp::socket> _socket;
+	boost::asio::ip::tcp::socket _socket;
 	/** a buffer for small reads */
-	uint8_t _buffer[256];
+	uint8_t _buffer[1024];
 	/** amount of valid data in the buffer */
 	int _buffer_data;
 };
 
+class AudioBuffers
+{
+public:
+	AudioBuffers (int channels, int frames);
+	~AudioBuffers ();
+
+	float** data () const {
+		return _data;
+	}
+	
+	float* data (int) const;
+
+	int frames () const {
+		return _frames;
+	}
+
+	void set_frames (int f);
+
+	void make_silent ();
+
+private:
+	/* no copy construction */
+	AudioBuffers (AudioBuffers const &);
+	
+	int _channels;
+	int _frames;
+	float** _data;
+};
+
 #endif
+