(SoftFilters) Add LQ2x

driver.h

@@ -691,6 +691,7 @@ extern const struct softfilter_implementation *blargg_ntsc_snes_rf_get_implement
 extern const struct softfilter_implementation *blargg_ntsc_snes_composite_get_implementation(softfilter_simd_mask_t simd);
 extern const struct softfilter_implementation *blargg_ntsc_snes_svideo_get_implementation(softfilter_simd_mask_t simd);
 extern const struct softfilter_implementation *blargg_ntsc_snes_rgb_get_implementation(softfilter_simd_mask_t simd);
+extern const struct softfilter_implementation *lq2x_get_implementation(softfilter_simd_mask_t simd);
 extern const struct softfilter_implementation *twoxbr_get_implementation(softfilter_simd_mask_t simd);
 extern const struct softfilter_implementation *epx_get_implementation(softfilter_simd_mask_t simd);
 extern const struct softfilter_implementation *twoxsai_get_implementation(softfilter_simd_mask_t simd);

gfx/filter.c

@@ -92,6 +92,7 @@ static const struct softfilter_implementation *(*softfilter_drivers[]) (softfilt
    &blargg_ntsc_snes_composite_get_implementation,
    &blargg_ntsc_snes_svideo_get_implementation,
    &blargg_ntsc_snes_rgb_get_implementation,
+   &lq2x_get_implementation,
    &twoxbr_get_implementation,
    &darken_get_implementation,
    &twoxsai_get_implementation,

gfx/filters/Makefile

@@ -68,7 +68,7 @@ ASMFLAGS := -INEON/asm
 asflags += -mfpu=neon
 endif
            
-objects += blargg_ntsc_snes_composite.$(DYLIB) blargg_ntsc_snes_rf.$(DYLIB) blargg_ntsc_snes_svideo.$(DYLIB) blargg_ntsc_snes_rgb.$(DYLIB) epx.$(DYLIB) 2xsai.$(DYLIB) super2xsai.$(DYLIB) supereagle.$(DYLIB) 2xbr.$(DYLIB) darken.$(DYLIB) scale2x.$(DYLIB)
+objects += blargg_ntsc_snes_composite.$(DYLIB) blargg_ntsc_snes_rf.$(DYLIB) blargg_ntsc_snes_svideo.$(DYLIB) blargg_ntsc_snes_rgb.$(DYLIB) epx.$(DYLIB) lq2x.$(DYLIB) 2xsai.$(DYLIB) super2xsai.$(DYLIB) supereagle.$(DYLIB) 2xbr.$(DYLIB) darken.$(DYLIB) scale2x.$(DYLIB)
 
 all: build;
 

gfx/filters/lq2x.c

@@ -0,0 +1,245 @@
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
+ *  Copyright (C) 2011-2014 - Daniel De Matteis
+ *
+ *  RetroArch is free software: you can redistribute it and/or modify it under the terms
+ *  of the GNU General Public License as published by the Free Software Found-
+ *  ation, either version 3 of the License, or (at your option) any later version.
+ *
+ *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ *  PURPOSE.  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with RetroArch.
+ *  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+// Compile: gcc -o lq2x.so -shared lq2x.c -std=c99 -O3 -Wall -pedantic -fPIC
+
+#include "softfilter.h"
+#include "softfilter_prototypes.h"
+#include <stdlib.h>
+
+#ifdef RARCH_INTERNAL
+#define softfilter_get_implementation lq2x_get_implementation
+#endif
+
+#define LQ2X_SCALE 2
+
+static unsigned lq2x_generic_input_fmts(void)
+{
+   return SOFTFILTER_FMT_RGB565 | SOFTFILTER_FMT_XRGB8888;
+}
+
+static unsigned lq2x_generic_output_fmts(unsigned input_fmts)
+{
+   return input_fmts;
+}
+
+static unsigned lq2x_generic_threads(void *data)
+{
+   struct filter_data *filt = (struct filter_data*)data;
+   return filt->threads;
+}
+
+static void *lq2x_generic_create(unsigned in_fmt, unsigned out_fmt,
+      unsigned max_width, unsigned max_height,
+      unsigned threads, softfilter_simd_mask_t simd)
+{
+   (void)simd;
+
+   struct filter_data *filt = (struct filter_data*)calloc(1, sizeof(*filt));
+   if (!filt)
+      return NULL;
+   filt->workers = (struct softfilter_thread_data*)calloc(threads, sizeof(struct softfilter_thread_data));
+   filt->threads = threads;
+   filt->in_fmt  = in_fmt;
+   if (!filt->workers)
+   {
+      free(filt);
+      return NULL;
+   }
+   return filt;
+}
+
+static void lq2x_generic_output(void *data, unsigned *out_width, unsigned *out_height,
+      unsigned width, unsigned height)
+{
+   *out_width = width * LQ2X_SCALE;
+   *out_height = height * LQ2X_SCALE;
+}
+
+static void lq2x_generic_destroy(void *data)
+{
+   struct filter_data *filt = (struct filter_data*)data;
+   free(filt->workers);
+   free(filt);
+}
+
+static void lq2x_generic_rgb565(unsigned width, unsigned height,
+      int first, int last, uint16_t *src, 
+      unsigned src_stride, uint16_t *dst, unsigned dst_stride)
+{
+   uint16_t *out0 = (uint16_t*)dst;
+   uint16_t *out1 = (uint16_t*)(dst + dst_stride);
+
+   for(unsigned y = 0; y < height; y++)
+   {
+      int prevline = (y == 0 ? 0 : src_stride);
+      int nextline = (y == height - 1 || last) ? 0 : src_stride;
+
+      for(unsigned x = 0; x < width; x++)
+      {
+         uint16_t A = *(src - prevline);
+         uint16_t B = (x > 0) ? *(src - 1) : *src;
+         uint16_t C = *src;
+         uint16_t D = (x < width - 1) ? *(src + 1) : *src;
+         uint16_t E = *(src++ + nextline);
+         uint16_t c = C;
+
+         if(A != E && B != D)
+         {
+            *out0++ = (A == B ? C + A - ((C ^ A) & 0x0821) >> 1 : c);
+            *out0++ = (A == D ? C + A - ((C ^ A) & 0x0821) >> 1 : c);
+            *out1++ = (E == B ? C + E - ((C ^ E) & 0x0821) >> 1 : c);
+            *out1++ = (E == D ? C + E - ((C ^ E) & 0x0821) >> 1 : c);
+         }
+         else
+         {
+            *out0++ = c;
+            *out0++ = c;
+            *out1++ = c;
+            *out1++ = c;
+         }
+      }
+
+      src += src_stride - width;
+      out0 += dst_stride + dst_stride - (width << 1);
+      out1 += dst_stride + dst_stride - (width << 1);
+   }
+}
+
+static void lq2x_generic_xrgb8888(unsigned width, unsigned height,
+      int first, int last, uint32_t *src, 
+      unsigned src_stride, uint32_t *dst, unsigned dst_stride)
+{
+   uint32_t *out0 = (uint32_t*)dst;
+   uint32_t *out1 = (uint32_t*)(dst + dst_stride);
+
+   for(unsigned y = 0; y < height; y++)
+   {
+      int prevline = (y == 0 ? 0 : src_stride);
+      int nextline = (y == height - 1 || last) ? 0 : src_stride;
+
+      for(unsigned x = 0; x < width; x++)
+      {
+         uint32_t A = *(src - prevline);
+         uint32_t B = (x > 0) ? *(src - 1) : *src;
+         uint32_t C = *src;
+         uint32_t D = (x < width - 1) ? *(src + 1) : *src;
+         uint32_t E = *(src++ + nextline);
+         uint32_t c = C;
+
+         if(A != E && B != D)
+         {
+            *out0++ = (A == B ? C + A - ((C ^ A) & 0x0421) >> 1 : c);
+            *out0++ = (A == D ? C + A - ((C ^ A) & 0x0421) >> 1 : c);
+            *out1++ = (E == B ? C + E - ((C ^ E) & 0x0421) >> 1 : c);
+            *out1++ = (E == D ? C + E - ((C ^ E) & 0x0421) >> 1 : c);
+         }
+         else
+         {
+            *out0++ = c;
+            *out0++ = c;
+            *out1++ = c;
+            *out1++ = c;
+         }
+      }
+
+      src += src_stride - width;
+      out0 += dst_stride + dst_stride - (width << 1);
+      out1 += dst_stride + dst_stride - (width << 1);
+   }
+}
+
+static void lq2x_work_cb_rgb565(void *data, void *thread_data)
+{
+   struct softfilter_thread_data *thr = (struct softfilter_thread_data*)thread_data;
+   uint16_t *input = (uint16_t*)thr->in_data;
+   uint16_t *output = (uint16_t*)thr->out_data;
+   unsigned width = thr->width;
+   unsigned height = thr->height;
+
+   lq2x_generic_rgb565(width, height,
+         thr->first, thr->last, input, thr->in_pitch / SOFTFILTER_BPP_RGB565, output, thr->out_pitch / SOFTFILTER_BPP_RGB565);
+}
+
+static void lq2x_work_cb_xrgb8888(void *data, void *thread_data)
+{
+   struct softfilter_thread_data *thr = (struct softfilter_thread_data*)thread_data;
+   uint32_t *input = (uint32_t*)thr->in_data;
+   uint32_t *output = (uint32_t*)thr->out_data;
+   unsigned width = thr->width;
+   unsigned height = thr->height;
+
+   lq2x_generic_xrgb8888(width, height,
+         thr->first, thr->last, input, thr->in_pitch / SOFTFILTER_BPP_XRGB8888, output, thr->out_pitch / SOFTFILTER_BPP_XRGB8888);
+}
+
+static void lq2x_generic_packets(void *data,
+      struct softfilter_work_packet *packets,
+      void *output, size_t output_stride,
+      const void *input, unsigned width, unsigned height, size_t input_stride)
+{
+   struct filter_data *filt = (struct filter_data*)data;
+   unsigned i;
+   for (i = 0; i < filt->threads; i++)
+   {
+      struct softfilter_thread_data *thr = (struct softfilter_thread_data*)&filt->workers[i];
+
+      unsigned y_start = (height * i) / filt->threads;
+      unsigned y_end = (height * (i + 1)) / filt->threads;
+      thr->out_data = (uint8_t*)output + y_start * LQ2X_SCALE * output_stride;
+      thr->in_data = (const uint8_t*)input + y_start * input_stride;
+      thr->out_pitch = output_stride;
+      thr->in_pitch = input_stride;
+      thr->width = width;
+      thr->height = y_end - y_start;
+
+      // Workers need to know if they can access pixels outside their given buffer.
+      thr->first = y_start;
+      thr->last = y_end == height;
+
+      if (filt->in_fmt == SOFTFILTER_FMT_RGB565)
+         packets[i].work = lq2x_work_cb_rgb565;
+      //else if (filt->in_fmt == SOFTFILTER_FMT_RGB4444)
+         //packets[i].work = lq2x_work_cb_rgb4444;
+      else if (filt->in_fmt == SOFTFILTER_FMT_XRGB8888)
+         packets[i].work = lq2x_work_cb_xrgb8888;
+      packets[i].thread_data = thr;
+   }
+}
+
+static const struct softfilter_implementation lq2x_generic = {
+   lq2x_generic_input_fmts,
+   lq2x_generic_output_fmts,
+
+   lq2x_generic_create,
+   lq2x_generic_destroy,
+
+   lq2x_generic_threads,
+   lq2x_generic_output,
+   lq2x_generic_packets,
+   "LQ2x",
+   SOFTFILTER_API_VERSION,
+};
+
+const struct softfilter_implementation *softfilter_get_implementation(softfilter_simd_mask_t simd)
+{
+   (void)simd;
+   return &lq2x_generic;
+}
+
+#ifdef RARCH_INTERNAL
+#undef softfilter_get_implementation
+#endif

griffin/griffin.c

@@ -480,6 +480,7 @@ FILTERS
 #include "../gfx/filters/blargg_ntsc_snes_composite.c"
 #include "../gfx/filters/blargg_ntsc_snes_svideo.c"
 #include "../gfx/filters/blargg_ntsc_snes_rgb.c"
+#include "../gfx/filters/lq2x.c"
 
 #include "../audio/filters/echo.c"
 #ifndef _WIN32