projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
All audio content should resample if the output frame rate and content
[dcpomatic.git]
/
src
/
lib
/
writer.h
diff --git
a/src/lib/writer.h
b/src/lib/writer.h
index 62714edf39f675e6354510434618e695a214576c..c0699ad4407158294a3c6d48eccdc8739efdca36 100644
(file)
--- a/
src/lib/writer.h
+++ b/
src/lib/writer.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012
-2014
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
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
@@
-22,6
+22,7
@@
#include <boost/thread.hpp>
#include <boost/thread/condition.hpp>
#include "exceptions.h"
#include <boost/thread.hpp>
#include <boost/thread/condition.hpp>
#include "exceptions.h"
+#include "types.h"
class Film;
class EncodedData;
class Film;
class EncodedData;
@@
-31,6
+32,10
@@
class Job;
namespace libdcp {
class MonoPictureAsset;
class MonoPictureAssetWriter;
namespace libdcp {
class MonoPictureAsset;
class MonoPictureAssetWriter;
+ class StereoPictureAsset;
+ class StereoPictureAssetWriter;
+ class PictureAsset;
+ class PictureAssetWriter;
class SoundAsset;
class SoundAssetWriter;
}
class SoundAsset;
class SoundAssetWriter;
}
@@
-56,32
+61,37
@@
public:
int size;
/** frame index */
int frame;
int size;
/** frame index */
int frame;
+ Eyes eyes;
};
bool operator< (QueueItem const & a, QueueItem const & b);
bool operator== (QueueItem const & a, QueueItem const & b);
};
bool operator< (QueueItem const & a, QueueItem const & b);
bool operator== (QueueItem const & a, QueueItem const & b);
-class Writer : public ExceptionStore
+class Writer : public ExceptionStore
, public boost::noncopyable
{
public:
{
public:
- Writer (boost::shared_ptr<Film>, boost::shared_ptr<Job>);
+ Writer (boost::shared_ptr<const Film>, boost::weak_ptr<Job>);
+ ~Writer ();
bool can_fake_write (int) const;
bool can_fake_write (int) const;
- void write (boost::shared_ptr<const EncodedData>, int);
- void fake_write (int);
+ void write (boost::shared_ptr<const EncodedData>, int
, Eyes
);
+ void fake_write (int
, Eyes
);
void write (boost::shared_ptr<const AudioBuffers>);
void write (boost::shared_ptr<const AudioBuffers>);
- void repeat (int f);
+ void repeat (int f
, Eyes
);
void finish ();
private:
void thread ();
void finish ();
private:
void thread ();
+ void terminate_thread (bool);
void check_existing_picture_mxf ();
void check_existing_picture_mxf ();
+ bool check_existing_picture_mxf_frame (FILE *, int, Eyes);
+ bool have_sequenced_image_at_queue_head ();
/** our Film */
/** our Film */
- boost::shared_ptr<Film> _film;
- boost::
shared
_ptr<Job> _job;
+ 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;
/** the first frame index that does not already exist in our MXF */
int _first_nonexistant_frame;
@@
-95,12
+105,15
@@
private:
int _queued_full_in_memory;
/** mutex for thread state */
mutable boost::mutex _mutex;
int _queued_full_in_memory;
/** mutex for thread state */
mutable boost::mutex _mutex;
- /** condition to manage thread wakeups */
- boost::condition _condition;
+ /** 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 */
/** the data of the last written frame, or 0 if there isn't one */
- boost::shared_ptr<const EncodedData> _last_written;
+ boost::shared_ptr<const EncodedData> _last_written
[EYES_COUNT]
;
/** the index of the last written frame */
int _last_written_frame;
/** 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
*/
/** maximum number of frames to hold in memory, for when we are managing
ordering
*/
@@
-117,8
+130,8
@@
private:
*/
int _pushed_to_disk;
*/
int _pushed_to_disk;
- boost::shared_ptr<libdcp::
Mono
PictureAsset> _picture_asset;
- boost::shared_ptr<libdcp::
Mono
PictureAssetWriter> _picture_asset_writer;
+ boost::shared_ptr<libdcp::PictureAsset> _picture_asset;
+ boost::shared_ptr<libdcp::PictureAssetWriter> _picture_asset_writer;
boost::shared_ptr<libdcp::SoundAsset> _sound_asset;
boost::shared_ptr<libdcp::SoundAssetWriter> _sound_asset_writer;
};
boost::shared_ptr<libdcp::SoundAsset> _sound_asset;
boost::shared_ptr<libdcp::SoundAssetWriter> _sound_asset_writer;
};