projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[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 e4006d98683af8c9ff58e9d0eafc9040686d9c56..7393efde699d1a4ad1f6560c50a102dddcb0eb8e 100644
(file)
--- a/
src/lib/dcp_video_frame.h
+++ b/
src/lib/dcp_video_frame.h
@@
-18,9
+18,7
@@
*/
*/
-#include <openjpeg.h>
-#include <libdcp/picture_asset.h>
-#include <libdcp/picture_asset_writer.h>
+#include <dcp/picture_mxf_writer.h>
#include "util.h"
/** @file src/dcp_video_frame.h
#include "util.h"
/** @file src/dcp_video_frame.h
@@
-50,7
+48,7
@@
public:
void send (boost::shared_ptr<Socket> socket);
void write (boost::shared_ptr<const Film>, int, Eyes) const;
void send (boost::shared_ptr<Socket> socket);
void write (boost::shared_ptr<const Film>, int, Eyes) const;
- void write_info (boost::shared_ptr<const Film>, int, Eyes,
lib
dcp::FrameInfo) const;
+ void write_info (boost::shared_ptr<const Film>, int, Eyes, dcp::FrameInfo) const;
/** @return data */
uint8_t* data () const {
/** @return data */
uint8_t* data () const {
@@
-104,7
+102,7
@@
class DCPVideoFrame : public boost::noncopyable
{
public:
DCPVideoFrame (boost::shared_ptr<const PlayerVideoFrame>, int, int, int, Resolution, boost::shared_ptr<Log>);
{
public:
DCPVideoFrame (boost::shared_ptr<const PlayerVideoFrame>, int, int, int, Resolution, boost::shared_ptr<Log>);
- DCPVideoFrame (boost::shared_ptr<const PlayerVideoFrame>,
boost::shared_ptr<const cxml::Node>
, boost::shared_ptr<Log>);
+ DCPVideoFrame (boost::shared_ptr<const PlayerVideoFrame>,
cxml::ConstNodePtr
, boost::shared_ptr<Log>);
boost::shared_ptr<EncodedData> encode_locally ();
boost::shared_ptr<EncodedData> encode_remotely (ServerDescription);
boost::shared_ptr<EncodedData> encode_locally ();
boost::shared_ptr<EncodedData> encode_remotely (ServerDescription);