From 1c07f92d021c5b9aba78ab4f721632ae99c25c06 Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Sat, 11 Jan 2014 15:45:05 -0800 Subject: [PATCH] Don't modify the "YCbCr Matrix" header when dummy video is opened Color matching to dummy video makes zero sense, and setting it to None results in breakage when someone opens dummy video for an already typeset script. Closes #1690. --- aegisub/src/video_context.cpp | 4 +++- aegisub/src/video_provider_dummy.h | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/aegisub/src/video_context.cpp b/aegisub/src/video_context.cpp index a6b8913ff..cd6f01c63 100644 --- a/aegisub/src/video_context.cpp +++ b/aegisub/src/video_context.cpp @@ -253,7 +253,9 @@ void VideoContext::OnSubtitlesSave() { ar = std::to_string((int)ar_type); context->ass->SetScriptInfo("Video File", config::path->MakeRelative(video_filename, "?script").generic_string()); - context->ass->SetScriptInfo("YCbCr Matrix", video_provider->GetColorSpace()); + auto matrix = video_provider->GetColorSpace(); + if (!matrix.empty()) + context->ass->SetScriptInfo("YCbCr Matrix", matrix); context->ass->SaveUIState("Video Aspect Ratio", ar); context->ass->SaveUIState("Video Position", std::to_string(frame_n)); } diff --git a/aegisub/src/video_provider_dummy.h b/aegisub/src/video_provider_dummy.h index 3902d882b..b354ecd23 100644 --- a/aegisub/src/video_provider_dummy.h +++ b/aegisub/src/video_provider_dummy.h @@ -86,6 +86,6 @@ public: double GetDAR() const override { return 0; } agi::vfr::Framerate GetFPS() const override { return fps; } std::vector GetKeyFrames() const override { return {}; } - std::string GetColorSpace() const override { return "None"; } + std::string GetColorSpace() const override { return ""; } std::string GetDecoderName() const override { return "Dummy Video Provider"; } };