#include "player_subtitles.h"
#include "data.h"
#include "exception_store.h"
-#include <dcp/picture_asset_writer.h>
#include <boost/shared_ptr.hpp>
#include <boost/weak_ptr.hpp>
#include <boost/thread.hpp>
class AudioBuffers;
class Job;
class Font;
-
-namespace dcp {
- class MonoPictureAsset;
- class MonoPictureAssetWriter;
- class StereoPictureAsset;
- class StereoPictureAssetWriter;
- class PictureAsset;
- class PictureAssetWriter;
- class SoundAsset;
- class SoundAssetWriter;
- class SubtitleAsset;
-}
+class ReferencedReelAsset;
+class ReelWriter;
struct QueueItem
{
boost::optional<Data> encoded;
/** size of data for FAKE */
int size;
- /** frame index */
+ /** reel index */
+ size_t reel;
+ /** frame index within the reel */
int frame;
+ /** eyes for FULL, FAKE and REPEAT */
Eyes eyes;
};
* or AudioBuffers objects (containing image or sound data respectively)
* and writes them to the assets.
*
- * ::write() for Data can be called out of order, and the Writer
+ * ::write() for Data (picture) can be called out of order, and the Writer
* will sort it out. write() for AudioBuffers must be called in order.
*/
void start ();
- bool can_fake_write (int) const;
+ bool can_fake_write (Frame) const;
- void write (Data, int, Eyes);
- void fake_write (int, Eyes);
- void repeat (int, Eyes);
+ void write (Data, Frame, Eyes);
+ void fake_write (Frame, Eyes);
+ void repeat (Frame, Eyes);
void write (boost::shared_ptr<const AudioBuffers>);
void write (PlayerSubtitles subs);
void write (std::list<boost::shared_ptr<Font> > fonts);
+ void write (ReferencedReelAsset asset);
void finish ();
void set_encoder_threads (int threads);
private:
-
void thread ();
void terminate_thread (bool);
- 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;
+ size_t video_reel (int frame) const;
/** our Film */
boost::shared_ptr<const Film> _film;
boost::weak_ptr<Job> _job;
- /** the first frame index that does not already exist in our MXF */
- int _first_nonexistant_frame;
+ std::vector<ReelWriter> _reels;
+ std::vector<ReelWriter>::iterator _audio_reel;
+ std::vector<ReelWriter>::iterator _subtitle_reel;
/** our thread, or 0 */
boost::thread* _thread;
boost::condition _empty_condition;
/** condition to manage thread wakeups when we have too much to do */
boost::condition _full_condition;
- /** the data of the last written frame, if there is one */
- boost::optional<Data> _last_written[EYES_COUNT];
- /** the index of the last written frame */
- int _last_written_frame;
- Eyes _last_written_eyes;
/** maximum number of frames to hold in memory, for when we are managing
* ordering
*/
*/
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::SoundAssetWriter> _sound_asset_writer;
- boost::shared_ptr<dcp::SubtitleAsset> _subtitle_asset;
+ std::list<ReferencedReelAsset> _reel_assets;
std::list<boost::shared_ptr<Font> > _fonts;
};