av_dict_set (&_video_options, "profile", "3", 0);
av_dict_set (&_video_options, "threads", "auto", 0);
break;
- case EXPORT_FORMAT_H264:
+ case EXPORT_FORMAT_H264_AAC:
_sample_format = AV_SAMPLE_FMT_FLTP;
_video_codec_name = "libx264";
_audio_codec_name = "aac";
av_dict_set_int (&_video_options, "crf", x264_crf, 0);
break;
+ case EXPORT_FORMAT_H264_PCM:
+ _sample_format = AV_SAMPLE_FMT_S32;
+ _video_codec_name = "libx264";
+ _audio_codec_name = "pcm_s24le";
+ av_dict_set_int (&_video_options, "crf", x264_crf, 0);
+ break;
}
setup_video ();
setup_audio ();
#ifdef DCPOMATIC_VARIANT_SWAROOP
- int r = avformat_alloc_output_context2 (&_format_context, av_guess_format("mp4", 0, 0), 0, 0);
+ int r = avformat_alloc_output_context2 (&_format_context, av_guess_format("mov", 0, 0), 0, 0);
#else
int r = avformat_alloc_output_context2 (&_format_context, 0, 0, _output.string().c_str());
#endif
switch (format) {
case EXPORT_FORMAT_PRORES:
return AV_PIX_FMT_YUV422P10;
- case EXPORT_FORMAT_H264:
+ case EXPORT_FORMAT_H264_AAC:
+ case EXPORT_FORMAT_H264_PCM:
return AV_PIX_FMT_YUV420P;
default:
DCPOMATIC_ASSERT (false);
}
break;
}
+ case AV_SAMPLE_FMT_S32:
+ {
+ int32_t* q = reinterpret_cast<int32_t*> (samples);
+ for (int i = 0; i < size; ++i) {
+ for (int j = 0; j < channels; ++j) {
+ *q++ = p[j][i] * 2147483647;
+ }
+ }
+ break;
+ }
case AV_SAMPLE_FMT_FLTP:
{
float* q = reinterpret_cast<float*> (samples);
string name = "ffmpeg_encoder_";
string extension;
switch (format) {
- case EXPORT_FORMAT_H264:
+ case EXPORT_FORMAT_H264_AAC:
name += "h264";
extension = "mp4";
break;
/** Red / green / blue MP4 -> H264 */
BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test1)
{
- ffmpeg_content_test(1, "test/data/test.mp4", EXPORT_FORMAT_H264);
+ ffmpeg_content_test(1, "test/data/test.mp4", EXPORT_FORMAT_H264_AAC);
}
/** Just subtitles -> H264 */
film->write_metadata();
shared_ptr<Job> job (new TranscodeJob (film));
- FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_h264_test2.mp4", EXPORT_FORMAT_H264, false, false, 23
+ FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_h264_test2.mp4", EXPORT_FORMAT_H264_AAC, false, false, 23
#ifdef DCPOMATIC_VARIANT_SWAROOP
, optional<dcp::Key>(), optional<string>()
#endif
film->write_metadata();
shared_ptr<Job> job (new TranscodeJob (film));
- FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_h264_test3.mp4", EXPORT_FORMAT_H264, false, false, 23
+ FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_h264_test3.mp4", EXPORT_FORMAT_H264_AAC, false, false, 23
#ifdef DCPOMATIC_VARIANT_SWAROOP
, optional<dcp::Key>(), optional<string>()
#endif
film->set_container(Ratio::from_id("185"));
shared_ptr<Job> job(new TranscodeJob(film));
- FFmpegEncoder encoder(film, job, "build/test/ffmpeg_encoder_h264_test4.mp4", EXPORT_FORMAT_H264, false, false, 23
+ FFmpegEncoder encoder(film, job, "build/test/ffmpeg_encoder_h264_test4.mp4", EXPORT_FORMAT_H264_AAC, false, false, 23
#ifdef DCPOMATIC_VARIANT_SWAROOP
, optional<dcp::Key>(), optional<string>()
#endif
Rs->audio->set_mapping (map);
shared_ptr<Job> job (new TranscodeJob (film));
- FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_h264_test5.mp4", EXPORT_FORMAT_H264, true, false, 23
+ FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_h264_test5.mp4", EXPORT_FORMAT_H264_AAC, true, false, 23
#ifdef DCPOMATIC_VARIANT_SWAROOP
, optional<dcp::Key>(), optional<string>()
#endif
}
shared_ptr<Job> job (new TranscodeJob (film2));
- FFmpegEncoder encoder (film2, job, "build/test/ffmpeg_encoder_h264_test6_vf.mp4", EXPORT_FORMAT_H264, true, false, 23
+ FFmpegEncoder encoder (film2, job, "build/test/ffmpeg_encoder_h264_test6_vf.mp4", EXPORT_FORMAT_H264_AAC, true, false, 23
#ifdef DCPOMATIC_VARIANT_SWAROOP
, optional<dcp::Key>(), optional<string>()
#endif