update 1.1.5

Author: tonquer

setup.py

@@ -48,7 +48,7 @@
 ```
 
 """
-Version = "1.1.4"
+Version = "1.1.5"
 
 Plat = sys.platform
 

setup2.py

@@ -47,7 +47,7 @@
 ```
 
 """
-Version = "1.1.4"
+Version = "1.1.5"
 
 Plat = sys.platform
 

src/apng_image.h

@@ -351,7 +351,8 @@ bool load_apng(Task& v)
         free(p_image);
     }
     ok = true;
-    if (v.file.length() == 0) v.file = "apng";
+    if (v.save_format.length() == 0) v.save_format = "apng";
+    v.load_format = "apng";
 End:
 
     if (png_ptr)

src/other_image.h

@@ -99,26 +99,26 @@ bool jpg_save(Task& v)
 
 bool to_save(Task &v)
 {
-    if (!v.file.compare("bmp"))
+    if (!v.save_format.compare("bmp"))
     {
         return bmp_save(v);
     }
-    else if (!v.file.compare("png"))
+    else if (!v.save_format.compare("png"))
     {
         return png_save(v);
     }
-    else if (!v.file.compare("jpg") || !v.file.compare("jpeg"))
+    else if (!v.save_format.compare("jpg") || !v.save_format.compare("jpeg"))
     {
         return jpg_save(v);
     }
-    else if (!v.file.compare("webp") || !v.file.compare("gif"))
+    else if (!v.save_format.compare("webp"))
     {
         if (v.outImage.size() <= 1)
             return webp_save(v);
         else
             return webp_save_ani(v);
     }
-    else if (!v.file.compare("apng"))
+    else if (!v.save_format.compare("apng"))
     {
         return save_apng(v);
     }
@@ -197,7 +197,10 @@ bool stbi_xload(Task &v)
         v.inFrame.push_back(100);
     }
 End:
-    if (v.file.length() == 0) v.file = format;
+    if (v.save_format.length() == 0) v.save_format = format;
+    if (!v.save_format.compare("gif")) v.save_format = "webp";
+    v.load_format = format;
+
     if (pixeldata) stbi_image_free(pixeldata);
     if (delays) stbi_image_free(delays);
     return ok;

src/stb_image.h

@@ -6819,7 +6819,7 @@ static void *stbi__load_gif_main(stbi__context *s, int **delays, int *x, int *y,
             }
             memcpy( out + ((layers - 1) * stride), u, stride );
             if (layers >= 2) {
-               two_back = out - 2 * stride;
+                two_back = out + ((layers - 2) * stride);
             }
 
             if (delays) {

src/waifu2x_main.cpp

@@ -15,6 +15,7 @@ static int GpuId;
 static int TotalJobsProc = 0;
 static int NumThreads = 1;
 static int TaskId = 1;
+static int WebpQuality = 90;
 
 bool IsDebug = false;
 
@@ -49,7 +50,7 @@ int waifu2x_getData(void*& out, unsigned long& outSize, double& tick, int& callB
     outSize = v.outSize;
 
     v.out = NULL;
-    strcpy(format, v.file.c_str());
+    strcpy(format, v.save_format.c_str());
     tick = v.allTick;
     return v.id;
 }
@@ -141,7 +142,7 @@ void* waifu2x_proc(void* args)
             name = "cpu";
 
         waifu2x_printf(stdout, "[waifu2x] start encode imageId :%d, gpu:%s, format:%s, model:%s, noise:%d, scale:%d, tta:%d, tileSize:%d\n",
-            v.callBack, name, v.file.c_str(), waifu2x->mode_name.c_str(), waifu2x->noise, waifu2x->scale, waifu2x->tta_mode, v.tileSize);
+            v.callBack, name, v.save_format.c_str(), waifu2x->mode_name.c_str(), waifu2x->noise, waifu2x->scale, waifu2x->tta_mode, v.tileSize);
         int scale_run_count = 1;
         int frame = 0;
         for (std::list<ncnn::Mat *>::iterator in = v.inImage.begin(); in != v.inImage.end(); in++)
@@ -590,6 +591,7 @@ int waifu2x_addData(const unsigned char* data, unsigned int size, int callBack,
     v.toW = toW;
     v.scale = scale;
     v.tileSize = tileSize;
+    v.webp_quality = WebpQuality;
     if ((toH <= 0 || toW <= 0) && scale <= 0)
     {
         waifu2x_set_error("invalid scale params");
@@ -601,10 +603,10 @@ int waifu2x_addData(const unsigned char* data, unsigned int size, int callBack,
         waifu2x_set_error("invalid model index");
         return sts;
     }
-    if (format) v.file = format;
+    if (format) v.save_format = format;
 
-    transform(v.file.begin(), v.file.end(), v.file.begin(), ::tolower);
-    if (v.file.length() == 0 || !v.file.compare("jpg") || !v.file.compare("jpeg") || !v.file.compare("png") || !v.file.compare("webp") || !v.file.compare("jpg") || !v.file.compare("bmp") || !v.file.compare("apng"))
+    transform(v.save_format.begin(), v.save_format.end(), v.save_format.begin(), ::tolower);
+    if (v.save_format.length() == 0 || !v.save_format.compare("jpg") || !v.save_format.compare("jpeg") || !v.save_format.compare("png") || !v.save_format.compare("webp") || !v.save_format.compare("jpg") || !v.save_format.compare("bmp") || !v.save_format.compare("apng"))
     {
         Todecode.put(v);
         return TaskId;
@@ -650,6 +652,12 @@ int waifu2x_set_debug(bool isdebug)
     return 0;
 }
 
+int waifu2x_set_webp_quality(int webp_quality)
+{
+    WebpQuality = webp_quality;
+    return 0;
+}
+
 int waifu2x_remove_wait(std::set<int>& taskIds)
 {
     Todecode.remove(taskIds);

src/waifu2x_main.h

@@ -37,7 +37,8 @@ class Task
     void* fileDate;
     int fileSize;
     int allFileSize=0;
-    std::string file;
+    std::string load_format;
+    std::string save_format;
     std::string err;
     bool isSuc = true;
 
@@ -47,6 +48,7 @@ class Task
     unsigned long toH;
     float scale = 2;
     int tileSize = 0;
+    int webp_quality = 90;
 
     struct timeb startTick;
     struct timeb decodeTick;
@@ -192,6 +194,7 @@ int waifu2x_get_path_size();
 int waifu2x_stop();
 int waifu2x_clear();
 int waifu2x_set_debug(bool);
+int waifu2x_set_webp_quality(int);
 int waifu2x_printf(void* p, const char* fmt, ...);
 int waifu2x_printf(void* p, const wchar_t* fmt, ...);
 int waifu2x_remove_wait(std::set<int>&);

src/waifu2x_py.cpp

@@ -103,6 +103,19 @@ waifu2x_py_init_set(PyObject* self, PyObject* args, PyObject* kwargs)
     return PyLong_FromLong(sts);
 }
 
+static PyObject*
+waifu2x_py_set_webp_quality(PyObject* self, PyObject* args)
+{
+    int quality=0;
+    if (!PyArg_ParseTuple(args, "i", &quality))
+        PyLong_FromLong(-1);
+    if (quality <= 0 || quality > 100)
+    {
+        return PyLong_FromLong(-1);
+    }
+    waifu2x_set_webp_quality(quality);
+    return PyLong_FromLong(0);
+}
 
 static PyObject*
 waifu2x_py_clear(PyObject* self, PyObject* args)

src/waifu2x_py.h

@@ -14,6 +14,9 @@ waifu2x_py_set_debug(PyObject* self, PyObject* args);
 static PyObject*
 waifu2x_py_init_set(PyObject* self, PyObject* args, PyObject* kwargs);
 
+static PyObject*
+waifu2x_py_set_webp_quality(PyObject* self, PyObject* args);
+
 static PyObject*
 waifu2x_py_clear (PyObject* self, PyObject* args);
 
@@ -58,6 +61,8 @@ static PyMethodDef SpamMethods[] = {
      "Init ncnn\n"},
     {"initSet",  (PyCFunction)waifu2x_py_init_set, METH_VARARGS | METH_KEYWORDS,
      "Init setting\ngpuId: getGpuInfo get index \ncpuNum(Option): CPU model use CPU num, default cpu num / 2 \n"},
+    {"setWebpQuality",  (PyCFunction)waifu2x_py_set_webp_quality, METH_VARARGS,
+     "set webp quality \ncan go from 0 (smaller output, lower quality) to 100 (best quality,larger output) \n"},
     {"add",  (PyCFunction)waifu2x_py_add, METH_VARARGS | METH_KEYWORDS,
      "Add task, \ndata: img bytes \nmodelIndex: Model enum \nbackId: call back id \nformat(Option): export fmt, default import fmt \nimport support bmp png jpg gif webp \nexport support bmp png jpg webp \nwidth(Option): export set width \nhigh(Option): export set high \nscale(Option): export set width and high \ntileSize(Option): default Auto\n"},
     {"getGpuInfo",  (PyCFunction)waifu2x_py_get_info, METH_VARARGS,
@@ -98,5 +103,5 @@ static struct PyModuleDef spammodule = {
 
 static bool IsInit = false;
 static bool IsInitSet = false;
-static const char* Version = "1.1.4";
+static const char* Version = "1.1.5";
 #endif 

src/webp_image.h

@@ -49,7 +49,8 @@ bool webp_load(Task &v)
     }
     v.inImage.push_back(inimage);
     v.inFrame.push_back(100);
-    if (v.file.length() == 0) v.file = "webp";
+    if (v.save_format.length() == 0) v.save_format = "webp";
+    v.load_format = "webp";
     return true;
 }
 
@@ -112,7 +113,8 @@ bool webp_load_ani(Task& v)
         ++frame_index;
         prev_frame_timestamp = timestamp;
     }
-    if (v.file.length() == 0) v.file = "webp";
+    if (v.save_format.length() == 0) v.save_format = "webp";
+    v.load_format = "webp";
     ok = true;
 End:
     WebPAnimDecoderDelete(dec);
@@ -169,7 +171,7 @@ bool webp_save_ani(Task &v)
         ncnn::Mat & inimage = **i;
         int duration= *j;
 
-        size = WebPEncodeLosslessRGBA((unsigned char*)inimage.data, inimage.w, inimage.h, inimage.w * (int)inimage.elemsize, &outb);
+        size = WebPEncodeRGBA((unsigned char*)inimage.data, inimage.w, inimage.h, inimage.w * (int)inimage.elemsize, v.webp_quality, &outb);
 
         const WebPData webp_data = { outb, size };
         frame.duration = duration;
@@ -209,11 +211,11 @@ bool webp_save(Task &v)
 
     if (outimage.elemsize == 3)
     {
-        length = WebPEncodeLosslessRGB((unsigned char*)outimage.data, outimage.w, outimage.h, outimage.w * (int)outimage.elemsize, &output);
+        length = WebPEncodeRGB((unsigned char*)outimage.data, outimage.w, outimage.h, outimage.w * (int)outimage.elemsize, v.webp_quality, &output);
     }
     else if (outimage.elemsize == 4)
     {
-        length = WebPEncodeLosslessRGBA((unsigned char*)outimage.data, outimage.w, outimage.h, outimage.w * (int)outimage.elemsize, &output);
+        length = WebPEncodeRGBA((unsigned char*)outimage.data, outimage.w, outimage.h, outimage.w * (int)outimage.elemsize, v.webp_quality, &output);
     }
     else
     {