projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://houllier/home/carl/git/dvdomatic
[dcpomatic.git]
/
src
/
lib
/
util.h
diff --git
a/src/lib/util.h
b/src/lib/util.h
index c4940a5d795b3c615d6861c15a0bc7ba804ce2f1..0d745e50c5f3152c3984758c2260d0acf65a7fd1 100644
(file)
--- a/
src/lib/util.h
+++ b/
src/lib/util.h
@@
-29,6
+29,8
@@
#include <vector>
#include <boost/shared_ptr.hpp>
#include <boost/asio.hpp>
#include <vector>
#include <boost/shared_ptr.hpp>
#include <boost/asio.hpp>
+#include <boost/optional.hpp>
+#include <boost/filesystem.hpp>
#include <libdcp/util.h>
extern "C" {
#include <libavcodec/avcodec.h>
#include <libdcp/util.h>
extern "C" {
#include <libavcodec/avcodec.h>
@@
-42,6
+44,8
@@
extern "C" {
#define TIMING(...)
#endif
#define TIMING(...)
#endif
+#undef check
+
/** The maximum number of audio channels that we can cope with */
#define MAX_AUDIO_CHANNELS 6
/** The maximum number of audio channels that we can cope with */
#define MAX_AUDIO_CHANNELS 6
@@
-53,16
+57,21
@@
extern void stacktrace (std::ostream &, int);
extern std::string dependency_version_summary ();
extern double seconds (struct timeval);
extern void dvdomatic_setup ();
extern std::string dependency_version_summary ();
extern double seconds (struct timeval);
extern void dvdomatic_setup ();
+extern void dvdomatic_setup_gettext_i18n (std::string);
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::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);
+#ifdef DVDOMATIC_WINDOWS
+extern boost::filesystem::path mo_path ();
+#endif
typedef int SourceFrame;
typedef int SourceFrame;
-struct
DCPFrameRate
+struct
FrameRateConversion
{
{
-
DCPFrameRate (floa
t);
+
FrameRateConversion (float, in
t);
/** @return factor by which to multiply a source frame rate
to get the effective rate after any skip or repeat has happened.
/** @return factor by which to multiply a source frame rate
to get the effective rate after any skip or repeat has happened.
@@
-76,15
+85,13
@@
struct DCPFrameRate
return 1;
}
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
/** 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
* (e.g. change_speed will be true if
* source is 29.97fps, DCP is 30fps
* source is 14.50fps, DCP is 30fps
@@
-93,8
+100,12
@@
struct DCPFrameRate
* source is 12.50fps, DCP is 25fps)
*/
bool change_speed;
* 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
enum ContentType {
STILL, ///< content is still images
VIDEO ///< content is a video
@@
-141,6
+152,9
@@
struct Position
int y;
};
int y;
};
+namespace dvdomatic
+{
+
/** @struct Rect
* @brief A rectangle.
*/
/** @struct Rect
* @brief A rectangle.
*/
@@
-176,9
+190,10
@@
struct Rect
Rect intersection (Rect const & other) const;
};
Rect intersection (Rect const & other) const;
};
+}
+
extern std::string crop_string (Position, libdcp::Size);
extern int dcp_audio_sample_rate (int);
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);
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);
@@
-194,39
+209,35
@@
extern std::string get_optional_string (std::multimap<std::string, std::string>
* that are useful for DVD-o-matic.
*
* This class wraps some things that I could not work out how to do with boost;
* 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.
+ * most notably, sync read/write calls with timeouts.
*/
class Socket
{
public:
*/
class Socket
{
public:
- Socket ();
+ Socket (
int timeout = 30
);
/** @return Our underlying socket */
boost::asio::ip::tcp::socket& socket () {
return _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);
+ void connect (boost::asio::ip::basic_resolver_entry<boost::asio::ip::tcp> const & endpoint);
+
+ void write (uint32_t n);
+ void write (uint8_t const * data, int size);
- void read_definite_and_consume (uint8_t* data, int size, int timeout);
- void read_indefinite (uint8_t* data, int size, int timeout);
- void consume (int amount);
+ void read (uint8_t* data, int size);
+ uint32_t read_uint32 ();
private:
void check ();
private:
void check ();
- int read (uint8_t* data, int size, int timeout);
Socket (Socket const &);
boost::asio::io_service _io_service;
boost::asio::deadline_timer _deadline;
boost::asio::ip::tcp::socket _socket;
Socket (Socket const &);
boost::asio::io_service _io_service;
boost::asio::deadline_timer _deadline;
boost::asio::ip::tcp::socket _socket;
- /** a buffer for small reads */
- uint8_t _buffer[1024];
- /** amount of valid data in the buffer */
- int _buffer_data;
+ int _timeout;
};
/** @class AudioBuffers
};
/** @class AudioBuffers
@@
-237,6
+248,7
@@
class AudioBuffers
public:
AudioBuffers (int channels, int frames);
AudioBuffers (AudioBuffers const &);
public:
AudioBuffers (int channels, int frames);
AudioBuffers (AudioBuffers const &);
+ AudioBuffers (boost::shared_ptr<const AudioBuffers>);
~AudioBuffers ();
float** data () const {
~AudioBuffers ();
float** data () const {
@@
-272,9
+284,32
@@
private:
float** _data;
};
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 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 ();
+
+class LocaleGuard
+{
+public:
+ LocaleGuard ();
+ ~LocaleGuard ();
+
+private:
+ char* _old;
+};
+
#endif
#endif