Adapt GDNative VideoStream to use ResourceFormatLoader

Same logic as used for Webm and Theora support in #19937 and #21084,
fixing issues when exporting projects.

modules/gdnative/videodecoder/register_types.cpp

@@ -31,18 +31,20 @@
 #include "register_types.h"
 
 #include "core/class_db.h"
-#include "resource_importer_av_gdnative.h"
 #include "video_stream_gdnative.h"
 
+static ResourceFormatLoaderVideoStreamGDNative *resource_loader_vsgdnative = NULL;
+
 void register_videodecoder_types() {
 
-#ifdef TOOLS_ENABLED
-	Ref<ResourceImporterAVGDNative> avgdn_import;
-	avgdn_import.instance();
-	ResourceFormatImporter::get_singleton()->add_importer(avgdn_import);
-#endif
+	resource_loader_vsgdnative = memnew(ResourceFormatLoaderVideoStreamGDNative);
+	ResourceLoader::add_resource_format_loader(resource_loader_vsgdnative, true);
 	ClassDB::register_class<VideoStreamGDNative>();
 }
 
 void unregister_videodecoder_types() {
+
+	if (resource_loader_vsgdnative) {
+		memdelete(resource_loader_vsgdnative);
+	}
 }

modules/gdnative/videodecoder/resource_importer_av_gdnative.cpp

@@ -1,96 +0,0 @@
-/*************************************************************************/
-/*  resource_importer_av_gdnative.cpp                                    */
-/*************************************************************************/
-/*                       This file is part of:                           */
-/*                           GODOT ENGINE                                */
-/*                      https://godotengine.org                          */
-/*************************************************************************/
-/* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur.                 */
-/* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md)    */
-/*                                                                       */
-/* Permission is hereby granted, free of charge, to any person obtaining */
-/* a copy of this software and associated documentation files (the       */
-/* "Software"), to deal in the Software without restriction, including   */
-/* without limitation the rights to use, copy, modify, merge, publish,   */
-/* distribute, sublicense, and/or sell copies of the Software, and to    */
-/* permit persons to whom the Software is furnished to do so, subject to */
-/* the following conditions:                                             */
-/*                                                                       */
-/* The above copyright notice and this permission notice shall be        */
-/* included in all copies or substantial portions of the Software.       */
-/*                                                                       */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
-/*************************************************************************/
-
-#include "resource_importer_av_gdnative.h"
-
-#include "core/io/resource_saver.h"
-#include "core/os/file_access.h"
-#include "scene/resources/texture.h"
-
-String ResourceImporterAVGDNative::get_importer_name() const {
-
-	return "AVGDNative";
-}
-
-String ResourceImporterAVGDNative::get_visible_name() const {
-
-	return "AVGDNative";
-}
-void ResourceImporterAVGDNative::get_recognized_extensions(List<String> *p_extensions) const {
-
-	Map<String, int>::Element *el = VideoDecoderServer::get_instance()->get_extensions().front();
-	while (el) {
-		p_extensions->push_back(el->key());
-		el = el->next();
-	}
-}
-
-String ResourceImporterAVGDNative::get_save_extension() const {
-
-	return "avgdnstr";
-}
-
-String ResourceImporterAVGDNative::get_resource_type() const {
-
-	return "VideoStreamGDNative";
-}
-
-bool ResourceImporterAVGDNative::get_option_visibility(const String &p_option, const Map<StringName, Variant> &p_options) const {
-
-	return true;
-}
-
-int ResourceImporterAVGDNative::get_preset_count() const {
-
-	return 0;
-}
-
-String ResourceImporterAVGDNative::get_preset_name(int p_idx) const {
-
-	return String();
-}
-
-void ResourceImporterAVGDNative::get_import_options(List<ImportOption> *r_options, int p_preset) const {
-
-	r_options->push_back(ImportOption(PropertyInfo(Variant::BOOL, "loop"), true));
-}
-
-Error ResourceImporterAVGDNative::import(const String &p_source_file, const String &p_save_path, const Map<StringName, Variant> &p_options, List<String> *r_platform_variants, List<String> *r_gen_files) {
-
-	VideoStreamGDNative *stream = memnew(VideoStreamGDNative);
-	stream->set_file(p_source_file);
-
-	Ref<VideoStreamGDNative> avgdn_stream = Ref<VideoStreamGDNative>(stream);
-
-	return ResourceSaver::save(p_save_path + ".avgdnstr", avgdn_stream);
-}
-
-ResourceImporterAVGDNative::ResourceImporterAVGDNative() {
-}

modules/gdnative/videodecoder/resource_importer_av_gdnative.h

