/*
- Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2019 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 "player_text.h"
#include "exception_store.h"
+#include "dcp_text_track.h"
#include <boost/shared_ptr.hpp>
#include <boost/weak_ptr.hpp>
#include <boost/thread.hpp>
class Data;
}
+namespace dcpomatic {
+ class Font;
+}
+
class Film;
class AudioBuffers;
class Job;
-class Font;
class ReferencedReelAsset;
class ReelWriter;
public:
QueueItem ()
: size (0)
+ , reel (0)
+ , frame (0)
+ , eyes (EYES_BOTH)
{}
enum Type {
* or AudioBuffers objects (containing image or sound data respectively)
* and writes them to the assets.
*
- * ::write() for Data (picture) 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 fake_write (Frame, Eyes);
bool can_repeat (Frame) const;
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 (boost::shared_ptr<const AudioBuffers>, dcpomatic::DCPTime time);
+ void write (PlayerText text, TextType type, boost::optional<DCPTextTrack>, dcpomatic::DCPTimePeriod period);
+ void write (std::list<boost::shared_ptr<dcpomatic::Font> > fonts);
void write (ReferencedReelAsset asset);
void finish ();
void terminate_thread (bool);
bool have_sequenced_image_at_queue_head ();
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;
std::vector<ReelWriter> _reels;
std::vector<ReelWriter>::iterator _audio_reel;
std::vector<ReelWriter>::iterator _subtitle_reel;
+ std::map<DCPTextTrack, std::vector<ReelWriter>::iterator> _caption_reels;
- /** our thread, or 0 */
- boost::thread* _thread;
+ /** our thread */
+ boost::thread _thread;
/** true if our thread should finish */
bool _finish;
/** queue of things to write to disk */
* ordering
*/
int _maximum_frames_in_memory;
+ unsigned int _maximum_queue_size;
+
+ class LastWritten
+ {
+ public:
+ LastWritten()
+ : _frame(-1)
+ , _eyes(EYES_RIGHT)
+ {}
+
+ /** @return true if qi is the next item after this one */
+ bool next (QueueItem qi) const;
+ void update (QueueItem qi);
+
+ int frame () const {
+ return _frame;
+ }
+
+ private:
+ int _frame;
+ Eyes _eyes;
+ };
+
+ /** The last frame written to each reel */
+ std::vector<LastWritten> _last_written;
/** number of FULL written frames */
int _full_written;
*/
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;
+ std::list<boost::shared_ptr<dcpomatic::Font> > _fonts;
};