Mirror/AI-on-the-edge-device
1
0
Fork 0
mirror of https://github.com/jomjol/AI-on-the-edge-device.git synced 2025-12-09 04:56:53 +03:00
Code Issues Packages Projects Releases Wiki Activity

STBI_ONLY_JPEG (#1789)

Browse Source
This commit is contained in:
jomjol
2023-01-11 20:21:14 +01:00
committed by GitHub
parent eefdc74e9a
commit a39092497e
4 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
code/components/jomjol_flowcontroll/ClassFlowCNNGeneral.cpp
View File

@@ -502,9 +502,9 @@ bool ClassFlowCNNGeneral::doAlignAndCut(string time)
if (SaveAllFiles) if (SaveAllFiles)
{ {
if (GENERAL[_ana]->name == "default") if (GENERAL[_ana]->name == "default")
GENERAL[_ana]->ROI[i]->image->SaveToFile(FormatFileName("/sdcard/img_tmp/" + GENERAL[_ana]->ROI[i]->name + ".bmp")); GENERAL[_ana]->ROI[i]->image->SaveToFile(FormatFileName("/sdcard/img_tmp/" + GENERAL[_ana]->ROI[i]->name + ".jpg"));
else else
GENERAL[_ana]->ROI[i]->image->SaveToFile(FormatFileName("/sdcard/img_tmp/" + GENERAL[_ana]->name + "_" + GENERAL[_ana]->ROI[i]->name + ".bmp")); GENERAL[_ana]->ROI[i]->image->SaveToFile(FormatFileName("/sdcard/img_tmp/" + GENERAL[_ana]->name + "_" + GENERAL[_ana]->ROI[i]->name + ".jpg"));
} }
} }
@@ -826,20 +826,20 @@ std::vector<HTMLInfo*> ClassFlowCNNGeneral::GetHTMLInfo()
if (GENERAL[_ana]->ROI[i]->image) if (GENERAL[_ana]->ROI[i]->image)
{ {
if (GENERAL[_ana]->name == "default") if (GENERAL[_ana]->name == "default")
GENERAL[_ana]->ROI[i]->image->SaveToFile(FormatFileName("/sdcard/img_tmp/" + GENERAL[_ana]->ROI[i]->name + ".bmp")); GENERAL[_ana]->ROI[i]->image->SaveToFile(FormatFileName("/sdcard/img_tmp/" + GENERAL[_ana]->ROI[i]->name + ".jpg"));
else else
GENERAL[_ana]->ROI[i]->image->SaveToFile(FormatFileName("/sdcard/img_tmp/" + GENERAL[_ana]->name + "_" + GENERAL[_ana]->ROI[i]->name + ".bmp")); GENERAL[_ana]->ROI[i]->image->SaveToFile(FormatFileName("/sdcard/img_tmp/" + GENERAL[_ana]->name + "_" + GENERAL[_ana]->ROI[i]->name + ".jpg"));
} }
HTMLInfo *zw = new HTMLInfo; HTMLInfo *zw = new HTMLInfo;
if (GENERAL[_ana]->name == "default") if (GENERAL[_ana]->name == "default")
{ {
zw->filename = GENERAL[_ana]->ROI[i]->name + ".bmp"; zw->filename = GENERAL[_ana]->ROI[i]->name + ".jpg";
zw->filename_org = GENERAL[_ana]->ROI[i]->name + ".jpg"; zw->filename_org = GENERAL[_ana]->ROI[i]->name + ".jpg";
} }
else else
{ {
zw->filename = GENERAL[_ana]->name + "_" + GENERAL[_ana]->ROI[i]->name + ".bmp"; zw->filename = GENERAL[_ana]->name + "_" + GENERAL[_ana]->ROI[i]->name + ".jpg";
zw->filename_org = GENERAL[_ana]->name + "_" + GENERAL[_ana]->ROI[i]->name + ".jpg"; zw->filename_org = GENERAL[_ana]->name + "_" + GENERAL[_ana]->ROI[i]->name + ".jpg";
} }

6
code/components/jomjol_image_proc/CAlignAndCutImage.cpp
View File

@@ -123,8 +123,12 @@ void CAlignAndCutImage::CutAndSave(std::string _template1, int x1, int y1, int d
p_target[_channels] = p_source[_channels]; p_target[_channels] = p_source[_channels];
} }
// stbi_write_jpg(_template1.c_str(), dx, dy, channels, odata, 0); #ifdef STBI_ONLY_JPEG
stbi_write_jpg(_template1.c_str(), dx, dy, channels, odata, 100);
#else
stbi_write_bmp(_template1.c_str(), dx, dy, channels, odata); stbi_write_bmp(_template1.c_str(), dx, dy, channels, odata);
#endif
RGBImageRelease(); RGBImageRelease();

2
code/components/jomjol_image_proc/CImageBasis.cpp
View File

@@ -504,10 +504,12 @@ void CImageBasis::SaveToFile(std::string _imageout)
stbi_write_jpg(_imageout.c_str(), width, height, channels, rgb_image, 0); stbi_write_jpg(_imageout.c_str(), width, height, channels, rgb_image, 0);
} }
#ifndef STBI_ONLY_JPEG
if ((typ == "bmp") || (typ == "BMP")) if ((typ == "bmp") || (typ == "BMP"))
{ {
stbi_write_bmp(_imageout.c_str(), width, height, channels, rgb_image); stbi_write_bmp(_imageout.c_str(), width, height, channels, rgb_image);
} }
#endif
RGBImageRelease(); RGBImageRelease();
} }

2
code/include/defines.h
View File

@@ -111,7 +111,7 @@
//#define STB_IMAGE_IMPLEMENTATION //#define STB_IMAGE_IMPLEMENTATION
//#define STB_IMAGE_WRITE_IMPLEMENTATION //#define STB_IMAGE_WRITE_IMPLEMENTATION
//#define STB_IMAGE_RESIZE_IMPLEMENTATION //#define STB_IMAGE_RESIZE_IMPLEMENTATION
//#define STBI_ONLY_JPEG // (save 2% of Flash, but breaks the alignment mark generation, see https://github.com/jomjol/AI-on-the-edge-device/issues/1721) #define STBI_ONLY_JPEG // (save 2% of Flash, but breaks the alignment mark generation, see https://github.com/jomjol/AI-on-the-edge-device/issues/1721)
//interface_influxdb //interface_influxdb
#define MAX_HTTP_OUTPUT_BUFFER 2048 #define MAX_HTTP_OUTPUT_BUFFER 2048