/*
Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
- This program is free software; you can redistribute it and/or modify
+ This file is part of DCP-o-matic.
+
+ DCP-o-matic is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
- This program is distributed in the hope that it will be useful,
+ DCP-o-matic is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
*/
#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 <boost/thread/condition.hpp>
#include <list>
+namespace dcp {
+ class Data;
+}
+
class Film;
-class Data;
class AudioBuffers;
class Job;
class Font;
class ReferencedReelAsset;
-
-namespace dcp {
- class MonoPictureAsset;
- class MonoPictureAssetWriter;
- class StereoPictureAsset;
- class StereoPictureAssetWriter;
- class PictureAsset;
- class PictureAssetWriter;
- class SoundAsset;
- class SoundAssetWriter;
- class SubtitleAsset;
- class ReelAsset;
-}
+class ReelWriter;
struct QueueItem
{
public:
QueueItem ()
: size (0)
+ , reel (0)
+ , frame (0)
+ , eyes (EYES_BOTH)
{}
enum Type {
*/
FAKE,
REPEAT,
- REF,
} type;
/** encoded data for FULL */
- boost::optional<Data> encoded;
+ boost::optional<dcp::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.
*/
bool can_fake_write (Frame) const;
- void write (Data, Frame, Eyes);
+ void write (dcp::Data, Frame, Eyes);
void fake_write (Frame, Eyes);
- void ref_write (Frame);
+ bool can_repeat (Frame) const;
void repeat (Frame, Eyes);
void write (boost::shared_ptr<const AudioBuffers>);
- void write (PlayerSubtitles subs);
+ void write (PlayerSubtitles subs, DCPTimePeriod period);
void write (std::list<boost::shared_ptr<Font> > fonts);
void write (ReferencedReelAsset asset);
void finish ();
void set_encoder_threads (int threads);
private:
-
- class Reel {
- public:
- Reel ()
- : first_nonexistant_frame (0)
- , written (0)
- {}
-
- DCPTimePeriod period;
- /** the first frame index that does not already exist in our MXF */
- int first_nonexistant_frame;
- Frame written;
-
- 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_asset (Reel& reel);
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;
- Reel const & video_reel (int frame) const;
+ size_t video_reel (int frame) const;
+ void set_digest_progress (Job* job, float progress);
+ void write_cover_sheet ();
/** our Film */
boost::shared_ptr<const Film> _film;
boost::weak_ptr<Job> _job;
- std::list<Reel> _reels;
- std::list<Reel>::iterator _audio_reel;
- std::list<Reel>::iterator _subtitle_reel;
+ 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
*/
/** number of FAKE written frames */
int _fake_written;
int _repeat_written;
- int _ref_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::mutex _digest_progresses_mutex;
+ std::map<boost::thread::id, float> _digest_progresses;
+
std::list<ReferencedReelAsset> _reel_assets;
std::list<boost::shared_ptr<Font> > _fonts;
-
- static int const _info_size;
};
projects / dcpomatic.git / blobdiff