projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More fr_FR tweaks from Lilian.
[dcpomatic.git]
/
src
/
lib
/
dcp_video_frame.h
diff --git
a/src/lib/dcp_video_frame.h
b/src/lib/dcp_video_frame.h
index 4271ebb285b7962f07e3b21a93e6bfab50b81493..4ceb07d2649905a87a80ebf9daa6712e97fc8d96 100644
(file)
--- a/
src/lib/dcp_video_frame.h
+++ b/
src/lib/dcp_video_frame.h
@@
-19,13
+19,13
@@
*/
#include <openjpeg.h>
*/
#include <openjpeg.h>
+#include <libdcp/picture_asset.h>
#include "util.h"
/** @file src/dcp_video_frame.h
* @brief A single frame of video destined for a DCP.
*/
#include "util.h"
/** @file src/dcp_video_frame.h
* @brief A single frame of video destined for a DCP.
*/
-class FilmState;
class Film;
class ServerDescription;
class Scaler;
class Film;
class ServerDescription;
class Scaler;
@@
-39,18
+39,16
@@
class Subtitle;
class EncodedData
{
public:
class EncodedData
{
public:
- /** @param d Data (will not be freed by this class, but may be by subclasses)
- * @param s Size of data, in bytes.
- */
- EncodedData (uint8_t* d, int s)
- : _data (d)
- , _size (s)
- {}
+ /** @param s Size of data, in bytes */
+ EncodedData (int s);
+
+ EncodedData (std::string f);
- virtual ~EncodedData ()
{}
+ virtual ~EncodedData ()
;
void send (boost::shared_ptr<Socket> socket);
void send (boost::shared_ptr<Socket> socket);
- void write (boost::shared_ptr<const Film>, int);
+ void write (boost::shared_ptr<const Film>, int) const;
+ void write_info (boost::shared_ptr<const Film>, int, libdcp::FrameInfo) const;
/** @return data */
uint8_t* data () const {
/** @return data */
uint8_t* data () const {
@@
-65,6
+63,10
@@
public:
protected:
uint8_t* _data; ///< data
int _size; ///< data size in bytes
protected:
uint8_t* _data; ///< data
int _size; ///< data size in bytes
+
+private:
+ /* No copy construction */
+ EncodedData (EncodedData const &);
};
/** @class LocallyEncodedData
};
/** @class LocallyEncodedData
@@
-75,12
+77,10
@@
protected:
class LocallyEncodedData : public EncodedData
{
public:
class LocallyEncodedData : public EncodedData
{
public:
- /** @param d Data (which will
not be fre
ed by this class)
+ /** @param d Data (which will
be copi
ed by this class)
* @param s Size of data, in bytes.
*/
* @param s Size of data, in bytes.
*/
- LocallyEncodedData (uint8_t* d, int s)
- : EncodedData (d, s)
- {}
+ LocallyEncodedData (uint8_t* d, int s);
};
/** @class RemotelyEncodedData
};
/** @class RemotelyEncodedData
@@
-91,7
+91,6
@@
class RemotelyEncodedData : public EncodedData
{
public:
RemotelyEncodedData (int s);
{
public:
RemotelyEncodedData (int s);
- ~RemotelyEncodedData ();
};
/** @class DCPVideoFrame
};
/** @class DCPVideoFrame
@@
-108,7
+107,7
@@
class DCPVideoFrame
public:
DCPVideoFrame (
boost::shared_ptr<const Image>, boost::shared_ptr<Subtitle>, libdcp::Size,
public:
DCPVideoFrame (
boost::shared_ptr<const Image>, boost::shared_ptr<Subtitle>, libdcp::Size,
- int, int, float, Scaler const *, int,
float, std::string, int, int, Log *
+ int, int, float, Scaler const *, int,
int, std::string, int, int, boost::shared_ptr<Log>
);
virtual ~DCPVideoFrame ();
);
virtual ~DCPVideoFrame ();
@@
-131,12
+130,12
@@
private:
float _subtitle_scale;
Scaler const * _scaler; ///< scaler to use
int _frame; ///< frame index within the DCP's intrinsic duration
float _subtitle_scale;
Scaler const * _scaler; ///< scaler to use
int _frame; ///< frame index within the DCP's intrinsic duration
- int _frames_per_second; ///< Frames per second that we will use for the DCP
(rounded)
+ int _frames_per_second; ///< Frames per second that we will use for the DCP
std::string _post_process; ///< FFmpeg post-processing string to use
int _colour_lut; ///< Colour look-up table to use
int _j2k_bandwidth; ///< J2K bandwidth to use
std::string _post_process; ///< FFmpeg post-processing string to use
int _colour_lut; ///< Colour look-up table to use
int _j2k_bandwidth; ///< J2K bandwidth to use
-
Log*
_log; ///< log
+
boost::shared_ptr<Log>
_log; ///< log
opj_image_cmptparm_t _cmptparm[3]; ///< libopenjpeg's opj_image_cmptparm_t
opj_image* _image; ///< libopenjpeg's image container
opj_image_cmptparm_t _cmptparm[3]; ///< libopenjpeg's opj_image_cmptparm_t
opj_image* _image; ///< libopenjpeg's image container