1 files changed, 9 insertions, 172 deletions

diff --git a/modules/webp/image_loader_webp.cpp b/modules/webp/image_loader_webp.cpp
index 0e41f6c973..778d562278 100644
--- a/modules/webp/image_loader_webp.cpp
+++ b/modules/webp/image_loader_webp.cpp
@@ -34,184 +34,21 @@
 #include "core/io/marshalls.h"
 #include "core/os/os.h"
 #include "core/string/print_string.h"
+#include "webp_common.h"
 
 #include <stdlib.h>
 #include <webp/decode.h>
 #include <webp/encode.h>
 
-static Vector<uint8_t> _webp_lossy_pack(const Ref<Image> &p_image, float p_quality) {
-	ERR_FAIL_COND_V(p_image.is_null() || p_image->is_empty(), Vector<uint8_t>());
-
-	Ref<Image> img = p_image->duplicate();
-	if (img->detect_alpha()) {
-		img->convert(Image::FORMAT_RGBA8);
-	} else {
-		img->convert(Image::FORMAT_RGB8);
-	}
-
-	Size2 s(img->get_width(), img->get_height());
-	Vector<uint8_t> data = img->get_data();
-	const uint8_t *r = data.ptr();
-
-	uint8_t *dst_buff = nullptr;
-	size_t dst_size = 0;
-	if (img->get_format() == Image::FORMAT_RGB8) {
-		dst_size = WebPEncodeRGB(r, s.width, s.height, 3 * s.width, CLAMP(p_quality * 100.0, 0, 100.0), &dst_buff);
-	} else {
-		dst_size = WebPEncodeRGBA(r, s.width, s.height, 4 * s.width, CLAMP(p_quality * 100.0, 0, 100.0), &dst_buff);
-	}
-
-	ERR_FAIL_COND_V(dst_size == 0, Vector<uint8_t>());
-	Vector<uint8_t> dst;
-	dst.resize(4 + dst_size);
-	uint8_t *w = dst.ptrw();
-	w[0] = 'W';
-	w[1] = 'E';
-	w[2] = 'B';
-	w[3] = 'P';
-	memcpy(&w[4], dst_buff, dst_size);
-	WebPFree(dst_buff);
-
-	return dst;
-}
-
-static Vector<uint8_t> _webp_lossless_pack(const Ref<Image> &p_image) {
-	ERR_FAIL_COND_V(p_image.is_null() || p_image->is_empty(), Vector<uint8_t>());
-
-	int compression_level = ProjectSettings::get_singleton()->get("rendering/textures/lossless_compression/webp_compression_level");
-	compression_level = CLAMP(compression_level, 0, 9);
-
-	Ref<Image> img = p_image->duplicate();
-	if (img->detect_alpha()) {
-		img->convert(Image::FORMAT_RGBA8);
-	} else {
-		img->convert(Image::FORMAT_RGB8);
-	}
-
-	Size2 s(img->get_width(), img->get_height());
-	Vector<uint8_t> data = img->get_data();
-	const uint8_t *r = data.ptr();
-
-	// we need to use the more complex API in order to access the 'exact' flag...
-
-	WebPConfig config;
-	WebPPicture pic;
-	if (!WebPConfigInit(&config) || !WebPConfigLosslessPreset(&config, compression_level) || !WebPPictureInit(&pic)) {
-		ERR_FAIL_V(Vector<uint8_t>());
-	}
-
-	WebPMemoryWriter wrt;
-	config.exact = 1;
-	pic.use_argb = 1;
-	pic.width = s.width;
-	pic.height = s.height;
-	pic.writer = WebPMemoryWrite;
-	pic.custom_ptr = &wrt;
-	WebPMemoryWriterInit(&wrt);
-
-	bool success_import = false;
-	if (img->get_format() == Image::FORMAT_RGB8) {
-		success_import = WebPPictureImportRGB(&pic, r, 3 * s.width);
-	} else {
-		success_import = WebPPictureImportRGBA(&pic, r, 4 * s.width);
-	}
-	bool success_encode = false;
-	if (success_import) {
-		success_encode = WebPEncode(&config, &pic);
-	}
-	WebPPictureFree(&pic);
-
-	if (!success_encode) {
-		WebPMemoryWriterClear(&wrt);
-		ERR_FAIL_V_MSG(Vector<uint8_t>(), "WebP packing failed.");
-	}
-
-	// copy from wrt
-	Vector<uint8_t> dst;
-	dst.resize(4 + wrt.size);
-	uint8_t *w = dst.ptrw();
-	w[0] = 'W';
-	w[1] = 'E';
-	w[2] = 'B';
-	w[3] = 'P';
-	memcpy(&w[4], wrt.mem, wrt.size);
-	WebPMemoryWriterClear(&wrt);
-
-	return dst;
-}
-
-static Ref<Image> _webp_unpack(const Vector<uint8_t> &p_buffer) {
-	int size = p_buffer.size() - 4;
-	ERR_FAIL_COND_V(size <= 0, Ref<Image>());
-	const uint8_t *r = p_buffer.ptr();
-
-	ERR_FAIL_COND_V(r[0] != 'W' || r[1] != 'E' || r[2] != 'B' || r[3] != 'P', Ref<Image>());
-	WebPBitstreamFeatures features;
-	if (WebPGetFeatures(&r[4], size, &features) != VP8_STATUS_OK) {
-		ERR_FAIL_V_MSG(Ref<Image>(), "Error unpacking WEBP image.");
-	}
-
-	/*
-	print_line("width: "+itos(features.width));
-	print_line("height: "+itos(features.height));
-	print_line("alpha: "+itos(features.has_alpha));
-	*/
-
-	Vector<uint8_t> dst_image;
-	int datasize = features.width * features.height * (features.has_alpha ? 4 : 3);
-	dst_image.resize(datasize);
-
-	uint8_t *dst_w = dst_image.ptrw();
-
-	bool errdec = false;
-	if (features.has_alpha) {
-		errdec = WebPDecodeRGBAInto(&r[4], size, dst_w, datasize, 4 * features.width) == nullptr;
-	} else {
-		errdec = WebPDecodeRGBInto(&r[4], size, dst_w, datasize, 3 * features.width) == nullptr;
-	}
-
-	ERR_FAIL_COND_V_MSG(errdec, Ref<Image>(), "Failed decoding WebP image.");
-
-	Ref<Image> img = memnew(Image(features.width, features.height, 0, features.has_alpha ? Image::FORMAT_RGBA8 : Image::FORMAT_RGB8, dst_image));
-	return img;
-}
-
-Error webp_load_image_from_buffer(Image *p_image, const uint8_t *p_buffer, int p_buffer_len) {
-	ERR_FAIL_NULL_V(p_image, ERR_INVALID_PARAMETER);
-
-	WebPBitstreamFeatures features;
-	if (WebPGetFeatures(p_buffer, p_buffer_len, &features) != VP8_STATUS_OK) {
-		ERR_FAIL_V(ERR_FILE_CORRUPT);
-	}
-
-	Vector<uint8_t> dst_image;
-	int datasize = features.width * features.height * (features.has_alpha ? 4 : 3);
-	dst_image.resize(datasize);
-	uint8_t *dst_w = dst_image.ptrw();
-
-	bool errdec = false;
-	if (features.has_alpha) {
-		errdec = WebPDecodeRGBAInto(p_buffer, p_buffer_len, dst_w, datasize, 4 * features.width) == nullptr;
-	} else {
-		errdec = WebPDecodeRGBInto(p_buffer, p_buffer_len, dst_w, datasize, 3 * features.width) == nullptr;
-	}
-
-	ERR_FAIL_COND_V_MSG(errdec, ERR_FILE_CORRUPT, "Failed decoding WebP image.");
-
-	p_image->create(features.width, features.height, false, features.has_alpha ? Image::FORMAT_RGBA8 : Image::FORMAT_RGB8, dst_image);
-
-	return OK;
-}
-
 static Ref<Image> _webp_mem_loader_func(const uint8_t *p_png, int p_size) {
 	Ref<Image> img;
 	img.instantiate();
-	Error err = webp_load_image_from_buffer(img.ptr(), p_png, p_size);
+	Error err = WebPCommon::webp_load_image_from_buffer(img.ptr(), p_png, p_size);
 	ERR_FAIL_COND_V(err, Ref<Image>());
 	return img;
 }
 
