projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Put Time types in dcpomatic namespace.
[dcpomatic.git]
/
src
/
lib
/
writer.h
diff --git
a/src/lib/writer.h
b/src/lib/writer.h
index 28e243c352a87247e731b33aac6d67a991dd825c..ce1d04cedb8c239087bd444c05daa4f859f20b14 100644
(file)
--- a/
src/lib/writer.h
+++ b/
src/lib/writer.h
@@
-1,19
+1,20
@@
/*
/*
- Copyright (C) 2012-201
5
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-201
8
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.
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
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/>.
*/
*/
@@
-22,17
+23,20
@@
*/
#include "types.h"
*/
#include "types.h"
-#include "player_subtitles.h"
-#include "data.h"
+#include "player_text.h"
#include "exception_store.h"
#include "exception_store.h"
+#include "dcp_text_track.h"
#include <boost/shared_ptr.hpp>
#include <boost/weak_ptr.hpp>
#include <boost/thread.hpp>
#include <boost/thread/condition.hpp>
#include <list>
#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 Film;
-class Data;
class AudioBuffers;
class Job;
class Font;
class AudioBuffers;
class Job;
class Font;
@@
-44,6
+48,9
@@
struct QueueItem
public:
QueueItem ()
: size (0)
public:
QueueItem ()
: size (0)
+ , reel (0)
+ , frame (0)
+ , eyes (EYES_BOTH)
{}
enum Type {
{}
enum Type {
@@
-58,7
+65,7
@@
public:
} type;
/** encoded data for FULL */
} type;
/** encoded data for FULL */
- boost::optional<Data> encoded;
+ boost::optional<
dcp::
Data> encoded;
/** size of data for FAKE */
int size;
/** reel index */
/** size of data for FAKE */
int size;
/** reel index */
@@
-79,7
+86,7
@@
bool operator== (QueueItem const & a, QueueItem const & b);
* or AudioBuffers objects (containing image or sound data respectively)
* and writes them to the assets.
*
* 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.
*/
* will sort it out. write() for AudioBuffers must be called in order.
*/
@@
-93,11
+100,12
@@
public:
bool can_fake_write (Frame) const;
bool can_fake_write (Frame) const;
- void write (Data, Frame, Eyes);
+ void write (
dcp::
Data, Frame, Eyes);
void fake_write (Frame, Eyes);
void fake_write (Frame, Eyes);
+ bool can_repeat (Frame) const;
void repeat (Frame, Eyes);
void repeat (Frame, Eyes);
- void write (boost::shared_ptr<const AudioBuffers>);
- void write (Player
Subtitles subs
);
+ void write (boost::shared_ptr<const AudioBuffers>
, dcpomatic::DCPTime time
);
+ void write (Player
Text text, TextType type, boost::optional<DCPTextTrack>, dcpomatic::DCPTimePeriod period
);
void write (std::list<boost::shared_ptr<Font> > fonts);
void write (ReferencedReelAsset asset);
void finish ();
void write (std::list<boost::shared_ptr<Font> > fonts);
void write (ReferencedReelAsset asset);
void finish ();
@@
-109,6
+117,8
@@
private:
void terminate_thread (bool);
bool have_sequenced_image_at_queue_head ();
size_t video_reel (int frame) const;
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;
/** our Film */
boost::shared_ptr<const Film> _film;
@@
-116,6
+126,7
@@
private:
std::vector<ReelWriter> _reels;
std::vector<ReelWriter>::iterator _audio_reel;
std::vector<ReelWriter>::iterator _subtitle_reel;
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, or 0 */
boost::thread* _thread;
@@
-135,6
+146,7
@@
private:
* ordering
*/
int _maximum_frames_in_memory;
* ordering
*/
int _maximum_frames_in_memory;
+ unsigned int _maximum_queue_size;
/** number of FULL written frames */
int _full_written;
/** number of FULL written frames */
int _full_written;
@@
-146,6
+158,9
@@
private:
*/
int _pushed_to_disk;
*/
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<ReferencedReelAsset> _reel_assets;
std::list<boost::shared_ptr<Font> > _fonts;