#include "lib/version.h"
#include "lib/decrypted_ecinema_kdm.h"
#include "lib/config.h"
+#include "lib/util.h"
#include <dcp/key.h>
extern "C" {
#include <libavformat/avformat.h>
using std::string;
using std::cerr;
using std::cout;
+using std::ofstream;
using boost::optional;
static void
<< " -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"
+ << " -k, --kdm KDM output filename (defaults to stdout)\n"
<< "\n"
<< "<FILE> is the unencrypted .mp4 file.\n";
}
main (int argc, char* argv[])
{
optional<boost::filesystem::path> output;
+ optional<boost::filesystem::path> format;
+ optional<boost::filesystem::path> kdm;
int option_index = 0;
while (true) {
static struct option long_options[] = {
- { "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' },
+ { "kdm", required_argument, 0, 'k' },
};
- int c = getopt_long (argc, argv, "vho:", long_options, &option_index);
+ int c = getopt_long (argc, argv, "vho:f:k:", long_options, &option_index);
if (c == -1) {
break;
case 'o':
output = optarg;
break;
+ case 'f':
+ format = optarg;
+ break;
+ case 'k':
+ kdm = optarg;
+ break;
}
}
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 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);
}
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);
- 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);
}
- 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;
- 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->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 */
}
}
- 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);
}
dcp::Key key (AES_CTR_KEY_SIZE);
AVDictionary* options = 0;
av_dict_set (&options, "encryption_key", key.hex().c_str(), 0);
+ /* XXX: is this OK? */
+ av_dict_set (&options, "encryption_kid", "00000000000000000000000000000000", 0);
+ av_dict_set (&options, "encryption_scheme", "cenc-aes-ctr", 0);
+
+ string id = dcp::make_uuid ();
+ if (av_dict_set(&output_fc->metadata, SWAROOP_ID_TAG, id.c_str(), 0) < 0) {
+ cerr << "Could not write ID to output.\n";
+ exit (EXIT_FAILURE);
+ }
if (avformat_write_header (output_fc, &options) < 0) {
cerr << "Could not write header to output.\n";
avformat_free_context (input_fc);
avformat_free_context (output_fc);
- DecryptedECinemaKDM kdm (key);
+ DecryptedECinemaKDM decrypted_kdm (id, output_file.filename().string(), key, optional<dcp::LocalTime>(), optional<dcp::LocalTime>());
+ EncryptedECinemaKDM encrypted_kdm = decrypted_kdm.encrypt (Config::instance()->decryption_chain()->leaf());
+
+ if (kdm) {
+ ofstream f(kdm->c_str());
+ f << encrypted_kdm.as_xml() << "\n";
+ } else {
+ cout << encrypted_kdm.as_xml() << "\n";
+ }
}
projects / dcpomatic.git / blobdiff