projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
swaroop: various fixes to dcpomatic_ecinema.
[dcpomatic.git]
/
src
/
tools
/
dcpomatic_ecinema.cc
diff --git
a/src/tools/dcpomatic_ecinema.cc
b/src/tools/dcpomatic_ecinema.cc
index a0324f281aa033f40fa620adfba197365b3f56a9..740893fa9fdc78fa0aec6110734b0cfa5a403c5b 100644
(file)
--- a/
src/tools/dcpomatic_ecinema.cc
+++ b/
src/tools/dcpomatic_ecinema.cc
@@
-48,6
+48,7
@@
help (string n)
<< " -v, --version show DCP-o-matic version\n"
<< " -h, --help show this help\n"
<< " -o, --output output directory\n"
<< " -v, --version show DCP-o-matic version\n"
<< " -h, --help show this help\n"
<< " -o, --output output directory\n"
+ << " -f, --format output format (mov or mp4; defaults to mov)\n"
<< "\n"
<< "<FILE> is the unencrypted .mp4 file.\n";
}
<< "\n"
<< "<FILE> is the unencrypted .mp4 file.\n";
}
@@
-56,6
+57,7
@@
int
main (int argc, char* argv[])
{
optional<boost::filesystem::path> output;
main (int argc, char* argv[])
{
optional<boost::filesystem::path> output;
+ optional<boost::filesystem::path> format;
int option_index = 0;
while (true) {
int option_index = 0;
while (true) {
@@
-63,9
+65,10
@@
main (int argc, char* argv[])
{ "version", no_argument, 0, 'v'},
{ "help", no_argument, 0, 'h'},
{ "output", required_argument, 0, 'o'},
{ "version", no_argument, 0, 'v'},
{ "help", no_argument, 0, 'h'},
{ "output", required_argument, 0, 'o'},
+ { "format", required_argument, 0, 'f'},
};
};
- int c = getopt_long (argc, argv, "vho:", long_options, &option_index);
+ int c = getopt_long (argc, argv, "vho:
f:
", long_options, &option_index);
if (c == -1) {
break;
if (c == -1) {
break;
@@
-81,6
+84,9
@@
main (int argc, char* argv[])
case 'o':
output = optarg;
break;
case 'o':
output = optarg;
break;
+ case 'f':
+ format = optarg;
+ break;
}
}
}
}
@@
-94,8
+100,17
@@
main (int argc, char* argv[])
exit (EXIT_FAILURE);
}
exit (EXIT_FAILURE);
}
+ if (!format) {
+ format = "mov";
+ }
+
+ if (*format != "mov" && *format != "mp4") {
+ cerr << "Invalid format specified: must be mov or mp4\n";
+ exit (EXIT_FAILURE);
+ }
+
boost::filesystem::path input = argv[optind];
boost::filesystem::path input = argv[optind];
- boost::filesystem::path output_
mp4
= *output / (input.filename().string() + ".ecinema");
+ boost::filesystem::path output_
file
= *output / (input.filename().string() + ".ecinema");
if (!boost::filesystem::is_directory(*output)) {
boost::filesystem::create_directory (*output);
if (!boost::filesystem::is_directory(*output)) {
boost::filesystem::create_directory (*output);
@@
-115,20
+130,21
@@
main (int argc, char* argv[])
}
AVFormatContext* output_fc;
}
AVFormatContext* output_fc;
- avformat_alloc_output_context2 (&output_fc, av_guess_format(
"mp4"
, 0, 0), 0, 0);
+ avformat_alloc_output_context2 (&output_fc, av_guess_format(
format->c_str()
, 0, 0), 0, 0);
for (uint32_t i = 0; i < input_fc->nb_streams; ++i) {
AVStream* is = input_fc->streams[i];
AVStream* os = avformat_new_stream (output_fc, is->codec->codec);
for (uint32_t i = 0; i < input_fc->nb_streams; ++i) {
AVStream* is = input_fc->streams[i];
AVStream* os = avformat_new_stream (output_fc, is->codec->codec);
- if (avcodec_
copy_context (os->codec, is->codec
) < 0) {
+ if (avcodec_
parameters_copy (os->codecpar, is->codecpar
) < 0) {
cerr << "Could not set up output stream.\n";
exit (EXIT_FAILURE);
}
cerr << "Could not set up output stream.\n";
exit (EXIT_FAILURE);
}
- switch (os->codec->codec_type) {
+ os->avg_frame_rate = is->avg_frame_rate;
+
+ switch (is->codec->codec_type) {
case AVMEDIA_TYPE_VIDEO:
os->time_base = is->time_base;
case AVMEDIA_TYPE_VIDEO:
os->time_base = is->time_base;
- os->avg_frame_rate = is->avg_frame_rate;
os->r_frame_rate = is->r_frame_rate;
os->sample_aspect_ratio = is->sample_aspect_ratio;
os->codec->time_base = is->codec->time_base;
os->r_frame_rate = is->r_frame_rate;
os->sample_aspect_ratio = is->sample_aspect_ratio;
os->codec->time_base = is->codec->time_base;
@@
-141,6
+157,10
@@
main (int argc, char* argv[])
os->codec->sample_rate = is->codec->sample_rate;
os->codec->channel_layout = is->codec->channel_layout;
os->codec->channels = is->codec->channels;
os->codec->sample_rate = is->codec->sample_rate;
os->codec->channel_layout = is->codec->channel_layout;
os->codec->channels = is->codec->channels;
+ if (is->codecpar->codec_id == AV_CODEC_ID_PCM_S24LE) {
+ /* XXX: fix incoming 24-bit files labelled lpcm, which apparently isn't allowed */
+ os->codecpar->codec_tag = MKTAG('i', 'n', '2', '4');
+ }
break;
default:
/* XXX */
break;
default:
/* XXX */
@@
-148,8
+168,8
@@
main (int argc, char* argv[])
}
}
}
}
- if (avio_open2 (&output_fc->pb, output_
mp4
.string().c_str(), AVIO_FLAG_WRITE, 0, 0) < 0) {
- cerr << "Could not open output file `" << output_
mp4
.string() << "'\n";
+ if (avio_open2 (&output_fc->pb, output_
file
.string().c_str(), AVIO_FLAG_WRITE, 0, 0) < 0) {
+ cerr << "Could not open output file `" << output_
file
.string() << "'\n";
exit (EXIT_FAILURE);
}
exit (EXIT_FAILURE);
}
@@
-190,7
+210,7
@@
main (int argc, char* argv[])
avformat_free_context (input_fc);
avformat_free_context (output_fc);
avformat_free_context (input_fc);
avformat_free_context (output_fc);
- DecryptedECinemaKDM decrypted_kdm (id, output_
mp4
.filename().string(), key);
+ DecryptedECinemaKDM decrypted_kdm (id, output_
file
.filename().string(), key);
EncryptedECinemaKDM encrypted_kdm = decrypted_kdm.encrypt (Config::instance()->decryption_chain()->leaf());
cout << encrypted_kdm.as_xml() << "\n";
}
EncryptedECinemaKDM encrypted_kdm = decrypted_kdm.encrypt (Config::instance()->decryption_chain()->leaf());
cout << encrypted_kdm.as_xml() << "\n";
}