/*
- Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
* @brief Writer class.
*/
-#include "exceptions.h"
#include "types.h"
#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>
#include <list>
class Film;
-class EncodedData;
+class Data;
class AudioBuffers;
class Job;
class Font;
namespace dcp {
- class MonoPictureMXF;
- class MonoPictureMXFWriter;
- class StereoPictureMXF;
- class StereoPictureMXFWriter;
- class PictureMXF;
- class PictureMXFWriter;
- class SoundMXF;
- class SoundMXFWriter;
- class InteropSubtitleContent;
+ class MonoPictureAsset;
+ class MonoPictureAssetWriter;
+ class StereoPictureAsset;
+ class StereoPictureAssetWriter;
+ class PictureAsset;
+ class PictureAssetWriter;
+ class SoundAsset;
+ class SoundAssetWriter;
+ class SubtitleAsset;
+ class ReelAsset;
}
struct QueueItem
{
public:
+ QueueItem ()
+ : size (0)
+ {}
+
enum Type {
/** a normal frame with some JPEG200 data */
FULL,
state but we use the data that is already on disk.
*/
FAKE,
+ REPEAT,
} type;
/** encoded data for FULL */
- boost::shared_ptr<const EncodedData> encoded;
+ boost::optional<Data> encoded;
/** size of data for FAKE */
int size;
/** frame index */
bool operator== (QueueItem const & a, QueueItem const & b);
/** @class Writer
- * @brief Class to manage writing JPEG2000 and audio data to MXFs on disk.
+ * @brief Class to manage writing JPEG2000 and audio data to assets on disk.
*
- * This class creates sound and picture MXFs, then takes EncodedData
+ * This class creates sound and picture assets, then takes Data
* or AudioBuffers objects (containing image or sound data respectively)
- * and writes them to the MXFs.
+ * and writes them to the assets.
*
- * ::write() for EncodedData can be called out of order, and the Writer
+ * ::write() for Data can be called out of order, and the Writer
* will sort it out. write() for AudioBuffers must be called in order.
*/
Writer (boost::shared_ptr<const Film>, boost::weak_ptr<Job>);
~Writer ();
+ void start ();
+
bool can_fake_write (int) const;
-
- void write (boost::shared_ptr<const EncodedData>, 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 repeat (int f, Eyes);
+ void write (boost::shared_ptr<dcp::ReelAsset> reel_asset);
void finish ();
+ void set_encoder_threads (int threads);
+
private:
+ class Reel {
+ public:
+ Reel ()
+ : first_nonexistant_frame (0)
+ {}
+
+ DCPTimePeriod period;
+ /** the first frame index that does not already exist in our MXF */
+ int first_nonexistant_frame;
+
+ 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;
+ };
+
void thread ();
void terminate_thread (bool);
- void check_existing_picture_mxf ();
- bool check_existing_picture_mxf_frame (FILE *, int, Eyes);
+ void check_existing_picture_asset (Reel& reel);
bool have_sequenced_image_at_queue_head ();
- /** maximum number of frames to hold in memory, for when we are managing
- * ordering
- */
- int maximum_frames_in_memory () const;
+ 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;
+ Reel const & 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::list<Reel> _reels;
+ std::list<Reel>::iterator _audio_reel;
+ std::list<Reel>::iterator _subtitle_reel;
/** our thread, or 0 */
boost::thread* _thread;
/** number of FULL frames whose JPEG200 data is currently held in RAM */
int _queued_full_in_memory;
/** mutex for thread state */
- mutable boost::mutex _mutex;
+ mutable boost::mutex _state_mutex;
/** condition to manage thread wakeups when we have nothing to do */
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, or 0 if there isn't one */
- boost::shared_ptr<const EncodedData> _last_written[EYES_COUNT];
+ /** 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 _maximum_frames_in_memory;
/** 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;
-
- boost::shared_ptr<dcp::PictureMXF> _picture_mxf;
- boost::shared_ptr<dcp::PictureMXFWriter> _picture_mxf_writer;
- boost::shared_ptr<dcp::SoundMXF> _sound_mxf;
- boost::shared_ptr<dcp::SoundMXFWriter> _sound_mxf_writer;
- boost::shared_ptr<dcp::InteropSubtitleContent> _subtitle_content;
+
+ std::list<boost::shared_ptr<dcp::ReelAsset> > _reel_assets;
+
+ std::list<boost::shared_ptr<Font> > _fonts;
+
+ static int const _info_size;
};
projects / dcpomatic.git / blobdiff