move yuv functions

neutrinolabs · Nov 18, 2017 · 8b53199 · 8b53199
1 parent e1bcd8e
commit 8b53199
Show file tree

Hide file tree

Showing 6 changed files with 547 additions and 411 deletions.
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -31,12 +31,14 @@ noinst_HEADERS = \
   rfxencode_rlgr3.h \
   rfxencode_tile.h \
   rfxencode_diff_rlgr1.h \
-  rfxencode_diff_rlgr3.h
+  rfxencode_diff_rlgr3.h \
+  rfxencode_rgb_to_yuv.h
 
 lib_LTLIBRARIES = librfxencode.la
 
 librfxencode_la_SOURCES = $(noinst_HEADERS) rfxencode.c \
   rfxencode_compose.c rfxencode_tile.c rfxencode_dwt.c \
   rfxencode_quantization.c rfxencode_differential.c \
   rfxencode_rlgr1.c rfxencode_rlgr3.c rfxencode_alpha.c \
-  rfxencode_diff_rlgr1.c rfxencode_diff_rlgr3.c
+  rfxencode_diff_rlgr1.c rfxencode_diff_rlgr3.c \
+  rfxencode_rgb_to_yuv.c
diff --git a/src/rfxencode.c b/src/rfxencode.c
@@ -38,6 +38,7 @@
 #include "rfxencode_dwt.h"
 #include "rfxencode_diff_rlgr1.h"
 #include "rfxencode_diff_rlgr3.h"
+#include "rfxencode_rgb_to_yuv.h"
 
 #ifdef RFX_USE_ACCEL_X86
 #include "x86/funcs_x86.h"
@@ -59,7 +60,7 @@ rfxcodec_encode_create_ex(int width, int height, int format, int flags,
     int dx;
 
     enc = (struct rfxencode *) calloc(1, sizeof(struct rfxencode));
-    if (enc == 0)
+    if (enc == NULL)
     {
         return 1;
     }
@@ -153,6 +154,8 @@ rfxcodec_encode_create_ex(int width, int height, int format, int flags,
             return 2;
     }
     enc->format = format;
+    enc->rfx_encode_rgb_to_yuv = rfx_encode_rgb_to_yuv;
+    enc->rfx_encode_argb_to_yuva = rfx_encode_argb_to_yuva;
     /* assign encoding functions */
     if (flags & RFX_FLAGS_NOACCEL)
     {
@@ -294,7 +297,7 @@ rfxcodec_encode_destroy(void *handle)
     struct rfxencode *enc;
 
     enc = (struct rfxencode *) handle;
-    if (enc == 0)
+    if (enc == NULL)
     {
         return 0;
     }

diff --git a/src/rfxencode.h b/src/rfxencode.h
@@ -21,6 +21,14 @@
 
 struct rfxencode;
 
+typedef int (*rfx_encode_rgb_to_yuv_proc)(struct rfxencode *enc,
+                                          const char *rgb_data,
+                                          int width, int height,
+                                          int stride_bytes);
+typedef int (*rfx_encode_argb_to_yuva_proc)(struct rfxencode *enc,
+                                            const char *argb_data,
+                                            int width, int height,
+                                       int stride_bytes);
 typedef int (*rfx_encode_proc)(struct rfxencode *enc, const char *qtable,
                                const uint8 *data,
                                uint8 *buffer, int buffer_size, int *size);
@@ -51,6 +59,8 @@ struct rfxencode
     sint16 *dwt_buffer1;
     sint16 *dwt_buffer2;
     rfx_encode_proc rfx_encode;
+    rfx_encode_rgb_to_yuv_proc rfx_encode_rgb_to_yuv;
+    rfx_encode_argb_to_yuva_proc rfx_encode_argb_to_yuva;
 
     int got_sse2;
     int got_sse3;