@@ -1,57 +0,0 @@
-/*************************************************************************/
-/*  resource_importer_av_gdnative.h                                      */
-/*************************************************************************/
-/*                       This file is part of:                           */
-/*                           GODOT ENGINE                                */
-/*                      https://godotengine.org                          */
-/*************************************************************************/
-/* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur.                 */
-/* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md)    */
-/*                                                                       */
-/* Permission is hereby granted, free of charge, to any person obtaining */
-/* a copy of this software and associated documentation files (the       */
-/* "Software"), to deal in the Software without restriction, including   */
-/* without limitation the rights to use, copy, modify, merge, publish,   */
-/* distribute, sublicense, and/or sell copies of the Software, and to    */
-/* permit persons to whom the Software is furnished to do so, subject to */
-/* the following conditions:                                             */
-/*                                                                       */
-/* The above copyright notice and this permission notice shall be        */
-/* included in all copies or substantial portions of the Software.       */
-/*                                                                       */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
-/*************************************************************************/
-
-#ifndef RESOURCE_IMPORTER_AV_GDNATIVE_H
-#define RESOURCE_IMPORTER_AV_GDNATIVE_H
-
-#include "core/io/resource_import.h"
-#include "video_stream_gdnative.h"
-
-class ResourceImporterAVGDNative : public ResourceImporter {
-	GDCLASS(ResourceImporterAVGDNative, ResourceImporter)
-public:
-	virtual String get_importer_name() const;
-	virtual String get_visible_name() const;
-	virtual void get_recognized_extensions(List<String> *p_extensions) const;
-	virtual String get_save_extension() const;
-	virtual String get_resource_type() const;
-
-	virtual int get_preset_count() const;
-	virtual String get_preset_name(int p_idx) const;
-
-	virtual void get_import_options(List<ImportOption> *r_options, int p_preset = 0) const;
-	virtual bool get_option_visibility(const String &p_option, const Map<StringName, Variant> &p_options) const;
-
-	virtual Error import(const String &p_source_file, const String &p_save_path, const Map<StringName, Variant> &p_options, List<String> *r_platform_variants, List<String> *r_gen_files = NULL);
-
-	ResourceImporterAVGDNative();
-};
-
-#endif

modules/gdnative/videodecoder/video_stream_gdnative.cpp

@@ -346,3 +346,42 @@ void VideoStreamGDNative::set_audio_track(int p_track) {
 
 	audio_track = p_track;
 }
+
+/* --- NOTE ResourceFormatLoaderVideoStreamGDNative starts here. ----- */
+
+RES ResourceFormatLoaderVideoStreamGDNative::load(const String &p_path, const String &p_original_path, Error *r_error) {
+	FileAccess *f = FileAccess::open(p_path, FileAccess::READ);
+	if (!f) {
+		if (r_error) {
+			*r_error = ERR_CANT_OPEN;
+		}
+		memdelete(f);
+		return RES();
+	}
+	VideoStreamGDNative *stream = memnew(VideoStreamGDNative);
+	stream->set_file(p_path);
+	Ref<VideoStreamGDNative> ogv_stream = Ref<VideoStreamGDNative>(stream);
+	if (r_error) {
+		*r_error = OK;
+	}
+	return ogv_stream;
+}
+
+void ResourceFormatLoaderVideoStreamGDNative::get_recognized_extensions(List<String> *p_extensions) const {
+	Map<String, int>::Element *el = VideoDecoderServer::get_instance()->get_extensions().front();
+	while (el) {
+		p_extensions->push_back(el->key());
+		el = el->next();
+	}
+}
+
+bool ResourceFormatLoaderVideoStreamGDNative::handles_type(const String &p_type) const {
+	return ClassDB::is_parent_class(p_type, "VideoStream");
+}
+
+String ResourceFormatLoaderVideoStreamGDNative::get_resource_type(const String &p_path) const {
+	String el = p_path.get_extension().to_lower();
+	if (VideoDecoderServer::get_instance()->get_extensions().has(el))
+		return "VideoStreamGDNative";
+	return "";
+}

modules/gdnative/videodecoder/video_stream_gdnative.h

@@ -178,7 +178,6 @@ public:
 class VideoStreamGDNative : public VideoStream {
 
 	GDCLASS(VideoStreamGDNative, VideoStream);
-	RES_BASE_EXTENSION("avgdnstr");
 
 	String file;
 	int audio_track;
@@ -197,4 +196,12 @@ public:
 	VideoStreamGDNative() {}
 };
 
+class ResourceFormatLoaderVideoStreamGDNative : public ResourceFormatLoader {
+public:
+	virtual RES load(const String &p_path, const String &p_original_path = "", Error *r_error = NULL);
+	virtual void get_recognized_extensions(List<String> *p_extensions) const;
+	virtual bool handles_type(const String &p_type) const;
+	virtual String get_resource_type(const String &p_path) const;
+};
+
 #endif