projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Keep default export name even if the user changes the format (#1584).
[dcpomatic.git]
/
src
/
lib
/
ffmpeg_file_encoder.h
diff --git
a/src/lib/ffmpeg_file_encoder.h
b/src/lib/ffmpeg_file_encoder.h
index 8b9d0b67c2a7269af994690ca52ede24a6880bc2..9f1e75b686b76f32d67778a36403c0f77704ff07 100644
(file)
--- a/
src/lib/ffmpeg_file_encoder.h
+++ b/
src/lib/ffmpeg_file_encoder.h
@@
-25,6
+25,7
@@
#include "event_history.h"
#include "audio_mapping.h"
#include "log.h"
#include "event_history.h"
#include "audio_mapping.h"
#include "log.h"
+#include <dcp/key.h>
extern "C" {
#include <libavcodec/avcodec.h>
#include <libavformat/avformat.h>
extern "C" {
#include <libavcodec/avcodec.h>
#include <libavformat/avformat.h>
@@
-41,11
+42,15
@@
public:
ExportFormat,
int x264_crf,
boost::filesystem::path output
ExportFormat,
int x264_crf,
boost::filesystem::path output
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+ , boost::optional<dcp::Key> key
+ , boost::optional<std::string> id
+#endif
);
);
- void video (boost::shared_ptr<PlayerVideo>, DCPTime);
+ void video (boost::shared_ptr<PlayerVideo>,
dcpomatic::
DCPTime);
void audio (boost::shared_ptr<AudioBuffers>);
void audio (boost::shared_ptr<AudioBuffers>);
- void subtitle (PlayerText, DCPTimePeriod);
+ void subtitle (PlayerText,
dcpomatic::
DCPTimePeriod);
void flush ();
void flush ();
@@
-85,6
+90,7
@@
private:
their data have been passed to FFmpeg.
*/
std::map<uint8_t*, boost::shared_ptr<const Image> > _pending_images;
their data have been passed to FFmpeg.
*/
std::map<uint8_t*, boost::shared_ptr<const Image> > _pending_images;
+ boost::mutex _pending_images_mutex;
static int _video_stream_index;
static int _audio_stream_index;
static int _video_stream_index;
static int _audio_stream_index;