projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename dcpomatic_sleep -> dcpomatic_sleep_seconds.
[dcpomatic.git]
/
src
/
tools
/
dcpomatic_ecinema.cc
diff --git
a/src/tools/dcpomatic_ecinema.cc
b/src/tools/dcpomatic_ecinema.cc
index d6ac16eaea92fbc36c22b60794219b712b37540c..152194c482f415560320a4feaae9fb0816770431 100644
(file)
--- a/
src/tools/dcpomatic_ecinema.cc
+++ b/
src/tools/dcpomatic_ecinema.cc
@@
-29,6
+29,8
@@
#include "lib/transcode_job.h"
#include "lib/ffmpeg_encoder.h"
#include "lib/signal_manager.h"
#include "lib/transcode_job.h"
#include "lib/ffmpeg_encoder.h"
#include "lib/signal_manager.h"
+#include "lib/video_content.h"
+#include "lib/ratio.h"
#include <dcp/key.h>
extern "C" {
#include <libavformat/avformat.h>
#include <dcp/key.h>
extern "C" {
#include <libavformat/avformat.h>
@@
-288,17
+290,19
@@
convert_dcp (
JobManager* jm = JobManager::instance ();
while (jm->work_to_do ()) {
while (signal_manager->ui_idle ()) {}
JobManager* jm = JobManager::instance ();
while (jm->work_to_do ()) {
while (signal_manager->ui_idle ()) {}
- dcpomatic_sleep (1);
+ dcpomatic_sleep
_seconds
(1);
}
DCPOMATIC_ASSERT (!jm->errors());
}
DCPOMATIC_ASSERT (!jm->errors());
+ film->set_container (Ratio::nearest_from_ratio(dcp->video->size().ratio()));
+
string id = dcp::make_uuid ();
dcp::Key key (AES_CTR_KEY_SIZE);
shared_ptr<TranscodeJob> job (new TranscodeJob(film));
job->set_encoder (
shared_ptr<FFmpegEncoder>(
string id = dcp::make_uuid ();
dcp::Key key (AES_CTR_KEY_SIZE);
shared_ptr<TranscodeJob> job (new TranscodeJob(film));
job->set_encoder (
shared_ptr<FFmpegEncoder>(
- new FFmpegEncoder(film, job, output_file, EXPORT_FORMAT_H264, false, false, crf, key, id)
+ new FFmpegEncoder(film, job, output_file, EXPORT_FORMAT_H264
_PCM
, false, false, crf, key, id)
)
);
jm->add (job);
)
);
jm->add (job);