Automatically resize images to fit limits (#831)

Resize images for Avatars, Worlds, Gallery, Icons and Emojis when uploading if it exceeds VRChats limits (2000 pixels in any dimension and 10MB file size).
This commit is contained in:
Nekromateion
2024-06-26 13:29:46 +02:00
committed by GitHub
parent 3ab1cf1d48
commit 873c1d38f0
4 changed files with 91 additions and 24 deletions

View File

@@ -60,6 +60,65 @@ namespace VRCX
}
}
public string ResizeImageToFitLimits(string base64data)
{
return Convert.ToBase64String(ResizeImageToFitLimits(Convert.FromBase64String(base64data)));
}
public byte[] ResizeImageToFitLimits(byte[] imageData, int maxWidth = 2000, int maxHeight = 2000, long maxSize = 10_000_000)
{
using var fileMemoryStream = new MemoryStream(imageData);
System.Drawing.Bitmap image = new System.Drawing.Bitmap(fileMemoryStream);
if (image.Width > maxWidth)
{
var sizingFactor = image.Width / (double)maxWidth;
int newHeight = (int)Math.Round(image.Height / sizingFactor);
image = new System.Drawing.Bitmap(image, maxWidth, newHeight);
}
if (image.Height > maxHeight)
{
var sizingFactor = image.Height / (double)maxHeight;
int newWidth = (int)Math.Round(image.Width / sizingFactor);
image = new System.Drawing.Bitmap(image, newWidth, maxHeight);
}
void saveToFileToUpload()
{
using var imageSaveMemoryStream = new MemoryStream();
image.Save(imageSaveMemoryStream, System.Drawing.Imaging.ImageFormat.Png);
imageData = imageSaveMemoryStream.ToArray();
}
saveToFileToUpload();
for (int i = 0; i < 250 && imageData.Length > maxSize; i++)
{
saveToFileToUpload();
if (imageData.Length < maxSize)
break;
int newWidth = image.Width;
int newHeight = image.Height;
if (image.Width > image.Height)
{
newWidth = image.Width - 25;
newHeight = (int)Math.Round(image.Height / (image.Width / (double)newWidth));
}
else
{
newHeight = image.Height - 25;
newWidth = (int)Math.Round(image.Width / (image.Height / (double)newHeight));
}
image = new System.Drawing.Bitmap(image, newWidth, newHeight);
}
if (imageData.Length > maxSize)
{
throw new Exception("Failed to get image into target filesize.");
}
return imageData;
}
/// <summary>
/// Computes the signature of the file represented by the specified base64-encoded string using the librsync library.
/// </summary>

View File

@@ -217,7 +217,8 @@ namespace VRCX
}
}
var imageData = options["imageData"] as string;
byte[] fileToUpload = Convert.FromBase64CharArray(imageData.ToCharArray(), 0, imageData.Length);
byte[] fileToUpload = AppApi.Instance.ResizeImageToFitLimits(Convert.FromBase64String(imageData));
string fileFormKey = "file";
string fileName = "blob";
string fileMimeType = "image/png";