switch to msf gif

Author: LostRuins

otherarch/sdcpp/avi_writer.h

@@ -7,7 +7,12 @@
 #include <string.h>
 
 #include "stable-diffusion.h"
-#include "./gif.h"   // charlietangora/gif-h
+
+#ifndef MSF_GIF_IMPL
+#define MSF_GIF_IMPL
+#endif
+#include "./msf_gif.h" //notnullnotvoid/msf_gif
+
 
 #ifndef INCLUDE_STB_IMAGE_WRITE_H
 #include "stb_image_write.h"
@@ -396,37 +401,25 @@ int create_mjpg_avi_membuf_from_sd_images(sd_image_t* images, int num_images, in
 // ---------------- Helper: create_gif_buf_from_sd_images ----------------
 // Builds a GIF in memory from an array of sd_image_t. Returns 0 on success, -1 on failure.
 // Caller must free(*out_data) when done.
-int create_gif_buf_from_sd_images(sd_image_t* images, int num_images, int fps, int quality,  uint8_t** out_data, size_t *out_len)
+int create_gif_buf_from_sd_images(sd_image_t* images, int num_images, int fps,  uint8_t** out_data, size_t *out_len)
 {
     if(!images || num_images <= 0 || !out_data || !out_len) return -1;
 
     // basic parameter heuristics
     if(fps <= 0) fps = 16;
     uint32_t delay = (uint32_t)(100 / fps); // hundredths of a second per frame
 
-    // map quality [1..100] to bitDepth and dithering
-    if(quality < 1) quality = 1;
-    if(quality > 100) quality = 100;
     int bitDepth = 8;
     bool dither = false;
-    // if(quality >= 80) { bitDepth = 8; dither = false; }
-    // else if(quality >= 50) { bitDepth = 6; dither = false; }
-    // else { bitDepth = 5; dither = true; }
 
     // assume all images same size; use first
     uint32_t width = images[0].width;
     uint32_t height = images[0].height;
 
-    GifWriter gw;
-    memset(&gw, 0, sizeof(gw));
-
-    if(!GifBegin(&gw, width, height, delay, bitDepth, dither))
-    {
-        if(gw.oldImage) GIF_FREE(gw.oldImage);
-
-        fprintf(stderr, "Error: GifBegin failed.\n");
-        return -1;
-    }
+    int centisecondsPerFrame = delay;
+    int quality = 16;
+    MsfGifState gifState = {};
+    msf_gif_begin(&gifState, width, height);
 
     // Feed frames
     for (int i = 0; i < num_images; i++)
@@ -435,8 +428,6 @@ int create_gif_buf_from_sd_images(sd_image_t* images, int num_images, int fps, i
 
         if (img->width != width || img->height != height) {
             fprintf(stderr, "Frame %d has mismatched dimensions.\n", i);
-            GifEnd(&gw);
-            memfile_free(&gw.mem);
             return -1;
         }
 
@@ -445,8 +436,6 @@ int create_gif_buf_from_sd_images(sd_image_t* images, int num_images, int fps, i
         int channels = img->channel;
         if (channels != 3 && channels != 4) {
             fprintf(stderr, "Unsupported channel count: %d\n", channels);
-            GifEnd(&gw);
-            memfile_free(&gw.mem);
             return -1;
         }
 
@@ -464,11 +453,10 @@ int create_gif_buf_from_sd_images(sd_image_t* images, int num_images, int fps, i
             frame_rgba = img->data; // already RGBA
         }
 
-        if(!GifWriteFrame(&gw, frame_rgba, width, height, delay, bitDepth, dither))
+        int res = msf_gif_frame(&gifState, frame_rgba, centisecondsPerFrame, quality, width * 4); //frame
+        if(!res)
         {
             fprintf(stderr, "GIF Write Failed\n");
-            GifEnd(&gw);
-            memfile_free(&gw.mem);
             return -1;
         }
 
@@ -477,20 +465,9 @@ int create_gif_buf_from_sd_images(sd_image_t* images, int num_images, int fps, i
         }
     }
 
-    if(!GifEnd(&gw))
-    {
-        memfile_free(&gw.mem);
-        return -1;
-    }
-
-    uint8_t* buf = memfile_detach(&gw.mem, out_len);
-    if(!buf)
-    {
-        memfile_free(&gw.mem);
-        return -1;
-    }
-
-    *out_data = buf;
+    MsfGifResult result = msf_gif_end(&gifState);
+    *out_data = (uint8_t*)result.data;
+    *out_len = result.dataSize;
     return 0;
 }