Merge remote-tracking branch 'upstream/dev' into mod

AmusementClub · May 5, 2022 · b1876e5 · b1876e5
2 parents 55443ec + 5b0d015
commit b1876e5
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 3 deletions.
diff --git a/.github/workflows/gha-ci.yml b/.github/workflows/gha-ci.yml
@@ -34,7 +34,7 @@ jobs:
             #brew upgrade autoconf freetype gettext icu4c
             brew analytics off  # https://github.com/Homebrew/brew/issues/142 https://github.com/Homebrew/brew/pull/6745
             brew install automake boost ffmpeg ffms2 fftw fribidi libass \
-                         lua luarocks m4 wxmac hunspell uchardet
+                         lua luarocks m4 wxwidgets hunspell uchardet
             # Use bundled googletest
             git submodule --quiet init
             git submodule --quiet update vendor/googletest

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -206,8 +206,8 @@ target_include_directories(luajit PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/vendor/lu
 if(WIN32)
     target_sources(luajit PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/lj_vm.obj")
 else()
+    enable_language(ASM-ATT)
     target_sources(luajit PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/lj_vm.s")
-    set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/lj_vm.s" PROPERTY LANGUAGE C)
     target_link_libraries(luajit ${CMAKE_DL_LIBS})
 endif()
 if(APPLE)

diff --git a/src/libresrc/default_config_win.json b/src/libresrc/default_config_win.json
@@ -10,6 +10,6 @@
 		}
 	},
 	"Subtitle" : {
-		"Provider" : "CSRI/xy-vsfilter_aegisub"
+		"Provider" : "CSRI/vsfilter_textsub"
 	}
 }
diff --git a/src/subtitles_provider_libass.cpp b/src/subtitles_provider_libass.cpp
@@ -170,6 +170,8 @@ LibassSubtitlesProvider::~LibassSubtitlesProvider() {
 
 void LibassSubtitlesProvider::DrawSubtitles(VideoFrame &frame,double time) {
 	ass_set_frame_size(renderer(), frame.width, frame.height);
+	// Note: this relies on Aegisub always rendering at video storage res
+	ass_set_storage_size(renderer(), frame.width, frame.height);
 
 	ASS_Image* img = ass_render_frame(renderer(), ass_track, int(time * 1000), nullptr);
 

diff --git a/vendor/csri/backends/libass/libass_csri.c b/vendor/csri/backends/libass/libass_csri.c
@@ -105,6 +105,8 @@ int csri_request_fmt(csri_inst *inst, const struct csri_fmt *fmt)
 	if (!csri_is_rgb(fmt->pixfmt) || csri_has_alpha(fmt->pixfmt))
 		return -1;
 	ass_set_frame_size(inst->ass_renderer, fmt->width, fmt->height);
+	// Note: this relies on CSRI always rendering at video storage res
+	ass_set_storage_size(inst->ass_renderer, fmt->width, fmt->height);
 	return 0;
 }