-Error ImageLoaderWEBP::load_image(Ref<Image> p_image, Ref<FileAccess> f, bool p_force_linear, float p_scale) {
+Error ImageLoaderWebP::load_image(Ref<Image> p_image, Ref<FileAccess> f, bool p_force_linear, float p_scale) {
 	Vector<uint8_t> src_image;
 	uint64_t src_image_len = f->get_length();
 	ERR_FAIL_COND_V(src_image_len == 0, ERR_FILE_CORRUPT);
@@ -221,18 +58,18 @@ Error ImageLoaderWEBP::load_image(Ref<Image> p_image, Ref<FileAccess> f, bool p_
 
 	f->get_buffer(&w[0], src_image_len);
 
-	Error err = webp_load_image_from_buffer(p_image.ptr(), w, src_image_len);
+	Error err = WebPCommon::webp_load_image_from_buffer(p_image.ptr(), w, src_image_len);
 
 	return err;
 }
 
-void ImageLoaderWEBP::get_recognized_extensions(List<String> *p_extensions) const {
+void ImageLoaderWebP::get_recognized_extensions(List<String> *p_extensions) const {
 	p_extensions->push_back("webp");
 }
 
-ImageLoaderWEBP::ImageLoaderWEBP() {
+ImageLoaderWebP::ImageLoaderWebP() {
 	Image::_webp_mem_loader_func = _webp_mem_loader_func;
-	Image::webp_lossy_packer = _webp_lossy_pack;
-	Image::webp_lossless_packer = _webp_lossless_pack;
-	Image::webp_unpacker = _webp_unpack;
+	Image::webp_lossy_packer = WebPCommon::_webp_lossy_pack;
+	Image::webp_lossless_packer = WebPCommon::_webp_lossless_pack;
+	Image::webp_unpacker = WebPCommon::_webp_unpack;
 }