diff --git a/README.md b/README.md index 4ac3e276b..618fe9867 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ Go [here](#branchfeature-list) for the new features. ### Don't we have enough Aegisub forks already?? -We absolutely do, and I'm aware that adding another one doesn't sound like a good idea on paper. However, +We absolutely do, and I'm aware that adding another one [doesn't sound like a good idea on paper](https://xkcd.com/927/). However, - None of the existing forks are completely satisfying at the moment: - [wangqr's fork](https://github.com/wangqr/Aegisub) is actively maintained, but focussing more on stability. It's missing most of the modern features. @@ -24,6 +24,7 @@ The `cibuilds` branch makes some CI builds of snapshots of `feature` at relevant - [`color_picker_fix2`](https://github.com/arch1t3cht/Aegisub/tree/color_picker_fix2): Add an option (under "Interface") to restrict the color picker to the window, which fixes the color picker on Linux in a lot of cases. - [`avisynth`](https://github.com/arch1t3cht/Aegisub/tree/avisynth): Reenable Avisynth support on Windows (Still occasionally crashes) - [`bugfixes`](https://github.com/arch1t3cht/Aegisub/tree/bugfixes): Various fixes, mostly relevant for compilation +- [`misc_dc`](https://github.com/arch1t3cht/Aegisub/tree/misc_dc): Miscellaneous changes taken from AegisubDC - [`video_panning_feature`](https://github.com/arch1t3cht/Aegisub/tree/video_panning_feature): Merge [moex3's video zoom and panning](https://github.com/TypesettingTools/Aegisub/pull/150), with an OSX fix and an option to toggle the behavior of Ctrl+Zoom - [`spectrum-frequency-mapping`](https://github.com/arch1t3cht/Aegisub/tree/spectrum-frequency-mapping): Merge EleonoreMizo's [spectrum display improvements](https://github.com/TypesettingTools/Aegisub/pull/94), and also make Shift+Scroll vertically zoom the audio display @@ -39,6 +40,9 @@ The exact way of switching depends on your Linux distribution, but essentially y #### I get errors like "Option not found" after merging one of these branches The changes to `default_config.json` or similar files weren't detected by meson due to missing regen dependencies. You can either merge the `bugfixes` branch or rebuild from scratch. +#### The video is desynced / Frames don't appear at the right time +This is probably due to the ffms2 seeking bug ([#394](https://github.com/FFMS/ffms2/issues/394)). On Windows, this shouldn't happen anymore. On Linux, you need to install the latest git version of ffms2 - for example the [`ffms2-git`](https://aur.archlinux.org/packages/ffms2-git) AUR package on Arch linux, or just compile it yourself. + # Aegisub diff --git a/src/audio_provider_ffmpegsource.cpp b/src/audio_provider_ffmpegsource.cpp index 0a201855a..46e1412f5 100644 --- a/src/audio_provider_ffmpegsource.cpp +++ b/src/audio_provider_ffmpegsource.cpp @@ -165,17 +165,20 @@ void FFmpegSourceAudioProvider::LoadAudio(agi::fs::path const& filename) { throw agi::AudioProviderError("unknown or unsupported sample format"); } - if (channels > 1 || bytes_per_sample != 2) { - std::unique_ptr - opt(FFMS_CreateResampleOptions(AudioSource), FFMS_DestroyResampleOptions); - opt->ChannelLayout = FFMS_CH_FRONT_CENTER; - opt->SampleFormat = FFMS_FMT_S16; + if (OPT_GET("Provider/Audio/FFmpegSource/Downmix")->GetBool()) { + if (channels > 2 || bytes_per_sample != 2 || float_samples) { + std::unique_ptr + opt(FFMS_CreateResampleOptions(AudioSource), FFMS_DestroyResampleOptions); + if (channels > 2) + opt->ChannelLayout = FFMS_CH_FRONT_LEFT | FFMS_CH_FRONT_RIGHT; + opt->SampleFormat = FFMS_FMT_S16; - // Might fail if FFMS2 wasn't built with libavresample - if (!FFMS_SetOutputFormatA(AudioSource, opt.get(), nullptr)) { - channels = 1; - bytes_per_sample = 2; - float_samples = false; + // Might fail if FFMS2 wasn't built with libavresample + if (!FFMS_SetOutputFormatA(AudioSource, opt.get(), nullptr)) { + channels = channels > 2 ? 2 : channels; + bytes_per_sample = 2; + float_samples = false; + } } } } diff --git a/src/command/video.cpp b/src/command/video.cpp index a262c0dcc..ae0dfe2ad 100644 --- a/src/command/video.cpp +++ b/src/command/video.cpp @@ -236,6 +236,23 @@ struct video_cycle_subtitles_provider final : public cmd::Command { } }; +struct video_reload_subtitles_provider final : public cmd::Command { + CMD_NAME("video/subtitles_provider/reload") + STR_MENU("Reload active subtitles provider") + STR_DISP("Reload active subtitles provider") + STR_HELP("Reloads the current subtitles provider") + + void operator()(agi::Context* c) override { + auto providers = SubtitlesProviderFactory::GetClasses(); + if (providers.empty()) return; + + auto it = find(begin(providers), end(providers), OPT_GET("Subtitle/Provider")->GetString()); + + OPT_SET("Subtitle/Provider")->SetString(*it); + c->frame->StatusTimeout(fmt_tl("Subtitles provider set to %s", *it), 5000); + } +}; + struct video_detach final : public validator_video_loaded { CMD_NAME("video/detach") CMD_ICON(detach_video_menu) @@ -757,6 +774,7 @@ namespace cmd { reg(agi::make_unique()); reg(agi::make_unique()); reg(agi::make_unique()); + reg(agi::make_unique()); reg(agi::make_unique()); reg(agi::make_unique()); reg(agi::make_unique()); diff --git a/src/libresrc/default_config.json b/src/libresrc/default_config.json index d60ecc4c4..ce27a3fa6 100644 --- a/src/libresrc/default_config.json +++ b/src/libresrc/default_config.json @@ -334,7 +334,8 @@ "Sample Rate" : 0 }, "FFmpegSource" : { - "Decode Error Handling" : "ignore" + "Decode Error Handling" : "ignore", + "Downmix" : false } }, "Avisynth" : { diff --git a/src/preferences.cpp b/src/preferences.cpp index 743c39a0f..c9119f9c2 100644 --- a/src/preferences.cpp +++ b/src/preferences.cpp @@ -410,6 +410,8 @@ void Advanced_Audio(wxTreebook *book, Preferences *parent) { p->OptionChoice(ffms, _("Audio indexing error handling mode"), error_modes_choice, "Provider/Audio/FFmpegSource/Decode Error Handling"); p->OptionAdd(ffms, _("Always index all audio tracks"), "Provider/FFmpegSource/Index All Tracks"); + wxControl* stereo = p->OptionAdd(ffms, _("Downmix to stereo"), "Provider/Audio/FFmpegSource/Downmix"); + stereo->SetToolTip("Reduces memory usage on surround audio, but may cause audio tracks to sound blank in specific circumstances. This will not affect audio with two channels or less."); #endif #ifdef WITH_PORTAUDIO diff --git a/src/project.cpp b/src/project.cpp index 8732bbd77..63a341da0 100644 --- a/src/project.cpp +++ b/src/project.cpp @@ -53,6 +53,7 @@ Project::Project(agi::Context *c) : context(c) { OPT_SUB("Audio/Cache/Type", &Project::ReloadAudio, this); OPT_SUB("Audio/Provider", &Project::ReloadAudio, this); OPT_SUB("Provider/Audio/FFmpegSource/Decode Error Handling", &Project::ReloadAudio, this); + OPT_SUB("Provider/Audio/FFmpegSource/Downmix", &Project::ReloadAudio, this); OPT_SUB("Provider/Avisynth/Memory Max", &Project::ReloadVideo, this); OPT_SUB("Provider/Video/FFmpegSource/Decoding Threads", &Project::ReloadVideo, this); OPT_SUB("Provider/Video/FFmpegSource/Unsafe Seeking", &Project::ReloadVideo, this); diff --git a/src/spline.cpp b/src/spline.cpp index 395bac084..ed7353f1c 100644 --- a/src/spline.cpp +++ b/src/spline.cpp @@ -71,7 +71,7 @@ std::string Spline::EncodeToAss() const { result += "m "; last = 'm'; } - result += ToScript(pt.p1).DStr(' '); + result += ToScript(pt.p1).Str(' '); break; case SplineCurve::LINE: @@ -79,7 +79,7 @@ std::string Spline::EncodeToAss() const { result += "l "; last = 'l'; } - result += ToScript(pt.p2).DStr(' '); + result += ToScript(pt.p2).Str(' '); break; case SplineCurve::BICUBIC: @@ -87,9 +87,9 @@ std::string Spline::EncodeToAss() const { result += "b "; last = 'b'; } - result += ToScript(pt.p2).DStr(' ') + " "; - result += ToScript(pt.p3).DStr(' ') + " "; - result += ToScript(pt.p4).DStr(' '); + result += ToScript(pt.p2).Str(' ') + " "; + result += ToScript(pt.p3).Str(' ') + " "; + result += ToScript(pt.p4).Str(' '); break; default: break; diff --git a/src/subs_edit_ctrl.cpp b/src/subs_edit_ctrl.cpp index 9d1fc6a01..8edc9b561 100644 --- a/src/subs_edit_ctrl.cpp +++ b/src/subs_edit_ctrl.cpp @@ -250,7 +250,7 @@ void SubsTextEditCtrl::SetStyles() { void SubsTextEditCtrl::UpdateStyle() { AssDialogue *diag = context ? context->selectionController->GetActiveLine() : nullptr; - bool template_line = diag && diag->Comment && boost::istarts_with(diag->Effect.get(), "template"); + bool template_line = diag && diag->Comment && (boost::istarts_with(diag->Effect.get(), "template") || boost::istarts_with(diag->Effect.get(), "mixin")); tokenized_line = agi::ass::TokenizeDialogueBody(line_text, template_line); agi::ass::SplitWords(line_text, tokenized_line); diff --git a/src/utils.cpp b/src/utils.cpp index a014b0a29..f6a705fa7 100644 --- a/src/utils.cpp +++ b/src/utils.cpp @@ -76,8 +76,9 @@ wxString PrettySize(int bytes) { return agi::wxformat(fmt, size) + " " + suffix[i]; } -std::string float_to_string(double val) { - std::string s = agi::format("%.3f", val); +std::string float_to_string(double val, int precision) { + std::string fmt = "%." + std::to_string(precision) + "f"; + std::string s = agi::format(fmt, val); size_t pos = s.find_last_not_of("0"); if (pos != s.find(".")) ++pos; s.erase(begin(s) + pos, end(s)); diff --git a/src/utils.h b/src/utils.h index 02ef78aac..bb82570d6 100644 --- a/src/utils.h +++ b/src/utils.h @@ -44,7 +44,7 @@ class wxWindow; wxString PrettySize(int bytes); -std::string float_to_string(double val); +std::string float_to_string(double val, int precision = 3); /// @brief Get the smallest power of two that is greater or equal to x /// diff --git a/src/vector2d.cpp b/src/vector2d.cpp index 8bb81de3c..92dca1fd8 100644 --- a/src/vector2d.cpp +++ b/src/vector2d.cpp @@ -88,5 +88,5 @@ std::string Vector2D::DStr(char sep) const { } std::string Vector2D::Str(char sep) const { - return float_to_string(x) + sep + float_to_string(y); + return float_to_string(x,2) + sep + float_to_string(y,2); } diff --git a/src/visual_tool.cpp b/src/visual_tool.cpp index 6465fe248..ba58d6a66 100644 --- a/src/visual_tool.cpp +++ b/src/visual_tool.cpp @@ -508,11 +508,11 @@ std::string VisualToolBase::GetLineVectorClip(AssDialogue *diag, int &scale, boo tag = find_tag(blocks, "\\clip"); if (tag && tag->size() == 4) { - return agi::format("m %d %d l %d %d %d %d %d %d" - , (*tag)[0].Get(), (*tag)[1].Get() - , (*tag)[2].Get(), (*tag)[1].Get() - , (*tag)[2].Get(), (*tag)[3].Get() - , (*tag)[0].Get(), (*tag)[3].Get()); + return agi::format("m %.2f %.2f l %.2f %.2f %.2f %.2f %.2f %.2f" + , (*tag)[0].Get(), (*tag)[1].Get() + , (*tag)[2].Get(), (*tag)[1].Get() + , (*tag)[2].Get(), (*tag)[3].Get() + , (*tag)[0].Get(), (*tag)[3].Get()); } if (tag) { scale = std::max((*tag)[0].Get(scale), 1); diff --git a/src/visual_tool_vector_clip.cpp b/src/visual_tool_vector_clip.cpp index 351f5757f..811c4cadd 100644 --- a/src/visual_tool_vector_clip.cpp +++ b/src/visual_tool_vector_clip.cpp @@ -76,7 +76,7 @@ void VisualToolVectorClip::SetToolbar(wxToolBar *toolBar) { toolBar->Realize(); toolBar->Show(true); toolBar->Bind(wxEVT_TOOL, [=](wxCommandEvent& e) { SetMode((VisualToolVectorClipMode) (e.GetId() - BUTTON_ID_BASE)); }); - SetMode(VCLIP_DRAG); + SetMode(VCLIP_LINE); #undef ICON }