ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Qunatizer - delete more unused stuff, removes a warning

This commit is contained in:
adelikat 2020-03-19 10:23:36 -05:00
parent 9b68246b19
commit a40e37eda6
1 changed files with 5 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
BizHawk.Client.EmuHawk/AVOut/Quantize/Quantizer.cs
View File

@ -28,8 +28,6 @@ namespace BizHawk.Client.EmuHawk
/// </summary> /// </summary>
private readonly bool _singlePass; private readonly bool _singlePass;
protected int DitherLevel;
/// <summary> /// <summary>
/// Construct the quantizer /// Construct the quantizer
/// </summary> /// </summary>
@ -149,21 +147,6 @@ namespace BizHawk.Client.EmuHawk
} }
} }
private int ClampToByte(int val)
{
if (val < 0)
{
return 0;
}
if (val > 255)
{
return 255;
}
return val;
}
/// <summary> /// <summary>
/// Execute a second pass through the bitmap /// Execute a second pass through the bitmap
/// </summary> /// </summary>
@ -176,7 +159,6 @@ namespace BizHawk.Client.EmuHawk
{ {
BitmapData outputData = null; BitmapData outputData = null;
Color[] palettes = output.Palette.Entries; Color[] palettes = output.Palette.Entries;
int weight = DitherLevel;
try try
{ {
@ -186,11 +168,9 @@ namespace BizHawk.Client.EmuHawk
// Define the source data pointers. The source row is a byte to // Define the source data pointers. The source row is a byte to
// keep addition of the stride value easier (as this is in bytes) // keep addition of the stride value easier (as this is in bytes)
byte* pSourceRow = (byte*)sourceData.Scan0.ToPointer(); byte* pSourceRow = (byte*)sourceData.Scan0.ToPointer();
int* pSourcePixel = (int*)pSourceRow;
// Now define the destination data pointers // Now define the destination data pointers
byte* pDestinationRow = (byte*)outputData.Scan0.ToPointer(); byte* pDestinationRow = (byte*)outputData.Scan0.ToPointer();
byte* pDestinationPixel = pDestinationRow;
int[] errorThisRowR = new int[width + 1]; int[] errorThisRowR = new int[width + 1];
int[] errorThisRowG = new int[width + 1]; int[] errorThisRowG = new int[width + 1];
@ -204,6 +184,8 @@ namespace BizHawk.Client.EmuHawk
int ptrInc; int ptrInc;
int* pSourcePixel;
byte* pDestinationPixel;
if ((row & 1) == 0) if ((row & 1) == 0)
{ {
pSourcePixel = (int*)pSourceRow; pSourcePixel = (int*)pSourceRow;
@ -223,14 +205,11 @@ namespace BizHawk.Client.EmuHawk
// Quantize the pixel // Quantize the pixel
int srcPixel = *pSourcePixel; int srcPixel = *pSourcePixel;
int srcR = srcPixel & 0xFF; //not
int srcG = (srcPixel >> 8) & 0xFF; //a
int srcB = (srcPixel >> 16) & 0xFF; //mistake
int srcA = (srcPixel >> 24) & 0xFF; int srcA = (srcPixel >> 24) & 0xFF;
int targetB = ClampToByte(srcB - ((errorThisRowB[col] * weight) / 8)); int targetB = 0;
int targetG = ClampToByte(srcG - ((errorThisRowG[col] * weight) / 8)); int targetG = 0;
int targetR = ClampToByte(srcR - ((errorThisRowR[col] * weight) / 8)); int targetR = 0;
int targetA = srcA; int targetA = srcA;
int target = (targetA << 24) | (targetB << 16) | (targetG << 8) | targetR; int target = (targetA << 24) | (targetB << 16) | (targetG << 8) | targetR;