Skip to content

Commit 3699708

Browse files
lastrosadelastrosade
committed
add QOI Image format
Adds support for the QOI image format. Adds qoi.h as a new dependency in thirdparty/.
1 parent 2efd199 commit 3699708

5 files changed

Lines changed: 752 additions & 14 deletions

File tree

‎examples/cli/main.cpp‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -400,6 +400,7 @@ bool save_results(const SDCliParams& cli_params,
400400
std::string ext_lower = ext.string();
401401
std::transform(ext_lower.begin(), ext_lower.end(), ext_lower.begin(), ::tolower);
402402
bool is_jpg = (ext_lower == ".jpg" || ext_lower == ".jpeg" || ext_lower == ".jpe");
403+
bool is_qoi = (ext_lower == ".qoi");
403404

404405
int output_begin_idx = cli_params.output_begin_idx;
405406
if (output_begin_idx < 0) {
@@ -415,14 +416,16 @@ bool save_results(const SDCliParams& cli_params,
415416
int ok = 0;
416417
if (is_jpg) {
417418
ok = stbi_write_jpg(path.string().c_str(), img.width, img.height, img.channel, img.data, 90, params.c_str());
419+
} else if (is_qoi) {
420+
ok = save_image_as_qoi(path.string().c_str(), img.width, img.height, img.channel, img.data) ? 1 : 0;
418421
} else {
419422
ok = stbi_write_png(path.string().c_str(), img.width, img.height, img.channel, img.data, 0, params.c_str());
420423
}
421424
LOG_INFO("save result image %d to '%s' (%s)", idx, path.string().c_str(), ok ? "success" : "failure");
422425
};
423426

424427
if (std::regex_search(cli_params.output_path, format_specifier_regex)) {
425-
if (!is_jpg && ext_lower != ".png")
428+
if (!is_qoi && !is_jpg && ext_lower != ".png")
426429
ext = ".png";
427430
fs::path pattern = base_path;
428431
pattern += ext;
@@ -444,7 +447,7 @@ bool save_results(const SDCliParams& cli_params,
444447
return true;
445448
}
446449

447-
if (!is_jpg && ext_lower != ".png")
450+
if (!is_qoi && !is_jpg && ext_lower != ".png")
448451
ext = ".png";
449452

450453
for (int i = 0; i < num_results; ++i) {

‎examples/common/common.hpp‎

Lines changed: 65 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@ namespace fs = std::filesystem;
3131
#define STB_IMAGE_RESIZE_STATIC
3232
#include "stb_image_resize.h"
3333

34+
#define QOI_IMPLEMENTATION
35+
#include "qoi.h"
36+
3437
#define SAFE_STR(s) ((s) ? (s) : "")
3538
#define BOOL_STR(b) ((b) ? "true" : "false")
3639

@@ -1982,13 +1985,47 @@ uint8_t* load_image_common(bool from_memory,
19821985
int c = 0;
19831986
const char* image_path;
19841987
uint8_t* image_buffer = nullptr;
1988+
1989+
bool is_qoi = false;
19851990
if (from_memory) {
1986-
image_path = "memory";
1987-
image_buffer = (uint8_t*)stbi_load_from_memory((const stbi_uc*)image_path_or_bytes, len, &width, &height, &c, expected_channel);
1991+
// magic bytes
1992+
is_qoi = len >= 4 &&
1993+
reinterpret_cast<const unsigned char*>(image_path_or_bytes)[0] == 'q' &&
1994+
reinterpret_cast<const unsigned char*>(image_path_or_bytes)[1] == 'o' &&
1995+
reinterpret_cast<const unsigned char*>(image_path_or_bytes)[2] == 'i' &&
1996+
reinterpret_cast<const unsigned char*>(image_path_or_bytes)[3] == 'f';
1997+
} else if (image_path_or_bytes) {
1998+
const char* ext = strrchr(image_path_or_bytes, '.');
1999+
is_qoi = ext && (_stricmp(ext, ".qoi") == 0);
2000+
}
2001+
2002+
if (is_qoi) {
2003+
// Use QOI.h
2004+
qoi_desc desc;
2005+
if (from_memory) {
2006+
image_buffer = (uint8_t*)qoi_decode(image_path_or_bytes, len, &desc, expected_channel);
2007+
} else {
2008+
image_buffer = (uint8_t*)qoi_read(image_path_or_bytes, &desc, expected_channel);
2009+
}
2010+
if (image_buffer) {
2011+
width = desc.width;
2012+
height = desc.height;
2013+
c = desc.channels;
2014+
}
2015+
image_path = from_memory ? "memory" : image_path_or_bytes;
19882016
} else {
1989-
image_path = image_path_or_bytes;
1990-
image_buffer = (uint8_t*)stbi_load(image_path_or_bytes, &width, &height, &c, expected_channel);
2017+
// Use stb_image
2018+
if (from_memory) {
2019+
image_path = "memory";
2020+
image_buffer = (uint8_t*)stbi_load_from_memory(
2021+
(const stbi_uc*)image_path_or_bytes, len, &width, &height, &c, expected_channel);
2022+
} else {
2023+
image_path = image_path_or_bytes;
2024+
image_buffer = (uint8_t*)stbi_load(
2025+
image_path_or_bytes, &width, &height, &c, expected_channel);
2026+
}
19912027
}
2028+
19922029
if (image_buffer == nullptr) {
19932030
LOG_ERROR("load image from '%s' failed", image_path);
19942031
return nullptr;
@@ -2092,3 +2129,27 @@ uint8_t* load_image_from_memory(const char* image_bytes,
20922129
int expected_channel = 3) {
20932130
return load_image_common(true, image_bytes, len, width, height, expected_width, expected_height, expected_channel);
20942131
}
2132+
2133+
uint8_t* load_qoi_from_memory(const char* qoi_data,
2134+
int len,
2135+
int& width,
2136+
int& height,
2137+
int expected_channel = 3) {
2138+
qoi_desc desc;
2139+
uint8_t* image_buffer = (uint8_t*)qoi_decode(qoi_data, len, &desc, expected_channel);
2140+
if (image_buffer) {
2141+
width = desc.width;
2142+
height = desc.height;
2143+
}
2144+
return image_buffer;
2145+
}
2146+
2147+
bool save_image_as_qoi(const char* filename, int width, int height, int channels, const void* data) {
2148+
qoi_desc desc;
2149+
desc.width = width;
2150+
desc.height = height;
2151+
desc.channels = channels;
2152+
desc.colorspace = QOI_SRGB;
2153+
2154+
return qoi_write(filename, data, &desc) > 0;
2155+
}

‎examples/server/main.cpp‎

Lines changed: 30 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,8 @@ std::string extract_and_remove_sd_cpp_extra_args(std::string& text) {
214214
}
215215

216216
enum class ImageFormat { JPEG,
217-
PNG };
217+
PNG,
218+
QOI };
218219

219220
std::vector<uint8_t> write_image_to_vector(
220221
ImageFormat format,
@@ -247,6 +248,22 @@ std::vector<uint8_t> write_image_to_vector(
247248
case ImageFormat::PNG:
248249
result = stbi_write_png_to_func(c_func, &ctx, width, height, channels, image, width * channels);
249250
break;
251+
case ImageFormat::QOI: {
252+
qoi_desc desc;
253+
desc.width = width;
254+
desc.height = height;
255+
desc.channels = channels;
256+
desc.colorspace = QOI_SRGB;
257+
258+
int out_len = 0;
259+
void* qoi_data = qoi_encode(image, &desc, &out_len);
260+
if (qoi_data) {
261+
c_func(&ctx, qoi_data, out_len);
262+
free(qoi_data);
263+
result = 1;
264+
}
265+
break;
266+
}
250267
default:
251268
throw std::runtime_error("invalid image format");
252269
}
@@ -372,9 +389,9 @@ int main(int argc, const char** argv) {
372389

373390
std::string sd_cpp_extra_args_str = extract_and_remove_sd_cpp_extra_args(prompt);
374391

375-
if (output_format != "png" && output_format != "jpeg") {
392+
if (output_format != "png" && output_format != "jpeg" && output_format != "qoi") {
376393
res.status = 400;
377-
res.set_content(R"({"error":"invalid output_format, must be one of [png, jpeg]"})", "application/json");
394+
res.set_content(R"({"error":"invalid output_format, must be one of [png, jpeg, qoi]"})", "application/json");
378395
return;
379396
}
380397
if (n <= 0)
@@ -464,7 +481,10 @@ int main(int argc, const char** argv) {
464481
if (results[i].data == nullptr) {
465482
continue;
466483
}
467-
auto image_bytes = write_image_to_vector(output_format == "jpeg" ? ImageFormat::JPEG : ImageFormat::PNG,
484+
auto image_bytes = write_image_to_vector(
485+
output_format == "jpeg" ? ImageFormat::JPEG :
486+
output_format == "qoi" ? ImageFormat::QOI :
487+
ImageFormat::PNG,
468488
results[i].data,
469489
results[i].width,
470490
results[i].height,
@@ -555,9 +575,9 @@ int main(int argc, const char** argv) {
555575
std::string output_format = "png";
556576
if (req.form.has_field("output_format"))
557577
output_format = req.form.get_field("output_format");
558-
if (output_format != "png" && output_format != "jpeg") {
578+
if (output_format != "png" && output_format != "jpeg" && output_format != "qoi") {
559579
res.status = 400;
560-
res.set_content(R"({"error":"invalid output_format, must be one of [png, jpeg]"})", "application/json");
580+
res.set_content(R"({"error":"invalid output_format, must be one of [png, jpeg, qoi]"})", "application/json");
561581
return;
562582
}
563583

@@ -684,7 +704,10 @@ int main(int argc, const char** argv) {
684704
for (int i = 0; i < num_results; i++) {
685705
if (results[i].data == nullptr)
686706
continue;
687-
auto image_bytes = write_image_to_vector(output_format == "jpeg" ? ImageFormat::JPEG : ImageFormat::PNG,
707+
auto image_bytes = write_image_to_vector(
708+
output_format == "jpeg" ? ImageFormat::JPEG :
709+
output_format == "qoi" ? ImageFormat::QOI :
710+
ImageFormat::PNG,
688711
results[i].data,
689712
results[i].width,
690713
results[i].height,

‎thirdparty/README.md‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,6 @@
77
- httplib.h from: https://github.com/yhirose/cpp-httplib/blob/master/httplib.h
88
- LICENSE: https://github.com/yhirose/cpp-httplib/blob/master/LICENSE
99
- stb_image.h/stb_image_resize.h/stb_image_write.h from: https://github.com/nothings/stb
10-
- LICENSE: https://github.com/nothings/stb/blob/master/LICENSE
10+
- LICENSE: https://github.com/nothings/stb/blob/master/LICENSE
11+
- qoi.h library from: https://github.com/phoboslab/qoi
12+
- https://github.com/phoboslab/qoi/blob/master/LICENSE

0 commit comments

Comments
 (0)