projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '2.0' of ssh://git.carlh.net/home/carl/git/dcpomatic2 into 2.0
[dcpomatic.git]
/
src
/
lib
/
writer.h
diff --git
a/src/lib/writer.h
b/src/lib/writer.h
index 1094dee3cc70505ab3ba982a8e5b07d421b065cf..486d7d672aa31357b330259cfa89bffc9fbfff0b 100644
(file)
--- a/
src/lib/writer.h
+++ b/
src/lib/writer.h
@@
-25,6
+25,7
@@
#include "types.h"
#include "player_subtitles.h"
#include "data.h"
#include "types.h"
#include "player_subtitles.h"
#include "data.h"
+#include <dcp/picture_asset_writer.h>
#include <boost/shared_ptr.hpp>
#include <boost/weak_ptr.hpp>
#include <boost/thread.hpp>
#include <boost/shared_ptr.hpp>
#include <boost/weak_ptr.hpp>
#include <boost/thread.hpp>
@@
-52,6
+53,10
@@
namespace dcp {
struct QueueItem
{
public:
struct QueueItem
{
public:
+ QueueItem ()
+ : size (0)
+ {}
+
enum Type {
/** a normal frame with some JPEG200 data */
FULL,
enum Type {
/** a normal frame with some JPEG200 data */
FULL,
@@
-60,6
+65,7
@@
public:
state but we use the data that is already on disk.
*/
FAKE,
state but we use the data that is already on disk.
*/
FAKE,
+ REPEAT,
} type;
/** encoded data for FULL */
} type;
/** encoded data for FULL */
@@
-92,13
+98,13
@@
public:
~Writer ();
bool can_fake_write (int) const;
~Writer ();
bool can_fake_write (int) const;
-
+
void write (Data, int, Eyes);
void fake_write (int, Eyes);
void write (Data, int, Eyes);
void fake_write (int, Eyes);
+ void repeat (int, Eyes);
void write (boost::shared_ptr<const AudioBuffers>);
void write (PlayerSubtitles subs);
void write (std::list<boost::shared_ptr<Font> > fonts);
void write (boost::shared_ptr<const AudioBuffers>);
void write (PlayerSubtitles subs);
void write (std::list<boost::shared_ptr<Font> > fonts);
- void repeat (int f, Eyes);
void finish ();
void set_encoder_threads (int threads);
void finish ();
void set_encoder_threads (int threads);
@@
-110,6
+116,9
@@
private:
void check_existing_picture_asset ();
bool check_existing_picture_asset_frame (FILE *, int, Eyes);
bool have_sequenced_image_at_queue_head ();
void check_existing_picture_asset ();
bool check_existing_picture_asset_frame (FILE *, int, Eyes);
bool have_sequenced_image_at_queue_head ();
+ void write_frame_info (int frame, Eyes eyes, dcp::FrameInfo info) const;
+ long frame_info_position (int frame, Eyes eyes) const;
+ dcp::FrameInfo read_frame_info (FILE* file, int frame, Eyes eyes) const;
/** our Film */
boost::shared_ptr<const Film> _film;
/** our Film */
boost::shared_ptr<const Film> _film;
@@
-140,16
+149,17
@@
private:
* ordering
*/
int _maximum_frames_in_memory;
* ordering
*/
int _maximum_frames_in_memory;
-
+
/** number of FULL written frames */
int _full_written;
/** number of FAKE written frames */
int _fake_written;
/** number of FULL written frames */
int _full_written;
/** number of FAKE written frames */
int _fake_written;
+ int _repeat_written;
/** number of frames pushed to disk and then recovered
due to the limit of frames to be held in memory.
*/
int _pushed_to_disk;
/** number of frames pushed to disk and then recovered
due to the limit of frames to be held in memory.
*/
int _pushed_to_disk;
-
+
boost::shared_ptr<dcp::PictureAsset> _picture_asset;
boost::shared_ptr<dcp::PictureAssetWriter> _picture_asset_writer;
boost::shared_ptr<dcp::SoundAsset> _sound_asset;
boost::shared_ptr<dcp::PictureAsset> _picture_asset;
boost::shared_ptr<dcp::PictureAssetWriter> _picture_asset_writer;
boost::shared_ptr<dcp::SoundAsset> _sound_asset;