X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fffmpeg_encoder_test.cc;h=4b323c5bf4cb79eae724b10f85f6cf67db9c6bba;hb=07e6c3270cad21adf2a52064b5b283defad79228;hp=fc53ee40c3221049eddd97d1c30589ea9ce8f15c;hpb=2e60a7b24823b6b543f2920e0b5646fbce1ff6e7;p=dcpomatic.git diff --git a/test/ffmpeg_encoder_test.cc b/test/ffmpeg_encoder_test.cc index fc53ee40c..4b323c5bf 100644 --- a/test/ffmpeg_encoder_test.cc +++ b/test/ffmpeg_encoder_test.cc @@ -24,11 +24,11 @@ #include "lib/image_content.h" #include "lib/video_content.h" #include "lib/audio_content.h" -#include "lib/text_subtitle_content.h" +#include "lib/string_text_file_content.h" #include "lib/ratio.h" #include "lib/transcode_job.h" #include "lib/dcp_content.h" -#include "lib/subtitle_content.h" +#include "lib/text_content.h" #include "lib/compose.hpp" #include "test.h" #include @@ -37,16 +37,16 @@ using std::string; using boost::shared_ptr; static void -ffmpeg_content_test (int number, boost::filesystem::path content, FFmpegEncoder::Format format) +ffmpeg_content_test (int number, boost::filesystem::path content, ExportFormat format) { string name = "ffmpeg_encoder_"; string extension; switch (format) { - case FFmpegEncoder::FORMAT_H264: + case EXPORT_FORMAT_H264: name += "h264"; extension = "mp4"; break; - case FFmpegEncoder::FORMAT_PRORES: + case EXPORT_FORMAT_PRORES: name += "prores"; extension = "mov"; break; @@ -65,32 +65,32 @@ ffmpeg_content_test (int number, boost::filesystem::path content, FFmpegEncoder: film->write_metadata (); shared_ptr job (new TranscodeJob (film)); - FFmpegEncoder encoder (film, job, String::compose("build/test/%1.%2", name, extension), format, false); + FFmpegEncoder encoder (film, job, String::compose("build/test/%1.%2", name, extension), format, false, false, 23); encoder.go (); } /** Red / green / blue MP4 -> Prores */ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_test1) { - ffmpeg_content_test (1, "test/data/test.mp4", FFmpegEncoder::FORMAT_PRORES); + ffmpeg_content_test (1, "test/data/test.mp4", EXPORT_FORMAT_PRORES); } /** Dolby Aurora trailer VOB -> Prores */ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_test2) { - ffmpeg_content_test (2, private_data / "dolby_aurora.vob", FFmpegEncoder::FORMAT_PRORES); + ffmpeg_content_test (2, private_data / "dolby_aurora.vob", EXPORT_FORMAT_PRORES); } /** Sintel trailer -> Prores */ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_test3) { - ffmpeg_content_test (3, private_data / "Sintel_Trailer1.480p.DivX_Plus_HD.mkv", FFmpegEncoder::FORMAT_PRORES); + ffmpeg_content_test (3, private_data / "Sintel_Trailer1.480p.DivX_Plus_HD.mkv", EXPORT_FORMAT_PRORES); } /** Big Buck Bunny trailer -> Prores */ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_test4) { - ffmpeg_content_test (4, private_data / "big_buck_bunny_trailer_480p.mov", FFmpegEncoder::FORMAT_PRORES); + ffmpeg_content_test (4, private_data / "big_buck_bunny_trailer_480p.mov", EXPORT_FORMAT_PRORES); } /** Still image -> Prores */ @@ -109,7 +109,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_test5) film->write_metadata (); shared_ptr job (new TranscodeJob (film)); - FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_prores_test5.mov", FFmpegEncoder::FORMAT_PRORES, false); + FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_prores_test5.mov", EXPORT_FORMAT_PRORES, false, false, 23); encoder.go (); } @@ -121,16 +121,16 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_test6) film->set_container (Ratio::from_id ("185")); film->set_audio_channels (6); - shared_ptr s (new TextSubtitleContent (film, "test/data/subrip2.srt")); + shared_ptr s (new StringTextFileContent (film, "test/data/subrip2.srt")); film->examine_and_add_content (s); BOOST_REQUIRE (!wait_for_jobs ()); - s->subtitle->set_colour (dcp::Colour (255, 255, 0)); - s->subtitle->set_effect (dcp::SHADOW); - s->subtitle->set_effect_colour (dcp::Colour (0, 255, 255)); + s->only_text()->set_colour (dcp::Colour (255, 255, 0)); + s->only_text()->set_effect (dcp::SHADOW); + s->only_text()->set_effect_colour (dcp::Colour (0, 255, 255)); film->write_metadata(); shared_ptr job (new TranscodeJob (film)); - FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_prores_test6.mov", FFmpegEncoder::FORMAT_PRORES, false); + FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_prores_test6.mov", EXPORT_FORMAT_PRORES, false, false, 23); encoder.go (); } @@ -146,22 +146,22 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_test7) film->examine_and_add_content (c); BOOST_REQUIRE (!wait_for_jobs ()); - shared_ptr s (new TextSubtitleContent (film, "test/data/subrip.srt")); + shared_ptr s (new StringTextFileContent (film, "test/data/subrip.srt")); film->examine_and_add_content (s); BOOST_REQUIRE (!wait_for_jobs ()); - s->subtitle->set_colour (dcp::Colour (255, 255, 0)); - s->subtitle->set_effect (dcp::SHADOW); - s->subtitle->set_effect_colour (dcp::Colour (0, 255, 255)); + s->only_text()->set_colour (dcp::Colour (255, 255, 0)); + s->only_text()->set_effect (dcp::SHADOW); + s->only_text()->set_effect_colour (dcp::Colour (0, 255, 255)); shared_ptr job (new TranscodeJob (film)); - FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_prores_test7.mov", FFmpegEncoder::FORMAT_PRORES, false); + FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_prores_test7.mov", EXPORT_FORMAT_PRORES, false, false, 23); encoder.go (); } /** Red / green / blue MP4 -> H264 */ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test1) { - ffmpeg_content_test(1, "test/data/test.mp4", FFmpegEncoder::FORMAT_H264); + ffmpeg_content_test(1, "test/data/test.mp4", EXPORT_FORMAT_H264); } /** Just subtitles -> H264 */ @@ -172,16 +172,16 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test2) film->set_container (Ratio::from_id ("185")); film->set_audio_channels (6); - shared_ptr s (new TextSubtitleContent (film, "test/data/subrip2.srt")); + shared_ptr s (new StringTextFileContent (film, "test/data/subrip2.srt")); film->examine_and_add_content (s); BOOST_REQUIRE (!wait_for_jobs ()); - s->subtitle->set_colour (dcp::Colour (255, 255, 0)); - s->subtitle->set_effect (dcp::SHADOW); - s->subtitle->set_effect_colour (dcp::Colour (0, 255, 255)); + s->only_text()->set_colour (dcp::Colour (255, 255, 0)); + s->only_text()->set_effect (dcp::SHADOW); + s->only_text()->set_effect_colour (dcp::Colour (0, 255, 255)); film->write_metadata(); shared_ptr job (new TranscodeJob (film)); - FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_h264_test2.mp4", FFmpegEncoder::FORMAT_H264, false); + FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_h264_test2.mp4", EXPORT_FORMAT_H264, false, false, 23); encoder.go (); } @@ -197,16 +197,16 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test3) film->examine_and_add_content (c); BOOST_REQUIRE (!wait_for_jobs ()); - shared_ptr s (new TextSubtitleContent (film, "test/data/subrip.srt")); + shared_ptr s (new StringTextFileContent (film, "test/data/subrip.srt")); film->examine_and_add_content (s); BOOST_REQUIRE (!wait_for_jobs ()); - s->subtitle->set_colour (dcp::Colour (255, 255, 0)); - s->subtitle->set_effect (dcp::SHADOW); - s->subtitle->set_effect_colour (dcp::Colour (0, 255, 255)); + s->only_text()->set_colour (dcp::Colour (255, 255, 0)); + s->only_text()->set_effect (dcp::SHADOW); + s->only_text()->set_effect_colour (dcp::Colour (0, 255, 255)); film->write_metadata(); shared_ptr job (new TranscodeJob (film)); - FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_h264_test3.mp4", FFmpegEncoder::FORMAT_H264, false); + FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_h264_test3.mp4", EXPORT_FORMAT_H264, false, false, 23); encoder.go (); } @@ -220,7 +220,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test4) film->set_container(Ratio::from_id("185")); shared_ptr job(new TranscodeJob(film)); - FFmpegEncoder encoder(film, job, "build/test/ffmpeg_encoder_h264_test4.mp4", FFmpegEncoder::FORMAT_H264, false); + FFmpegEncoder encoder(film, job, "build/test/ffmpeg_encoder_h264_test4.mp4", EXPORT_FORMAT_H264, false, false, 23); encoder.go(); } @@ -274,7 +274,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test5) Rs->audio->set_mapping (map); shared_ptr job (new TranscodeJob (film)); - FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_h264_test5.mp4", FFmpegEncoder::FORMAT_H264, true); + FFmpegEncoder encoder (film, job, "build/test/ffmpeg_encoder_h264_test5.mp4", EXPORT_FORMAT_H264, true, false, 23); encoder.go (); check_ffmpeg ("build/test/ffmpeg_encoder_h264_test5.mp4", "test/data/ffmpeg_encoder_h264_test5.mp4", 1);