Merge branch 'vapoursynth' into feature

arch1t3cht · Oct 25, 2024 · dc68cae · dc68cae
2 parents f67a8d7 + 2e52264
commit dc68cae
Show file tree

Hide file tree

Showing 3 changed files with 107 additions and 125 deletions.
diff --git a/src/audio_provider_vs.cpp b/src/audio_provider_vs.cpp
@@ -30,6 +30,7 @@
 #include <libaegisub/format.h>
 #include <libaegisub/path.h>
 #include <libaegisub/make_unique.h>
+#include <libaegisub/scoped_ptr.h>
 
 #include <mutex>
 
@@ -40,24 +41,27 @@
 namespace {
 class VapourSynthAudioProvider final : public agi::AudioProvider {
 	VapourSynthWrapper vs;
-	VSScript *script = nullptr;
-	VSNode *node = nullptr;
+	agi::scoped_holder<VSScript *> script;
+	agi::scoped_holder<VSNode *> node;
 	const VSAudioInfo *vi = nullptr;
 
 	void FillBufferWithFrame(void *buf, int frame, int64_t start, int64_t count) const;
 	void FillBuffer(void *buf, int64_t start, int64_t count) const override;
 public:
 	VapourSynthAudioProvider(agi::fs::path const& filename);
-	~VapourSynthAudioProvider();
 
 	bool NeedsCache() const override { return true; }
 };
 
-VapourSynthAudioProvider::VapourSynthAudioProvider(agi::fs::path const& filename) try {
+VapourSynthAudioProvider::VapourSynthAudioProvider(agi::fs::path const& filename) try
+: vs()
+, script(nullptr, vs.GetScriptAPI()->freeScript)
+, node(nullptr, vs.GetAPI()->freeNode) {
 	std::lock_guard<std::mutex> lock(vs.GetMutex());
 
 	VSCleanCache();
 
+	// createScript takes ownership of the core so no need for a scoped_holder here
 	VSCore *core = vs.GetAPI()->createCore(OPT_GET("Provider/VapourSynth/Autoload User Plugins")->GetBool() ? 0 : VSCoreCreationFlags::ccfDisableAutoLoading);
 	if (core == nullptr) {
 		throw VapourSynthError("Error creating core");
@@ -69,17 +73,13 @@ VapourSynthAudioProvider::VapourSynthAudioProvider(agi::fs::path const& filename
 	vs.GetScriptAPI()->evalSetWorkingDir(script, 1);
 	if (OpenScriptOrVideo(vs.GetAPI(), vs.GetScriptAPI(), script, filename, OPT_GET("Provider/Audio/VapourSynth/Default Script")->GetString())) {
 		std::string msg = agi::format("Error executing VapourSynth script: %s", vs.GetScriptAPI()->getError(script));
-		vs.GetScriptAPI()->freeScript(script);
 		throw VapourSynthError(msg);
 	}
 	node = vs.GetScriptAPI()->getOutputNode(script, 0);
 	if (node == nullptr) {
-		vs.GetScriptAPI()->freeScript(script);
 		throw VapourSynthError("No output node set");
 	}
 	if (vs.GetAPI()->getNodeType(node) != mtAudio) {
-		vs.GetAPI()->freeNode(node);
-		vs.GetScriptAPI()->freeScript(script);
 		throw VapourSynthError("Output node isn't an audio node");
 	}
 	vi = vs.GetAPI()->getAudioInfo(node);
@@ -106,24 +106,21 @@ static void PackChannels(const uint8_t **Src, void *Dst, size_t Length, size_t C
 
 void VapourSynthAudioProvider::FillBufferWithFrame(void *buf, int n, int64_t start, int64_t count) const {
 	char errorMsg[1024];
-	const VSFrame *frame = vs.GetAPI()->getFrame(n, node, errorMsg, sizeof(errorMsg));
+	agi::scoped_holder frame(vs.GetAPI()->getFrame(n, node, errorMsg, sizeof(errorMsg)), vs.GetAPI()->freeFrame);
 	if (frame == nullptr) {
 		throw VapourSynthError(agi::format("Error getting frame: %s", errorMsg));
 	}
 	if (vs.GetAPI()->getFrameLength(frame) < count) {
-		vs.GetAPI()->freeFrame(frame);
 		throw VapourSynthError("Audio frame too short");
 	}
 	if (vs.GetAPI()->getAudioFrameFormat(frame)->numChannels != channels || vs.GetAPI()->getAudioFrameFormat(frame)->bytesPerSample != bytes_per_sample) {
-		vs.GetAPI()->freeFrame(frame);
 		throw VapourSynthError("Audio format is not constant");
 	}
 
 	std::vector<const uint8_t *> planes(channels);
 	for (int c = 0; c < channels; c++) {
 		planes[c] = vs.GetAPI()->getReadPtr(frame, c) + bytes_per_sample * start;
 		if (planes[c] == nullptr) {
-			vs.GetAPI()->freeFrame(frame);
 			throw VapourSynthError("Failed to read audio channel");
 		}
 	}
@@ -136,8 +133,6 @@ void VapourSynthAudioProvider::FillBufferWithFrame(void *buf, int n, int64_t sta
 		PackChannels<uint32_t>(planes.data(), buf, count, channels);
 	else if (bytes_per_sample == 8)
 		PackChannels<uint64_t>(planes.data(), buf, count, channels);
-
-	vs.GetAPI()->freeFrame(frame);
 }
 
 void VapourSynthAudioProvider::FillBuffer(void *buf, int64_t start, int64_t count) const {
@@ -156,14 +151,6 @@ void VapourSynthAudioProvider::FillBuffer(void *buf, int64_t start, int64_t coun
 	}
 }
 
-VapourSynthAudioProvider::~VapourSynthAudioProvider() {
-	if (node != nullptr) {
-		vs.GetAPI()->freeNode(node);
-	}
-	if (script != nullptr) {
-		vs.GetScriptAPI()->freeScript(script);
-	}
-}
 }
 
 std::unique_ptr<agi::AudioProvider> CreateVapourSynthAudioProvider(agi::fs::path const& file, agi::BackgroundRunner *) {

diff --git a/src/vapoursynth_common.cpp b/src/vapoursynth_common.cpp
@@ -24,6 +24,7 @@
 #include <libaegisub/format.h>
 #include <libaegisub/fs.h>
 #include <libaegisub/path.h>
+#include <libaegisub/scoped_ptr.h>
 #include <libaegisub/util.h>
 
 #include <boost/algorithm/string/replace.hpp>
@@ -38,7 +39,7 @@ int OpenScriptOrVideo(const VSAPI *api, const VSSCRIPTAPI *sapi, VSScript *scrip
 	if (agi::fs::HasExtension(filename, "py") || agi::fs::HasExtension(filename, "vpy")) {
 		result = sapi->evaluateFile(script, filename.string().c_str());
 	} else {
-		VSMap *map = api->createMap();
+		agi::scoped_holder<VSMap *> map(api->createMap(), api->freeMap);
 		if (map == nullptr)
 			throw VapourSynthError("Failed to create VSMap for script info");
 
@@ -58,12 +59,10 @@ int OpenScriptOrVideo(const VSAPI *api, const VSSCRIPTAPI *sapi, VSScript *scrip
 		if (sapi->setVariables(script, map))
 			throw VapourSynthError("Failed to set script info variables");
 
-		api->freeMap(map);
-
 		std::string vscript;
 		vscript += "import sys\n";
-		vscript += "sys.path.append(f'{__aegi_data}/automation/vapoursynth')\n";
 		vscript += "sys.path.append(f'{__aegi_user}/automation/vapoursynth')\n";
+		vscript += "sys.path.append(f'{__aegi_data}/automation/vapoursynth')\n";
 		vscript += default_script;
 		result = sapi->evaluateBuffer(script, vscript.c_str(), "aegisub");
 	}