2016-01-07 08:14:33 +00:00
|
|
|
#pragma once
|
2011-08-06 14:03:52 +00:00
|
|
|
|
|
|
|
#include <nall/string.hpp>
|
Update to v094r09 release.
byuu says:
This will easily be the biggest diff in the history of higan. And not in
a good way.
* target-higan and target-loki have been blown away completely
* nall and ruby massively updated
* phoenix replaced with hiro (pretty near a total rewrite)
* target-higan restarted using hiro (just a window for now)
* all emulation cores updated to compile again
* installation changed to not require root privileges (installs locally)
For the foreseeable future (maybe even permanently?), the new higan UI
will only build under Linux/BSD with GTK+ 2.20+. Probably the most
likely route for Windows/OS X will be to try and figure out how to build
hiro/GTK on those platforms, as awful as that would be. The other
alternative would be to produce new UIs for those platforms ... which
would actually be a good opportunity to make something much more user
friendly.
Being that I just started on this a few hours ago, that means that for
at least a few weeks, don't expect to be able to actually play any
games. Right now, you can pretty much just compile the binary and that's
it. It's quite possible that some nall changes didn't produce
compilation errors, but will produce runtime errors. So until the UI can
actually load games, we won't know if anything is broken. But we should
mostly be okay. It was mostly just trim<1> -> trim changes, moving to
Hash::SHA256 (much cleaner), and patching some reckless memory copy
functions enough to compile.
Progress isn't going to be like it was before: I'm now dividing my time
much thinner between studying and other hobbies.
My aim this time is not to produce a binary for everyone to play games
on. Rather, it's to keep the emulator alive. I want to be able to apply
critical patches again. And I would also like the base of the emulator
to live on, for use in other emulator frontends that utilize higan.
2015-02-26 10:10:46 +00:00
|
|
|
#include <nall/decode/inflate.hpp>
|
2011-08-06 14:03:52 +00:00
|
|
|
|
2019-01-16 00:46:42 +00:00
|
|
|
namespace nall::Decode {
|
2011-08-06 14:03:52 +00:00
|
|
|
|
Update to v094r09 release.
byuu says:
This will easily be the biggest diff in the history of higan. And not in
a good way.
* target-higan and target-loki have been blown away completely
* nall and ruby massively updated
* phoenix replaced with hiro (pretty near a total rewrite)
* target-higan restarted using hiro (just a window for now)
* all emulation cores updated to compile again
* installation changed to not require root privileges (installs locally)
For the foreseeable future (maybe even permanently?), the new higan UI
will only build under Linux/BSD with GTK+ 2.20+. Probably the most
likely route for Windows/OS X will be to try and figure out how to build
hiro/GTK on those platforms, as awful as that would be. The other
alternative would be to produce new UIs for those platforms ... which
would actually be a good opportunity to make something much more user
friendly.
Being that I just started on this a few hours ago, that means that for
at least a few weeks, don't expect to be able to actually play any
games. Right now, you can pretty much just compile the binary and that's
it. It's quite possible that some nall changes didn't produce
compilation errors, but will produce runtime errors. So until the UI can
actually load games, we won't know if anything is broken. But we should
mostly be okay. It was mostly just trim<1> -> trim changes, moving to
Hash::SHA256 (much cleaner), and patching some reckless memory copy
functions enough to compile.
Progress isn't going to be like it was before: I'm now dividing my time
much thinner between studying and other hobbies.
My aim this time is not to produce a binary for everyone to play games
on. Rather, it's to keep the emulator alive. I want to be able to apply
critical patches again. And I would also like the base of the emulator
to live on, for use in other emulator frontends that utilize higan.
2015-02-26 10:10:46 +00:00
|
|
|
struct PNG {
|
2015-12-14 09:41:06 +00:00
|
|
|
inline PNG();
|
|
|
|
inline ~PNG();
|
|
|
|
|
|
|
|
inline auto load(const string& filename) -> bool;
|
Update to v097r14 release.
byuu says:
This is a few days old, but oh well.
This WIP changes nall,hiro,ruby,icarus back to (u)int(8,16,32,64)_t.
I'm slowly pushing for (u)int(8,16,32,64) to use my custom
Integer<Size>/Natural<Size> classes instead. But it's going to be one
hell of a struggle to get that into higan.
2016-02-16 09:11:58 +00:00
|
|
|
inline auto load(const uint8_t* sourceData, uint sourceSize) -> bool;
|
|
|
|
inline auto readbits(const uint8_t*& data) -> uint;
|
2015-12-14 09:41:06 +00:00
|
|
|
|
2011-08-06 14:03:52 +00:00
|
|
|
struct Info {
|
2015-12-14 09:41:06 +00:00
|
|
|
uint width;
|
|
|
|
uint height;
|
|
|
|
uint bitDepth;
|
2013-05-02 11:25:45 +00:00
|
|
|
//colorType:
|
|
|
|
//0 = L (luma)
|
|
|
|
//2 = R,G,B
|
|
|
|
//3 = P (palette)
|
|
|
|
//4 = L,A
|
|
|
|
//6 = R,G,B,A
|
2015-12-14 09:41:06 +00:00
|
|
|
uint colorType;
|
|
|
|
uint compressionMethod;
|
|
|
|
uint filterType;
|
|
|
|
uint interlaceMethod;
|
2011-08-06 14:03:52 +00:00
|
|
|
|
2015-12-14 09:41:06 +00:00
|
|
|
uint bytesPerPixel;
|
|
|
|
uint pitch;
|
2011-08-06 14:03:52 +00:00
|
|
|
|
Update to v097r14 release.
byuu says:
This is a few days old, but oh well.
This WIP changes nall,hiro,ruby,icarus back to (u)int(8,16,32,64)_t.
I'm slowly pushing for (u)int(8,16,32,64) to use my custom
Integer<Size>/Natural<Size> classes instead. But it's going to be one
hell of a struggle to get that into higan.
2016-02-16 09:11:58 +00:00
|
|
|
uint8_t palette[256][3];
|
2011-08-06 14:03:52 +00:00
|
|
|
} info;
|
|
|
|
|
Update to v097r14 release.
byuu says:
This is a few days old, but oh well.
This WIP changes nall,hiro,ruby,icarus back to (u)int(8,16,32,64)_t.
I'm slowly pushing for (u)int(8,16,32,64) to use my custom
Integer<Size>/Natural<Size> classes instead. But it's going to be one
hell of a struggle to get that into higan.
2016-02-16 09:11:58 +00:00
|
|
|
uint8_t* data = nullptr;
|
2015-12-14 09:41:06 +00:00
|
|
|
uint size = 0;
|
2011-08-06 14:03:52 +00:00
|
|
|
|
2015-12-14 09:41:06 +00:00
|
|
|
uint bitpos = 0;
|
2011-08-06 14:03:52 +00:00
|
|
|
|
|
|
|
protected:
|
2015-12-14 09:41:06 +00:00
|
|
|
enum class FourCC : uint {
|
2011-08-06 14:03:52 +00:00
|
|
|
IHDR = 0x49484452,
|
|
|
|
PLTE = 0x504c5445,
|
|
|
|
IDAT = 0x49444154,
|
|
|
|
IEND = 0x49454e44,
|
|
|
|
};
|
|
|
|
|
2015-12-14 09:41:06 +00:00
|
|
|
inline auto interlace(uint pass, uint index) -> uint;
|
|
|
|
inline auto inflateSize() -> uint;
|
Update to v097r14 release.
byuu says:
This is a few days old, but oh well.
This WIP changes nall,hiro,ruby,icarus back to (u)int(8,16,32,64)_t.
I'm slowly pushing for (u)int(8,16,32,64) to use my custom
Integer<Size>/Natural<Size> classes instead. But it's going to be one
hell of a struggle to get that into higan.
2016-02-16 09:11:58 +00:00
|
|
|
inline auto deinterlace(const uint8_t*& inputData, uint pass) -> bool;
|
|
|
|
inline auto filter(uint8_t* outputData, const uint8_t* inputData, uint width, uint height) -> bool;
|
|
|
|
inline auto read(const uint8_t* data, uint length) -> uint;
|
2011-08-06 14:03:52 +00:00
|
|
|
};
|
|
|
|
|
2015-12-14 09:41:06 +00:00
|
|
|
PNG::PNG() {
|
|
|
|
}
|
|
|
|
|
|
|
|
PNG::~PNG() {
|
|
|
|
if(data) delete[] data;
|
|
|
|
}
|
|
|
|
|
|
|
|
auto PNG::load(const string& filename) -> bool {
|
Update to v088r03 release.
byuu says:
static vector<uint8_t> file::read(const string &filename); replaces:
static bool file::read(const string &filename, uint8_t *&data, unsigned
&size); This allows automatic deletion of the underlying data.
Added vectorstream, which is obviously a vector<uint8_t> wrapper for
a data stream. Plan is for all data accesses inside my emulation cores
to take stream objects, especially MSU1. This lets you feed the core
anything: memorystream, filestream, zipstream, gzipstream, httpstream,
etc. There will still be exceptions for link and serial, those need
actual library files on disk. But those aren't official hardware devices
anyway.
So to help with speed a bit, I'm rethinking the video rendering path.
Previous system:
- core outputs system-native samples (SNES = 19-bit LRGB, NES = 9-bit
emphasis+palette, DMG = 2-bit grayscale, etc.)
- interfaceSystem transforms samples to 30-bit via lookup table inside
the emulation core
- interfaceSystem masks off overscan areas, if enabled
- interfaceUI runs filter to produce new target buffer, if enabled
- interfaceUI transforms 30-bit video to native display depth (24-bit or
30-bit), and applies color-adjustments (gamma, etc) at the same time
New system:
- all cores now generate an internal palette, and call
Interface::videoColor(uint32_t source, uint16_t red, uint16_t green,
uint16_t blue) to get native display color post-adjusted (gamma, etc
applied already.)
- all cores output to uint32_t* buffer now (output video.palette[color]
instead of just color)
- interfaceUI runs filter to produce new target buffer, if enabled
- interfaceUI memcpy()'s buffer to the video card
videoColor() is pretty neat. source is the raw pixel (as per the
old-format, 19-bit SNES, 9-bit NES, etc), and you can create a color
from that if you really want to. Or return that value to get a buffer
just like v088 and below. red, green, blue are 16-bits per channel,
because why the hell not, right? Just lop off all the bits you don't
want. If you have more bits on your display than that, fuck you :P
The last step is extremely difficult to avoid. Video cards can and do
have pitches that differ from the width of the texture. Trying to make
the core account for this would be really awful. And even if we did
that, the emulation routine would need to write directly to a video card
RAM buffer. Some APIs require you to lock the video buffer while
writing, so this would leave the video buffer locked for a long time.
Probably not catastrophic, but still awful. And lastly, if the
emulation core tried writing directly to the display texture, software
filters would no longer be possible (unless you -really- jump through
hooks and divert to a memory buffer when a filter is enabled, but ...
fuck.)
Anyway, the point of all that work was to eliminate an extra video copy,
and the need for a really painful 30-bit to 24-bit conversion (three
shifts, three masks, three array indexes.) So this basically reverts us,
performance-wise, to where we were pre-30 bit support.
[...]
The downside to this is that we're going to need a filter for each
output depth. Since the array type is uint32_t*, and I don't intend to
support higher or lower depths, we really only need 24+30-bit versions
of each filter. Kinda shitty, but oh well.
2012-04-27 12:12:53 +00:00
|
|
|
if(auto memory = file::read(filename)) {
|
2015-08-02 06:23:13 +00:00
|
|
|
return load(memory.data(), memory.size());
|
Update to v088r03 release.
byuu says:
static vector<uint8_t> file::read(const string &filename); replaces:
static bool file::read(const string &filename, uint8_t *&data, unsigned
&size); This allows automatic deletion of the underlying data.
Added vectorstream, which is obviously a vector<uint8_t> wrapper for
a data stream. Plan is for all data accesses inside my emulation cores
to take stream objects, especially MSU1. This lets you feed the core
anything: memorystream, filestream, zipstream, gzipstream, httpstream,
etc. There will still be exceptions for link and serial, those need
actual library files on disk. But those aren't official hardware devices
anyway.
So to help with speed a bit, I'm rethinking the video rendering path.
Previous system:
- core outputs system-native samples (SNES = 19-bit LRGB, NES = 9-bit
emphasis+palette, DMG = 2-bit grayscale, etc.)
- interfaceSystem transforms samples to 30-bit via lookup table inside
the emulation core
- interfaceSystem masks off overscan areas, if enabled
- interfaceUI runs filter to produce new target buffer, if enabled
- interfaceUI transforms 30-bit video to native display depth (24-bit or
30-bit), and applies color-adjustments (gamma, etc) at the same time
New system:
- all cores now generate an internal palette, and call
Interface::videoColor(uint32_t source, uint16_t red, uint16_t green,
uint16_t blue) to get native display color post-adjusted (gamma, etc
applied already.)
- all cores output to uint32_t* buffer now (output video.palette[color]
instead of just color)
- interfaceUI runs filter to produce new target buffer, if enabled
- interfaceUI memcpy()'s buffer to the video card
videoColor() is pretty neat. source is the raw pixel (as per the
old-format, 19-bit SNES, 9-bit NES, etc), and you can create a color
from that if you really want to. Or return that value to get a buffer
just like v088 and below. red, green, blue are 16-bits per channel,
because why the hell not, right? Just lop off all the bits you don't
want. If you have more bits on your display than that, fuck you :P
The last step is extremely difficult to avoid. Video cards can and do
have pitches that differ from the width of the texture. Trying to make
the core account for this would be really awful. And even if we did
that, the emulation routine would need to write directly to a video card
RAM buffer. Some APIs require you to lock the video buffer while
writing, so this would leave the video buffer locked for a long time.
Probably not catastrophic, but still awful. And lastly, if the
emulation core tried writing directly to the display texture, software
filters would no longer be possible (unless you -really- jump through
hooks and divert to a memory buffer when a filter is enabled, but ...
fuck.)
Anyway, the point of all that work was to eliminate an extra video copy,
and the need for a really painful 30-bit to 24-bit conversion (three
shifts, three masks, three array indexes.) So this basically reverts us,
performance-wise, to where we were pre-30 bit support.
[...]
The downside to this is that we're going to need a filter for each
output depth. Since the array type is uint32_t*, and I don't intend to
support higher or lower depths, we really only need 24+30-bit versions
of each filter. Kinda shitty, but oh well.
2012-04-27 12:12:53 +00:00
|
|
|
}
|
|
|
|
return false;
|
2011-08-06 14:03:52 +00:00
|
|
|
}
|
|
|
|
|
Update to v097r14 release.
byuu says:
This is a few days old, but oh well.
This WIP changes nall,hiro,ruby,icarus back to (u)int(8,16,32,64)_t.
I'm slowly pushing for (u)int(8,16,32,64) to use my custom
Integer<Size>/Natural<Size> classes instead. But it's going to be one
hell of a struggle to get that into higan.
2016-02-16 09:11:58 +00:00
|
|
|
auto PNG::load(const uint8_t* sourceData, uint sourceSize) -> bool {
|
2011-08-06 14:03:52 +00:00
|
|
|
if(sourceSize < 8) return false;
|
|
|
|
if(read(sourceData + 0, 4) != 0x89504e47) return false;
|
|
|
|
if(read(sourceData + 4, 4) != 0x0d0a1a0a) return false;
|
|
|
|
|
Update to v097r14 release.
byuu says:
This is a few days old, but oh well.
This WIP changes nall,hiro,ruby,icarus back to (u)int(8,16,32,64)_t.
I'm slowly pushing for (u)int(8,16,32,64) to use my custom
Integer<Size>/Natural<Size> classes instead. But it's going to be one
hell of a struggle to get that into higan.
2016-02-16 09:11:58 +00:00
|
|
|
uint8_t* compressedData = nullptr;
|
2015-12-14 09:41:06 +00:00
|
|
|
uint compressedSize = 0;
|
2011-08-06 14:03:52 +00:00
|
|
|
|
2015-12-14 09:41:06 +00:00
|
|
|
uint offset = 8;
|
2011-08-06 14:03:52 +00:00
|
|
|
while(offset < sourceSize) {
|
2015-12-14 09:41:06 +00:00
|
|
|
uint length = read(sourceData + offset + 0, 4);
|
|
|
|
uint fourCC = read(sourceData + offset + 4, 4);
|
|
|
|
uint checksum = read(sourceData + offset + 8 + length, 4);
|
2011-08-06 14:03:52 +00:00
|
|
|
|
2015-12-14 09:41:06 +00:00
|
|
|
if(fourCC == (uint)FourCC::IHDR) {
|
2011-08-06 14:03:52 +00:00
|
|
|
info.width = read(sourceData + offset + 8, 4);
|
|
|
|
info.height = read(sourceData + offset + 12, 4);
|
|
|
|
info.bitDepth = read(sourceData + offset + 16, 1);
|
|
|
|
info.colorType = read(sourceData + offset + 17, 1);
|
|
|
|
info.compressionMethod = read(sourceData + offset + 18, 1);
|
|
|
|
info.filterType = read(sourceData + offset + 19, 1);
|
|
|
|
info.interlaceMethod = read(sourceData + offset + 20, 1);
|
|
|
|
|
|
|
|
if(info.bitDepth == 0 || info.bitDepth > 16) return false;
|
|
|
|
if(info.bitDepth & (info.bitDepth - 1)) return false; //not a power of two
|
|
|
|
if(info.compressionMethod != 0) return false;
|
|
|
|
if(info.filterType != 0) return false;
|
|
|
|
if(info.interlaceMethod != 0 && info.interlaceMethod != 1) return false;
|
|
|
|
|
|
|
|
switch(info.colorType) {
|
|
|
|
case 0: info.bytesPerPixel = info.bitDepth * 1; break; //L
|
|
|
|
case 2: info.bytesPerPixel = info.bitDepth * 3; break; //R,G,B
|
|
|
|
case 3: info.bytesPerPixel = info.bitDepth * 1; break; //P
|
|
|
|
case 4: info.bytesPerPixel = info.bitDepth * 2; break; //L,A
|
|
|
|
case 6: info.bytesPerPixel = info.bitDepth * 4; break; //R,G,B,A
|
|
|
|
default: return false;
|
|
|
|
}
|
|
|
|
|
2013-05-02 11:25:45 +00:00
|
|
|
if(info.colorType == 2 || info.colorType == 4 || info.colorType == 6) {
|
2011-08-06 14:03:52 +00:00
|
|
|
if(info.bitDepth != 8 && info.bitDepth != 16) return false;
|
2013-05-02 11:25:45 +00:00
|
|
|
}
|
2011-08-06 14:03:52 +00:00
|
|
|
if(info.colorType == 3 && info.bitDepth == 16) return false;
|
|
|
|
|
|
|
|
info.bytesPerPixel = (info.bytesPerPixel + 7) / 8;
|
|
|
|
info.pitch = (int)info.width * info.bytesPerPixel;
|
|
|
|
}
|
|
|
|
|
2015-12-14 09:41:06 +00:00
|
|
|
if(fourCC == (uint)FourCC::PLTE) {
|
2011-08-06 14:03:52 +00:00
|
|
|
if(length % 3) return false;
|
2015-12-14 09:41:06 +00:00
|
|
|
for(uint n = 0, p = offset + 8; n < length / 3; n++) {
|
2011-08-06 14:03:52 +00:00
|
|
|
info.palette[n][0] = sourceData[p++];
|
|
|
|
info.palette[n][1] = sourceData[p++];
|
|
|
|
info.palette[n][2] = sourceData[p++];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-12-14 09:41:06 +00:00
|
|
|
if(fourCC == (uint)FourCC::IDAT) {
|
Update to v097r14 release.
byuu says:
This is a few days old, but oh well.
This WIP changes nall,hiro,ruby,icarus back to (u)int(8,16,32,64)_t.
I'm slowly pushing for (u)int(8,16,32,64) to use my custom
Integer<Size>/Natural<Size> classes instead. But it's going to be one
hell of a struggle to get that into higan.
2016-02-16 09:11:58 +00:00
|
|
|
compressedData = (uint8_t*)realloc(compressedData, compressedSize + length);
|
2011-08-06 14:03:52 +00:00
|
|
|
memcpy(compressedData + compressedSize, sourceData + offset + 8, length);
|
|
|
|
compressedSize += length;
|
|
|
|
}
|
|
|
|
|
2015-12-14 09:41:06 +00:00
|
|
|
if(fourCC == (uint)FourCC::IEND) {
|
2011-08-06 14:03:52 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
offset += 4 + 4 + length + 4;
|
|
|
|
}
|
|
|
|
|
2015-12-14 09:41:06 +00:00
|
|
|
uint interlacedSize = inflateSize();
|
Update to v097r14 release.
byuu says:
This is a few days old, but oh well.
This WIP changes nall,hiro,ruby,icarus back to (u)int(8,16,32,64)_t.
I'm slowly pushing for (u)int(8,16,32,64) to use my custom
Integer<Size>/Natural<Size> classes instead. But it's going to be one
hell of a struggle to get that into higan.
2016-02-16 09:11:58 +00:00
|
|
|
auto interlacedData = new uint8_t[interlacedSize];
|
2011-08-06 14:03:52 +00:00
|
|
|
|
|
|
|
bool result = inflate(interlacedData, interlacedSize, compressedData + 2, compressedSize - 6);
|
Update to v093r02 release.
byuu says:
Changelog:
- nall: fixed major memory leak in string class
- ruby: video shaders support #define-based settings now
- phoenix/GTK+: support > 256x256 icons for window / task bar / alt-tab
- sfc: remove random/ and config/, merge into system/
- ethos: delete higan.png (48x48), replace with higan512.png (512x512)
as new higan.png
- ethos: default gamma to 100% (no color adjustment)
- ethos: use "Video Shaders/Display Emulation/" instead of "Video
Shaders/Emulation/"
- use g++ instead of g++-4.7 (g++ -v must be >= 4.7)
- use -std=c++11 instead of -std=gnu++11
- applied a few patches from Debian upstream to make their packaging job
easier
So because colors are normalized in GLSL, I won't be able to offer video
shaders absolute color literals. We will have to perform basic color
conversion inside the core.
As such, the current plan is to create some sort of Emulator::Settings
interface. With that, I'll connect an option for color correction, which
will be on by default. For FC/SFC, that will mean gamma correction
(darker / stronger colors), and for GB/GBC/GBA, it will mean simulating
the weird brightness levels of the displays. I am undecided on whether
to use pea soup green for the GB or not. By not doing so, it'll be
easier for the display emulation shader to do it.
2013-11-09 11:45:54 +00:00
|
|
|
free(compressedData);
|
2011-08-06 14:03:52 +00:00
|
|
|
|
|
|
|
if(result == false) {
|
|
|
|
delete[] interlacedData;
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
Update to v084r03 release.
(r02 was not posted to the WIP thread)
byuu says:
Internally, all color is processed with 30-bit precision. The filters
also operate at 30-bit depth.
There's a new config file setting, video.depth, which defaults to 24.
This causes the final output to downsample to 24-bit, as most will
require.
If you set it to 30-bit, the downsampling will not occur, and bsnes will
ask ruby for a 30-bit surface. If you don't have one available, you're
going to get bad colors. Or maybe even a crash with OpenGL.
I don't yet have detection code to make sure you have an appropriate
visual in place.
30-bit mode will really only work if you are running Linux, running Xorg
at Depth 30, use the OpenGL or XShm driver, have an nVidia Quadro or AMD
FireGL card with the official drivers, and have a 30-bit capable
monitor.
Lots of planning and work for very little gain here, but it's nice that
it's finally finished.
Oh, I had to change the contrast/brightness formulas a tiny bit, but
they still work and look nice.
2011-12-03 03:22:54 +00:00
|
|
|
size = info.width * info.height * info.bytesPerPixel;
|
Update to v097r14 release.
byuu says:
This is a few days old, but oh well.
This WIP changes nall,hiro,ruby,icarus back to (u)int(8,16,32,64)_t.
I'm slowly pushing for (u)int(8,16,32,64) to use my custom
Integer<Size>/Natural<Size> classes instead. But it's going to be one
hell of a struggle to get that into higan.
2016-02-16 09:11:58 +00:00
|
|
|
data = new uint8_t[size];
|
2011-08-06 14:03:52 +00:00
|
|
|
|
|
|
|
if(info.interlaceMethod == 0) {
|
Update to v084r03 release.
(r02 was not posted to the WIP thread)
byuu says:
Internally, all color is processed with 30-bit precision. The filters
also operate at 30-bit depth.
There's a new config file setting, video.depth, which defaults to 24.
This causes the final output to downsample to 24-bit, as most will
require.
If you set it to 30-bit, the downsampling will not occur, and bsnes will
ask ruby for a 30-bit surface. If you don't have one available, you're
going to get bad colors. Or maybe even a crash with OpenGL.
I don't yet have detection code to make sure you have an appropriate
visual in place.
30-bit mode will really only work if you are running Linux, running Xorg
at Depth 30, use the OpenGL or XShm driver, have an nVidia Quadro or AMD
FireGL card with the official drivers, and have a 30-bit capable
monitor.
Lots of planning and work for very little gain here, but it's nice that
it's finally finished.
Oh, I had to change the contrast/brightness formulas a tiny bit, but
they still work and look nice.
2011-12-03 03:22:54 +00:00
|
|
|
if(filter(data, interlacedData, info.width, info.height) == false) {
|
2011-08-06 14:03:52 +00:00
|
|
|
delete[] interlacedData;
|
Update to v084r03 release.
(r02 was not posted to the WIP thread)
byuu says:
Internally, all color is processed with 30-bit precision. The filters
also operate at 30-bit depth.
There's a new config file setting, video.depth, which defaults to 24.
This causes the final output to downsample to 24-bit, as most will
require.
If you set it to 30-bit, the downsampling will not occur, and bsnes will
ask ruby for a 30-bit surface. If you don't have one available, you're
going to get bad colors. Or maybe even a crash with OpenGL.
I don't yet have detection code to make sure you have an appropriate
visual in place.
30-bit mode will really only work if you are running Linux, running Xorg
at Depth 30, use the OpenGL or XShm driver, have an nVidia Quadro or AMD
FireGL card with the official drivers, and have a 30-bit capable
monitor.
Lots of planning and work for very little gain here, but it's nice that
it's finally finished.
Oh, I had to change the contrast/brightness formulas a tiny bit, but
they still work and look nice.
2011-12-03 03:22:54 +00:00
|
|
|
delete[] data;
|
2013-03-15 13:11:33 +00:00
|
|
|
data = nullptr;
|
2011-08-06 14:03:52 +00:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
} else {
|
Update to v097r14 release.
byuu says:
This is a few days old, but oh well.
This WIP changes nall,hiro,ruby,icarus back to (u)int(8,16,32,64)_t.
I'm slowly pushing for (u)int(8,16,32,64) to use my custom
Integer<Size>/Natural<Size> classes instead. But it's going to be one
hell of a struggle to get that into higan.
2016-02-16 09:11:58 +00:00
|
|
|
const uint8_t* passData = interlacedData;
|
2015-12-14 09:41:06 +00:00
|
|
|
for(uint pass = 0; pass < 7; pass++) {
|
2011-08-06 14:03:52 +00:00
|
|
|
if(deinterlace(passData, pass) == false) {
|
|
|
|
delete[] interlacedData;
|
Update to v084r03 release.
(r02 was not posted to the WIP thread)
byuu says:
Internally, all color is processed with 30-bit precision. The filters
also operate at 30-bit depth.
There's a new config file setting, video.depth, which defaults to 24.
This causes the final output to downsample to 24-bit, as most will
require.
If you set it to 30-bit, the downsampling will not occur, and bsnes will
ask ruby for a 30-bit surface. If you don't have one available, you're
going to get bad colors. Or maybe even a crash with OpenGL.
I don't yet have detection code to make sure you have an appropriate
visual in place.
30-bit mode will really only work if you are running Linux, running Xorg
at Depth 30, use the OpenGL or XShm driver, have an nVidia Quadro or AMD
FireGL card with the official drivers, and have a 30-bit capable
monitor.
Lots of planning and work for very little gain here, but it's nice that
it's finally finished.
Oh, I had to change the contrast/brightness formulas a tiny bit, but
they still work and look nice.
2011-12-03 03:22:54 +00:00
|
|
|
delete[] data;
|
2013-03-15 13:11:33 +00:00
|
|
|
data = nullptr;
|
2011-08-06 14:03:52 +00:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
delete[] interlacedData;
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2015-12-14 09:41:06 +00:00
|
|
|
auto PNG::interlace(uint pass, uint index) -> uint {
|
|
|
|
static const uint data[7][4] = {
|
2011-09-05 03:48:23 +00:00
|
|
|
//x-distance, y-distance, x-origin, y-origin
|
2013-03-15 13:11:33 +00:00
|
|
|
{8, 8, 0, 0},
|
|
|
|
{8, 8, 4, 0},
|
|
|
|
{4, 8, 0, 4},
|
|
|
|
{4, 4, 2, 0},
|
|
|
|
{2, 4, 0, 2},
|
|
|
|
{2, 2, 1, 0},
|
|
|
|
{1, 2, 0, 1},
|
2011-09-05 03:48:23 +00:00
|
|
|
};
|
|
|
|
return data[pass][index];
|
|
|
|
}
|
2011-08-06 14:03:52 +00:00
|
|
|
|
2015-12-14 09:41:06 +00:00
|
|
|
auto PNG::inflateSize() -> uint {
|
2011-08-06 14:03:52 +00:00
|
|
|
if(info.interlaceMethod == 0) {
|
|
|
|
return info.width * info.height * info.bytesPerPixel + info.height;
|
|
|
|
}
|
|
|
|
|
2015-12-14 09:41:06 +00:00
|
|
|
uint size = 0;
|
|
|
|
for(uint pass = 0; pass < 7; pass++) {
|
|
|
|
uint xd = interlace(pass, 0), yd = interlace(pass, 1);
|
|
|
|
uint xo = interlace(pass, 2), yo = interlace(pass, 3);
|
|
|
|
uint width = (info.width + (xd - xo - 1)) / xd;
|
|
|
|
uint height = (info.height + (yd - yo - 1)) / yd;
|
2011-08-06 14:03:52 +00:00
|
|
|
if(width == 0 || height == 0) continue;
|
|
|
|
size += width * height * info.bytesPerPixel + height;
|
|
|
|
}
|
|
|
|
return size;
|
|
|
|
}
|
|
|
|
|
Update to v097r14 release.
byuu says:
This is a few days old, but oh well.
This WIP changes nall,hiro,ruby,icarus back to (u)int(8,16,32,64)_t.
I'm slowly pushing for (u)int(8,16,32,64) to use my custom
Integer<Size>/Natural<Size> classes instead. But it's going to be one
hell of a struggle to get that into higan.
2016-02-16 09:11:58 +00:00
|
|
|
auto PNG::deinterlace(const uint8_t*& inputData, uint pass) -> bool {
|
2015-12-14 09:41:06 +00:00
|
|
|
uint xd = interlace(pass, 0), yd = interlace(pass, 1);
|
|
|
|
uint xo = interlace(pass, 2), yo = interlace(pass, 3);
|
|
|
|
uint width = (info.width + (xd - xo - 1)) / xd;
|
|
|
|
uint height = (info.height + (yd - yo - 1)) / yd;
|
2011-08-06 14:03:52 +00:00
|
|
|
if(width == 0 || height == 0) return true;
|
|
|
|
|
2015-12-14 09:41:06 +00:00
|
|
|
uint outputSize = width * height * info.bytesPerPixel;
|
Update to v097r14 release.
byuu says:
This is a few days old, but oh well.
This WIP changes nall,hiro,ruby,icarus back to (u)int(8,16,32,64)_t.
I'm slowly pushing for (u)int(8,16,32,64) to use my custom
Integer<Size>/Natural<Size> classes instead. But it's going to be one
hell of a struggle to get that into higan.
2016-02-16 09:11:58 +00:00
|
|
|
auto outputData = new uint8_t[outputSize];
|
2011-08-06 14:03:52 +00:00
|
|
|
bool result = filter(outputData, inputData, width, height);
|
|
|
|
|
Update to v097r14 release.
byuu says:
This is a few days old, but oh well.
This WIP changes nall,hiro,ruby,icarus back to (u)int(8,16,32,64)_t.
I'm slowly pushing for (u)int(8,16,32,64) to use my custom
Integer<Size>/Natural<Size> classes instead. But it's going to be one
hell of a struggle to get that into higan.
2016-02-16 09:11:58 +00:00
|
|
|
const uint8_t* rd = outputData;
|
2015-12-14 09:41:06 +00:00
|
|
|
for(uint y = yo; y < info.height; y += yd) {
|
Update to v097r14 release.
byuu says:
This is a few days old, but oh well.
This WIP changes nall,hiro,ruby,icarus back to (u)int(8,16,32,64)_t.
I'm slowly pushing for (u)int(8,16,32,64) to use my custom
Integer<Size>/Natural<Size> classes instead. But it's going to be one
hell of a struggle to get that into higan.
2016-02-16 09:11:58 +00:00
|
|
|
uint8_t* wr = data + y * info.pitch;
|
2015-12-14 09:41:06 +00:00
|
|
|
for(uint x = xo; x < info.width; x += xd) {
|
|
|
|
for(uint b = 0; b < info.bytesPerPixel; b++) {
|
2011-08-06 14:03:52 +00:00
|
|
|
wr[x * info.bytesPerPixel + b] = *rd++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
inputData += outputSize + height;
|
|
|
|
delete[] outputData;
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
Update to v097r14 release.
byuu says:
This is a few days old, but oh well.
This WIP changes nall,hiro,ruby,icarus back to (u)int(8,16,32,64)_t.
I'm slowly pushing for (u)int(8,16,32,64) to use my custom
Integer<Size>/Natural<Size> classes instead. But it's going to be one
hell of a struggle to get that into higan.
2016-02-16 09:11:58 +00:00
|
|
|
auto PNG::filter(uint8_t* outputData, const uint8_t* inputData, uint width, uint height) -> bool {
|
|
|
|
uint8_t* wr = outputData;
|
|
|
|
const uint8_t* rd = inputData;
|
2011-08-06 14:03:52 +00:00
|
|
|
int bpp = info.bytesPerPixel, pitch = width * bpp;
|
|
|
|
for(int y = 0; y < height; y++) {
|
Update to v097r14 release.
byuu says:
This is a few days old, but oh well.
This WIP changes nall,hiro,ruby,icarus back to (u)int(8,16,32,64)_t.
I'm slowly pushing for (u)int(8,16,32,64) to use my custom
Integer<Size>/Natural<Size> classes instead. But it's going to be one
hell of a struggle to get that into higan.
2016-02-16 09:11:58 +00:00
|
|
|
uint8_t filter = *rd++;
|
2011-08-06 14:03:52 +00:00
|
|
|
|
|
|
|
switch(filter) {
|
|
|
|
case 0x00: //None
|
|
|
|
for(int x = 0; x < pitch; x++) {
|
|
|
|
wr[x] = rd[x];
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 0x01: //Subtract
|
|
|
|
for(int x = 0; x < pitch; x++) {
|
|
|
|
wr[x] = rd[x] + (x - bpp < 0 ? 0 : wr[x - bpp]);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 0x02: //Above
|
|
|
|
for(int x = 0; x < pitch; x++) {
|
|
|
|
wr[x] = rd[x] + (y - 1 < 0 ? 0 : wr[x - pitch]);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 0x03: //Average
|
|
|
|
for(int x = 0; x < pitch; x++) {
|
|
|
|
short a = x - bpp < 0 ? 0 : wr[x - bpp];
|
|
|
|
short b = y - 1 < 0 ? 0 : wr[x - pitch];
|
|
|
|
|
Update to v097r14 release.
byuu says:
This is a few days old, but oh well.
This WIP changes nall,hiro,ruby,icarus back to (u)int(8,16,32,64)_t.
I'm slowly pushing for (u)int(8,16,32,64) to use my custom
Integer<Size>/Natural<Size> classes instead. But it's going to be one
hell of a struggle to get that into higan.
2016-02-16 09:11:58 +00:00
|
|
|
wr[x] = rd[x] + (uint8_t)((a + b) / 2);
|
2011-08-06 14:03:52 +00:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 0x04: //Paeth
|
|
|
|
for(int x = 0; x < pitch; x++) {
|
|
|
|
short a = x - bpp < 0 ? 0 : wr[x - bpp];
|
|
|
|
short b = y - 1 < 0 ? 0 : wr[x - pitch];
|
|
|
|
short c = x - bpp < 0 || y - 1 < 0 ? 0 : wr[x - pitch - bpp];
|
|
|
|
|
|
|
|
short p = a + b - c;
|
|
|
|
short pa = p > a ? p - a : a - p;
|
|
|
|
short pb = p > b ? p - b : b - p;
|
|
|
|
short pc = p > c ? p - c : c - p;
|
|
|
|
|
Update to v097r14 release.
byuu says:
This is a few days old, but oh well.
This WIP changes nall,hiro,ruby,icarus back to (u)int(8,16,32,64)_t.
I'm slowly pushing for (u)int(8,16,32,64) to use my custom
Integer<Size>/Natural<Size> classes instead. But it's going to be one
hell of a struggle to get that into higan.
2016-02-16 09:11:58 +00:00
|
|
|
auto paeth = (uint8_t)((pa <= pb && pa <= pc) ? a : (pb <= pc) ? b : c);
|
2011-08-06 14:03:52 +00:00
|
|
|
|
|
|
|
wr[x] = rd[x] + paeth;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
default: //Invalid
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
rd += pitch;
|
|
|
|
wr += pitch;
|
|
|
|
}
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
Update to v097r14 release.
byuu says:
This is a few days old, but oh well.
This WIP changes nall,hiro,ruby,icarus back to (u)int(8,16,32,64)_t.
I'm slowly pushing for (u)int(8,16,32,64) to use my custom
Integer<Size>/Natural<Size> classes instead. But it's going to be one
hell of a struggle to get that into higan.
2016-02-16 09:11:58 +00:00
|
|
|
auto PNG::read(const uint8_t* data, uint length) -> uint {
|
2015-12-14 09:41:06 +00:00
|
|
|
uint result = 0;
|
2011-08-06 14:03:52 +00:00
|
|
|
while(length--) result = (result << 8) | (*data++);
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
Update to v097r14 release.
byuu says:
This is a few days old, but oh well.
This WIP changes nall,hiro,ruby,icarus back to (u)int(8,16,32,64)_t.
I'm slowly pushing for (u)int(8,16,32,64) to use my custom
Integer<Size>/Natural<Size> classes instead. But it's going to be one
hell of a struggle to get that into higan.
2016-02-16 09:11:58 +00:00
|
|
|
auto PNG::readbits(const uint8_t*& data) -> uint {
|
2015-12-14 09:41:06 +00:00
|
|
|
uint result = 0;
|
2011-08-06 14:03:52 +00:00
|
|
|
switch(info.bitDepth) {
|
|
|
|
case 1:
|
|
|
|
result = (*data >> bitpos) & 1;
|
|
|
|
bitpos++;
|
|
|
|
if(bitpos == 8) { data++; bitpos = 0; }
|
|
|
|
break;
|
|
|
|
case 2:
|
|
|
|
result = (*data >> bitpos) & 3;
|
|
|
|
bitpos += 2;
|
|
|
|
if(bitpos == 8) { data++; bitpos = 0; }
|
|
|
|
break;
|
|
|
|
case 4:
|
|
|
|
result = (*data >> bitpos) & 15;
|
|
|
|
bitpos += 4;
|
|
|
|
if(bitpos == 8) { data++; bitpos = 0; }
|
|
|
|
break;
|
|
|
|
case 8:
|
|
|
|
result = *data++;
|
|
|
|
break;
|
|
|
|
case 16:
|
|
|
|
result = (data[0] << 8) | (data[1] << 0);
|
|
|
|
data += 2;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2019-01-16 00:46:42 +00:00
|
|
|
}
|