rearranged everything
This commit is contained in:
parent
3420c1a544
commit
7f10b384f9
10 changed files with 337 additions and 307 deletions
|
|
@ -6,6 +6,12 @@ set(CMAKE_CXX_STANDARD 23)
|
|||
add_subdirectory(file_reader)
|
||||
find_package(ZLIB)
|
||||
|
||||
add_library(lily_png STATIC lily_png.cpp)
|
||||
add_library(lily_png STATIC src/lily_png.cpp
|
||||
src/metadata.cpp
|
||||
src/metadata.h
|
||||
src/utils.cpp
|
||||
src/utils.h
|
||||
src/filter.cpp
|
||||
src/filter.h)
|
||||
target_link_libraries(lily_png file_read ZLIB::ZLIB)
|
||||
|
||||
|
|
|
|||
294
lily_png.cpp
294
lily_png.cpp
|
|
@ -1,294 +0,0 @@
|
|||
#include "lily_png.h"
|
||||
#include <math.h>
|
||||
#include <vector>
|
||||
|
||||
std::vector<color> palette;
|
||||
bool palette_found = false;
|
||||
|
||||
static metadata parse_metadata(buffer &data)
|
||||
{
|
||||
std::tuple<unsigned int, unsigned int, char, char, char, char, char> meta;
|
||||
constexpr std::size_t size = std::tuple_size_v<decltype(meta)>;
|
||||
parsing_buffer par_buf(data);
|
||||
par_buf.point = par_buf.buf.data;
|
||||
par_buf.consumed_size = 0;
|
||||
read_comp(size, par_buf, meta);
|
||||
std::println("Width {} height {}", std::get<0>(meta), std::get<1>(meta));
|
||||
metadata m{0};
|
||||
m.width = std::get<0>(meta);
|
||||
m.height = std::get<1>(meta);
|
||||
m.bit_depth = std::get<2>(meta);
|
||||
m.color_type = std::get<3>(meta);
|
||||
m.compression = std::get<4>(meta);
|
||||
m.filter = std::get<5>(meta);
|
||||
m.interface = std::get<6>(meta);
|
||||
std::println("metadata{{ width: {}, height: {}, bit_depth: {}, color_type: {}, compression: {}, filter: {}, interface: {} }}", m.width, m.height, (int)m.bit_depth, (int)m.color_type, (int)m.compression, (int)m.filter, (int)m.interface);
|
||||
return m;
|
||||
}
|
||||
|
||||
static size_t get_pixel_bit_size(const metadata &meta)
|
||||
{
|
||||
size_t ret = 0;
|
||||
switch (meta.color_type)
|
||||
{
|
||||
case 0:
|
||||
if (meta.bit_depth == 1 || meta.bit_depth == 2 || meta.bit_depth == 4 || meta.bit_depth == 8 || meta.bit_depth == 16)
|
||||
{
|
||||
ret = meta.bit_depth;
|
||||
}
|
||||
else
|
||||
throw std::runtime_error("Invalid bit depht");
|
||||
break;
|
||||
case 2:
|
||||
if (meta.bit_depth == 8 || meta.bit_depth == 16)
|
||||
{
|
||||
ret = meta.bit_depth * 3;
|
||||
}
|
||||
else
|
||||
throw std::runtime_error("Invalid bit depht");
|
||||
break;
|
||||
case 3:
|
||||
if (meta.bit_depth == 1 || meta.bit_depth == 2 || meta.bit_depth == 4 || meta.bit_depth == 8)
|
||||
{
|
||||
ret = meta.bit_depth;
|
||||
}
|
||||
else
|
||||
throw std::runtime_error("Invalid bit depht");
|
||||
break;
|
||||
case 4:
|
||||
if (meta.bit_depth == 8 || meta.bit_depth == 16)
|
||||
{
|
||||
ret = meta.bit_depth * 2;
|
||||
}
|
||||
else
|
||||
throw std::runtime_error("Invalid bit depht");
|
||||
break;
|
||||
case 6:
|
||||
if (meta.bit_depth == 8 || meta.bit_depth == 16)
|
||||
{
|
||||
ret = meta.bit_depth * 4;
|
||||
}
|
||||
else
|
||||
throw std::runtime_error("Invalid bit depht");
|
||||
break;
|
||||
default:
|
||||
throw std::runtime_error("Invalid color type");
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
static size_t get_uncompressed_size(const metadata meta)
|
||||
{
|
||||
size_t ret = (meta.width * get_pixel_bit_size(meta) + 7)/8; //ceil() but for bytes
|
||||
ret = (ret + 1) * meta.height;
|
||||
std::println("Uncompressed size {}", ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
static void read_raw_data(const std::string &file_path, buffer_unsigned &data, metadata &meta)
|
||||
{
|
||||
std::println("Zlib version is {}", zlibVersion());
|
||||
unsigned char magic[9] = {137, 80, 78, 71, 13, 10, 26, 10};
|
||||
file_reader reader(file_path);
|
||||
char file_magic[9] = {0};
|
||||
reader.read_buffer(file_magic, 8);
|
||||
if (memcmp(magic, file_magic, 8) != 0)
|
||||
{
|
||||
std::println("File is not a png!");
|
||||
return ;
|
||||
}
|
||||
buffer_unsigned raw_dat{};
|
||||
while (true)
|
||||
{
|
||||
std::tuple<unsigned int, buffer> chunk_header;
|
||||
std::get<1>(chunk_header).size = 4;
|
||||
auto ret = reader.read_from_tuple(chunk_header);
|
||||
if (ret.second == READ_FILE_ENDED || ret.second == READ_INCOMPLETE)
|
||||
{
|
||||
std::println("Chunk incomplete!");
|
||||
return ;
|
||||
}
|
||||
unsigned int size = std::get<0>(chunk_header);
|
||||
//std::println("Chunk type {} Size {}", std::get<1>(chunk_header).data, std::get<0>(chunk_header));
|
||||
|
||||
buffer_unsigned raw_data{};
|
||||
raw_data.size = std::get<0>(chunk_header);
|
||||
std::tuple<buffer, unsigned> dat;
|
||||
std::get<0>(dat).size = std::get<0>(chunk_header);
|
||||
ret = reader.read_from_tuple(dat);
|
||||
if (ret.second == READ_FILE_ENDED || ret.second == READ_INCOMPLETE)
|
||||
{
|
||||
std::println("Chunk incomplete!");
|
||||
return ;
|
||||
}
|
||||
unsigned long crc = crc32(0, reinterpret_cast<unsigned char *>(std::get<1>(chunk_header).data), 4);
|
||||
crc = crc32(crc, reinterpret_cast<unsigned char *>(std::get<0>(dat).data), std::get<0>(chunk_header));
|
||||
if (crc != std::get<1>(dat))
|
||||
throw std::runtime_error("Crc check failed");
|
||||
|
||||
|
||||
if (strncmp(std::get<1>(chunk_header).data, "IDAT", 4) == 0)
|
||||
{
|
||||
raw_dat.write(reinterpret_cast<unsigned char *>(std::get<0>(dat).data), std::get<0>(chunk_header));
|
||||
}
|
||||
else if (strncmp(std::get<1>(chunk_header).data, "IHDR", 4) == 0)
|
||||
{
|
||||
meta = parse_metadata(std::get<0>(dat));
|
||||
}
|
||||
else if (strncmp(std::get<1>(chunk_header).data, "PLTE", 4) == 0)
|
||||
{
|
||||
palette_found = true;
|
||||
if (size%3 != 0)
|
||||
{
|
||||
std::println("Palette size is not divisible by 3");
|
||||
return ;
|
||||
}
|
||||
for (int i = 0; i < size; i += 3)
|
||||
{
|
||||
color tmp_color;
|
||||
tmp_color.r = std::get<0>(dat).data[i];
|
||||
tmp_color.g = std::get<0>(dat).data[i + 1];
|
||||
tmp_color.b = std::get<0>(dat).data[i + 2];
|
||||
palette.push_back(tmp_color);
|
||||
}
|
||||
}
|
||||
else if (strncmp(std::get<1>(chunk_header).data, "IEND", 4) == 0)
|
||||
break;
|
||||
}
|
||||
|
||||
data.allocate(get_uncompressed_size(meta));
|
||||
size_t prev_allocated = data.allocated;
|
||||
int r = uncompress(data.data, &prev_allocated, raw_dat.data, raw_dat.allocated);
|
||||
if (r != Z_OK)
|
||||
{
|
||||
std::println("Uncompress failed {}", r);
|
||||
throw std::runtime_error("Uncompress fail");
|
||||
}
|
||||
}
|
||||
|
||||
int paeth_predict(int a, int b, int c)
|
||||
{
|
||||
int pred = a+b-c;
|
||||
int pred1 = abs(pred - a);
|
||||
int pred2 = abs(pred - b);
|
||||
int pred3 = abs(pred - c);
|
||||
if (pred1 <= pred2 && pred1 <= pred3)
|
||||
return a;
|
||||
if (pred2 <= pred3)
|
||||
return b;
|
||||
return c;
|
||||
}
|
||||
|
||||
static void filter_scanline(unsigned char *scanline, unsigned char *previous_scanline, unsigned char *dest, metadata &meta, unsigned char filter_type)
|
||||
{
|
||||
size_t pixel_size = get_pixel_bit_size(meta);
|
||||
size_t pixel_size_bytes = (pixel_size + 7)/8;
|
||||
size_t scanline_size = (meta.width * pixel_size + 7)/8;
|
||||
for (int i = 0; i < scanline_size; i++)
|
||||
{
|
||||
long index_before = 0;
|
||||
unsigned char a = 0;
|
||||
unsigned char b = 0;
|
||||
unsigned char c = 0;
|
||||
|
||||
if (i >= pixel_size_bytes)
|
||||
a = dest[i - pixel_size_bytes];
|
||||
if (previous_scanline != nullptr)
|
||||
b = previous_scanline[i];
|
||||
if (previous_scanline != nullptr && i >= pixel_size_bytes)
|
||||
c = previous_scanline[i - pixel_size_bytes];
|
||||
switch (filter_type)
|
||||
{
|
||||
case 0:
|
||||
dest[i] = scanline[i];
|
||||
break;
|
||||
case 1:
|
||||
dest[i] = scanline[i] + a;
|
||||
break;
|
||||
case 2:
|
||||
dest[i] = scanline[i] + b;
|
||||
break;
|
||||
case 3:
|
||||
|
||||
dest[i] = scanline[i] + floor((a + b)/2);
|
||||
break;
|
||||
case 4:
|
||||
dest[i] = scanline[i] + paeth_predict(a, b, c);
|
||||
break;
|
||||
default:
|
||||
std::println("Non standard filter");
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void filter(buffer_unsigned &data, buffer_unsigned &dest ,metadata &meta)
|
||||
{
|
||||
unsigned long index = 0;
|
||||
unsigned long index_dest = 0;
|
||||
size_t pixel_size = get_pixel_bit_size(meta);
|
||||
size_t pixel_size_bytes = (pixel_size + 7)/8;
|
||||
size_t scanline_size = (meta.width * pixel_size + 7)/8;
|
||||
unsigned long scanlines = 0;
|
||||
dest.allocate(get_uncompressed_size(meta));
|
||||
unsigned char *previous_scanline = nullptr;
|
||||
while (scanlines < meta.height)
|
||||
{
|
||||
unsigned char filter = data.data[index];
|
||||
std::println("Filter {}", filter);
|
||||
filter_scanline(&data.data[index + 1], previous_scanline, &dest.data[index_dest], meta, filter);
|
||||
previous_scanline = &dest.data[index_dest];
|
||||
index += scanline_size + 1;
|
||||
index_dest += scanline_size;
|
||||
scanlines++;
|
||||
}
|
||||
}
|
||||
|
||||
static void apply_palette_scanline(unsigned char *scanline, unsigned char *dest, metadata &meta)
|
||||
{
|
||||
size_t pixel_size = get_pixel_bit_size(meta);
|
||||
size_t pixel_size_bytes = (pixel_size + 7)/8;
|
||||
size_t scanline_size = (meta.width * pixel_size + 7)/8;
|
||||
unsigned long dest_index = 0;
|
||||
for (int i = 0; i < scanline_size; i++)
|
||||
{
|
||||
color tmp_color = palette[scanline[i]];
|
||||
dest[dest_index] = tmp_color.r;
|
||||
dest[dest_index++] = tmp_color.g;
|
||||
dest[dest_index++] = tmp_color.b;
|
||||
}
|
||||
}
|
||||
|
||||
static void apply_palette(buffer_unsigned &data, buffer_unsigned &dest, metadata &meta)
|
||||
{
|
||||
unsigned long index = 0;
|
||||
unsigned long index_dest = 0;
|
||||
size_t pixel_size = get_pixel_bit_size(meta);
|
||||
size_t pixel_size_bytes = (pixel_size + 7)/8;
|
||||
size_t scanline_size = (meta.width * pixel_size + 7)/8;
|
||||
unsigned long scanlines = 0;
|
||||
dest.allocate(get_uncompressed_size(meta) * 3);
|
||||
while (scanlines < meta.height)
|
||||
{
|
||||
unsigned char filter = data.data[index];
|
||||
std::println("Filter {}", filter);
|
||||
apply_palette_scanline(&data.data[index + 1], &dest.data[index_dest], meta);
|
||||
index += scanline_size + 1;
|
||||
index_dest += scanline_size;
|
||||
scanlines++;
|
||||
}
|
||||
}
|
||||
|
||||
void read_png(const std::string &file_path, buffer_unsigned &data)
|
||||
{
|
||||
buffer_unsigned tmp_data{};
|
||||
metadata meta{0};
|
||||
read_raw_data(file_path, tmp_data, meta);
|
||||
if (palette_found == true)
|
||||
{
|
||||
buffer_unsigned dest_palette{};
|
||||
apply_palette(tmp_data, dest_palette, meta);
|
||||
tmp_data = dest_palette;
|
||||
}
|
||||
filter(tmp_data, data, meta);
|
||||
}
|
||||
66
src/filter.cpp
Normal file
66
src/filter.cpp
Normal file
|
|
@ -0,0 +1,66 @@
|
|||
#include "filter.h"
|
||||
|
||||
void filter_scanline(unsigned char *scanline, unsigned char *previous_scanline, unsigned char *dest, metadata &meta, unsigned char filter_type)
|
||||
{
|
||||
size_t pixel_size = get_pixel_bit_size(meta);
|
||||
size_t pixel_size_bytes = (pixel_size + 7)/8;
|
||||
size_t scanline_size = (meta.width * pixel_size + 7)/8;
|
||||
for (int i = 0; i < scanline_size; i++)
|
||||
{
|
||||
long index_before = 0;
|
||||
unsigned char a = 0;
|
||||
unsigned char b = 0;
|
||||
unsigned char c = 0;
|
||||
|
||||
if (i >= pixel_size_bytes)
|
||||
a = dest[i - pixel_size_bytes];
|
||||
if (previous_scanline != nullptr)
|
||||
b = previous_scanline[i];
|
||||
if (previous_scanline != nullptr && i >= pixel_size_bytes)
|
||||
c = previous_scanline[i - pixel_size_bytes];
|
||||
switch (filter_type)
|
||||
{
|
||||
case 0:
|
||||
dest[i] = scanline[i];
|
||||
break;
|
||||
case 1:
|
||||
dest[i] = scanline[i] + a;
|
||||
break;
|
||||
case 2:
|
||||
dest[i] = scanline[i] + b;
|
||||
break;
|
||||
case 3:
|
||||
|
||||
dest[i] = scanline[i] + floor((a + b)/2);
|
||||
break;
|
||||
case 4:
|
||||
dest[i] = scanline[i] + paeth_predict(a, b, c);
|
||||
break;
|
||||
default:
|
||||
std::println("Non standard filter");
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void filter(buffer_unsigned &data, buffer_unsigned &dest ,metadata &meta)
|
||||
{
|
||||
unsigned long index = 0;
|
||||
unsigned long index_dest = 0;
|
||||
size_t pixel_size = get_pixel_bit_size(meta);
|
||||
size_t pixel_size_bytes = (pixel_size + 7)/8;
|
||||
size_t scanline_size = (meta.width * pixel_size + 7)/8;
|
||||
unsigned long scanlines = 0;
|
||||
dest.allocate(get_uncompressed_size(meta));
|
||||
unsigned char *previous_scanline = nullptr;
|
||||
while (scanlines < meta.height)
|
||||
{
|
||||
unsigned char filter = data.data[index];
|
||||
std::println("Filter {}", filter);
|
||||
filter_scanline(&data.data[index + 1], previous_scanline, &dest.data[index_dest], meta, filter);
|
||||
previous_scanline = &dest.data[index_dest];
|
||||
index += scanline_size + 1;
|
||||
index_dest += scanline_size;
|
||||
scanlines++;
|
||||
}
|
||||
}
|
||||
6
src/filter.h
Normal file
6
src/filter.h
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
#pragma once
|
||||
#include "utils.h"
|
||||
|
||||
void filter_scanline(unsigned char *scanline, unsigned char *previous_scanline, unsigned char *dest, metadata &meta, unsigned char filter_type);
|
||||
void filter(buffer_unsigned &data, buffer_unsigned &dest ,metadata &meta);
|
||||
|
||||
135
src/lily_png.cpp
Normal file
135
src/lily_png.cpp
Normal file
|
|
@ -0,0 +1,135 @@
|
|||
#include "lily_png.h"
|
||||
|
||||
std::vector<color> palette;
|
||||
bool palette_found = false;
|
||||
|
||||
static void read_raw_data(const std::string &file_path, buffer_unsigned &data, metadata &meta)
|
||||
{
|
||||
std::println("Zlib version is {}", zlibVersion());
|
||||
unsigned char magic[9] = {137, 80, 78, 71, 13, 10, 26, 10};
|
||||
file_reader reader(file_path);
|
||||
char file_magic[9] = {0};
|
||||
reader.read_buffer(file_magic, 8);
|
||||
if (memcmp(magic, file_magic, 8) != 0)
|
||||
{
|
||||
std::println("File is not a png!");
|
||||
return ;
|
||||
}
|
||||
buffer_unsigned raw_dat{};
|
||||
while (true)
|
||||
{
|
||||
std::tuple<unsigned int, buffer> chunk_header;
|
||||
std::get<1>(chunk_header).size = 4;
|
||||
auto ret = reader.read_from_tuple(chunk_header);
|
||||
if (ret.second == READ_FILE_ENDED || ret.second == READ_INCOMPLETE)
|
||||
{
|
||||
std::println("Chunk incomplete!");
|
||||
return ;
|
||||
}
|
||||
unsigned int size = std::get<0>(chunk_header);
|
||||
//std::println("Chunk type {} Size {}", std::get<1>(chunk_header).data, std::get<0>(chunk_header));
|
||||
|
||||
buffer_unsigned raw_data{};
|
||||
raw_data.size = std::get<0>(chunk_header);
|
||||
std::tuple<buffer, unsigned> dat;
|
||||
std::get<0>(dat).size = std::get<0>(chunk_header);
|
||||
ret = reader.read_from_tuple(dat);
|
||||
if (ret.second == READ_FILE_ENDED || ret.second == READ_INCOMPLETE)
|
||||
{
|
||||
std::println("Chunk incomplete!");
|
||||
return ;
|
||||
}
|
||||
unsigned long crc = crc32(0, reinterpret_cast<unsigned char *>(std::get<1>(chunk_header).data), 4);
|
||||
crc = crc32(crc, reinterpret_cast<unsigned char *>(std::get<0>(dat).data), std::get<0>(chunk_header));
|
||||
if (crc != std::get<1>(dat))
|
||||
throw std::runtime_error("Crc check failed");
|
||||
|
||||
|
||||
if (strncmp(std::get<1>(chunk_header).data, "IDAT", 4) == 0)
|
||||
{
|
||||
raw_dat.write(reinterpret_cast<unsigned char *>(std::get<0>(dat).data), std::get<0>(chunk_header));
|
||||
}
|
||||
else if (strncmp(std::get<1>(chunk_header).data, "IHDR", 4) == 0)
|
||||
{
|
||||
meta = parse_metadata(std::get<0>(dat));
|
||||
}
|
||||
else if (strncmp(std::get<1>(chunk_header).data, "PLTE", 4) == 0)
|
||||
{
|
||||
palette_found = true;
|
||||
if (size%3 != 0)
|
||||
{
|
||||
std::println("Palette size is not divisible by 3");
|
||||
return ;
|
||||
}
|
||||
for (int i = 0; i < size; i += 3)
|
||||
{
|
||||
color tmp_color;
|
||||
tmp_color.r = std::get<0>(dat).data[i];
|
||||
tmp_color.g = std::get<0>(dat).data[i + 1];
|
||||
tmp_color.b = std::get<0>(dat).data[i + 2];
|
||||
palette.push_back(tmp_color);
|
||||
}
|
||||
}
|
||||
else if (strncmp(std::get<1>(chunk_header).data, "IEND", 4) == 0)
|
||||
break;
|
||||
}
|
||||
|
||||
data.allocate(get_uncompressed_size(meta));
|
||||
size_t prev_allocated = data.allocated;
|
||||
int r = uncompress(data.data, &prev_allocated, raw_dat.data, raw_dat.allocated);
|
||||
if (r != Z_OK)
|
||||
{
|
||||
std::println("Uncompress failed {}", r);
|
||||
throw std::runtime_error("Uncompress fail");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
static void apply_palette_scanline(unsigned char *scanline, unsigned char *dest, metadata &meta)
|
||||
{
|
||||
size_t pixel_size = get_pixel_bit_size(meta);
|
||||
size_t pixel_size_bytes = (pixel_size + 7)/8;
|
||||
size_t scanline_size = (meta.width * pixel_size + 7)/8;
|
||||
unsigned long dest_index = 0;
|
||||
for (int i = 0; i < scanline_size; i++)
|
||||
{
|
||||
color tmp_color = palette[scanline[i]];
|
||||
dest[dest_index] = tmp_color.r;
|
||||
dest[dest_index++] = tmp_color.g;
|
||||
dest[dest_index++] = tmp_color.b;
|
||||
}
|
||||
}
|
||||
|
||||
static void apply_palette(buffer_unsigned &data, buffer_unsigned &dest, metadata &meta)
|
||||
{
|
||||
unsigned long index = 0;
|
||||
unsigned long index_dest = 0;
|
||||
size_t pixel_size = get_pixel_bit_size(meta);
|
||||
size_t pixel_size_bytes = (pixel_size + 7)/8;
|
||||
size_t scanline_size = (meta.width * pixel_size + 7)/8;
|
||||
unsigned long scanlines = 0;
|
||||
dest.allocate(get_uncompressed_size(meta) * 3);
|
||||
while (scanlines < meta.height)
|
||||
{
|
||||
unsigned char filter = data.data[index];
|
||||
std::println("Filter {}", filter);
|
||||
apply_palette_scanline(&data.data[index + 1], &dest.data[index_dest], meta);
|
||||
index += scanline_size + 1;
|
||||
index_dest += scanline_size;
|
||||
scanlines++;
|
||||
}
|
||||
}
|
||||
|
||||
void read_png(const std::string &file_path, buffer_unsigned &data)
|
||||
{
|
||||
buffer_unsigned tmp_data{};
|
||||
metadata meta{0};
|
||||
read_raw_data(file_path, tmp_data, meta);
|
||||
if (palette_found == true)
|
||||
{
|
||||
buffer_unsigned dest_palette{};
|
||||
apply_palette(tmp_data, dest_palette, meta);
|
||||
tmp_data = dest_palette;
|
||||
}
|
||||
filter(tmp_data, data, meta);
|
||||
}
|
||||
|
|
@ -1,20 +1,13 @@
|
|||
#pragma once
|
||||
|
||||
#include "file_reader/src/file_read.h"
|
||||
#include "../file_reader/src/file_read.h"
|
||||
#include <string>
|
||||
#include <iostream>
|
||||
#include <vector>
|
||||
#include "utils.h"
|
||||
#include "filter.h"
|
||||
#include <zlib.h>
|
||||
|
||||
struct metadata
|
||||
{
|
||||
unsigned int width;
|
||||
unsigned int height;
|
||||
char bit_depth;
|
||||
char color_type;
|
||||
char compression;
|
||||
char filter;
|
||||
char interface;
|
||||
};
|
||||
|
||||
struct color
|
||||
{
|
||||
unsigned char r = 0;
|
||||
23
src/metadata.cpp
Normal file
23
src/metadata.cpp
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
#include "metadata.h"
|
||||
|
||||
|
||||
metadata parse_metadata(buffer &data)
|
||||
{
|
||||
std::tuple<unsigned int, unsigned int, char, char, char, char, char> meta;
|
||||
constexpr std::size_t size = std::tuple_size_v<decltype(meta)>;
|
||||
parsing_buffer par_buf(data);
|
||||
par_buf.point = par_buf.buf.data;
|
||||
par_buf.consumed_size = 0;
|
||||
read_comp(size, par_buf, meta);
|
||||
std::println("Width {} height {}", std::get<0>(meta), std::get<1>(meta));
|
||||
metadata m{0};
|
||||
m.width = std::get<0>(meta);
|
||||
m.height = std::get<1>(meta);
|
||||
m.bit_depth = std::get<2>(meta);
|
||||
m.color_type = std::get<3>(meta);
|
||||
m.compression = std::get<4>(meta);
|
||||
m.filter = std::get<5>(meta);
|
||||
m.interface = std::get<6>(meta);
|
||||
std::println("metadata{{ width: {}, height: {}, bit_depth: {}, color_type: {}, compression: {}, filter: {}, interface: {} }}", m.width, m.height, (int)m.bit_depth, (int)m.color_type, (int)m.compression, (int)m.filter, (int)m.interface);
|
||||
return m;
|
||||
}
|
||||
15
src/metadata.h
Normal file
15
src/metadata.h
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
#pragma once
|
||||
#include "../file_reader/src/file_read.h"
|
||||
|
||||
struct metadata
|
||||
{
|
||||
unsigned int width;
|
||||
unsigned int height;
|
||||
char bit_depth;
|
||||
char color_type;
|
||||
char compression;
|
||||
char filter;
|
||||
char interface;
|
||||
};
|
||||
|
||||
metadata parse_metadata(buffer &data);
|
||||
74
src/utils.cpp
Normal file
74
src/utils.cpp
Normal file
|
|
@ -0,0 +1,74 @@
|
|||
|
||||
#include "utils.h"
|
||||
|
||||
size_t get_pixel_bit_size(const metadata &meta)
|
||||
{
|
||||
size_t ret = 0;
|
||||
switch (meta.color_type)
|
||||
{
|
||||
case 0:
|
||||
if (meta.bit_depth == 1 || meta.bit_depth == 2 || meta.bit_depth == 4 || meta.bit_depth == 8 || meta.bit_depth == 16)
|
||||
{
|
||||
ret = meta.bit_depth;
|
||||
}
|
||||
else
|
||||
throw std::runtime_error("Invalid bit depht");
|
||||
break;
|
||||
case 2:
|
||||
if (meta.bit_depth == 8 || meta.bit_depth == 16)
|
||||
{
|
||||
ret = meta.bit_depth * 3;
|
||||
}
|
||||
else
|
||||
throw std::runtime_error("Invalid bit depht");
|
||||
break;
|
||||
case 3:
|
||||
if (meta.bit_depth == 1 || meta.bit_depth == 2 || meta.bit_depth == 4 || meta.bit_depth == 8)
|
||||
{
|
||||
ret = meta.bit_depth;
|
||||
}
|
||||
else
|
||||
throw std::runtime_error("Invalid bit depht");
|
||||
break;
|
||||
case 4:
|
||||
if (meta.bit_depth == 8 || meta.bit_depth == 16)
|
||||
{
|
||||
ret = meta.bit_depth * 2;
|
||||
}
|
||||
else
|
||||
throw std::runtime_error("Invalid bit depht");
|
||||
break;
|
||||
case 6:
|
||||
if (meta.bit_depth == 8 || meta.bit_depth == 16)
|
||||
{
|
||||
ret = meta.bit_depth * 4;
|
||||
}
|
||||
else
|
||||
throw std::runtime_error("Invalid bit depht");
|
||||
break;
|
||||
default:
|
||||
throw std::runtime_error("Invalid color type");
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
size_t get_uncompressed_size(const metadata meta)
|
||||
{
|
||||
size_t ret = (meta.width * get_pixel_bit_size(meta) + 7)/8; //ceil() but for bytes
|
||||
ret = (ret + 1) * meta.height;
|
||||
std::println("Uncompressed size {}", ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
int paeth_predict(int a, int b, int c)
|
||||
{
|
||||
int pred = a+b-c;
|
||||
int pred1 = abs(pred - a);
|
||||
int pred2 = abs(pred - b);
|
||||
int pred3 = abs(pred - c);
|
||||
if (pred1 <= pred2 && pred1 <= pred3)
|
||||
return a;
|
||||
if (pred2 <= pred3)
|
||||
return b;
|
||||
return c;
|
||||
}
|
||||
6
src/utils.h
Normal file
6
src/utils.h
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
#pragma once
|
||||
#include "metadata.h"
|
||||
|
||||
size_t get_pixel_bit_size(const metadata &meta);
|
||||
size_t get_uncompressed_size(const metadata meta);
|
||||
int paeth_predict(int a, int b, int c);
|
||||
Loading…
Add table
Add a link
Reference in a new issue