Adjust the structure for preparing to develop different architectures

Author: zeng-qinghui

Makefile

@@ -1,12 +1,3 @@
-CFLAGS=-Wall -Werror -O2
-ifdef DEBUG
-CFLAGS=-g -Wall -Werror -O0
-endif
-
-ifndef CUDA_PATH
-CUDA_PATH=/usr/local/cuda
-endif
-
 ifndef PYTHON_VERSION
 PYTHON_VERSION=$(shell python3 -c "import sys; print('%d.%d' % (sys.version_info.major, sys.version_info.minor,))")
 endif
@@ -15,45 +6,20 @@ ifndef PYTHON_BIN
 PYTHON_BIN=python${PYTHON_VERSION}
 endif
 
-# ifndef PYTHON_INCLUDE_PATH
-# PYTHON_INCLUDE_PATH=/usr/include/python${PYTHON_VERSION}
-# endif
-
-# ifndef PYTHON_LIB_PATH
-# PYTHON_LIB_PATH=$(shell ldconfig -p | grep python${PYTHON_VERSION} | head -n 1 | xargs dirname | tail -n 1)
-# endif
-
-# ifndef PYTHON_DYNLOAD_PATH
-# PYTHON_DYNLOAD_PATH=$(shell ${PYTHON_BIN} -c "import sys; print(list(filter(lambda x: 'lib-dynload' in x, sys.path))[0])")
-# endif
-
-# PYTHON_LIB_NAME=$(shell ${PYTHON_BIN} -c "import sys; print('nvjpeg.cpython-%d%dm' % (sys.version_info.major, sys.version_info.minor,))")-x86_64-linux-gnu.so
-
-# all: out/nvjpeg-test out/${PYTHON_LIB_NAME}
-all: out/nvjpeg-test python-interface
+all: pynvjpeg
 out:
 	mkdir out
 
-out/nvjpeg-test.o: out nvjpeg-python.c
-	gcc -o out/nvjpeg-test.o -c nvjpeg-python.c -I${CUDA_PATH}/include -D BUILD_TEST ${CFLAGS}
-
-out/nvjpeg-test: out/nvjpeg-test.o
-	gcc -o out/nvjpeg-test out/nvjpeg-test.o -L${CUDA_PATH}/lib64 -lnvjpeg -lcudart ${CFLAGS}
+test:
+	${PYTHON_BIN} tests/test.py
+	${PYTHON_BIN} tests/test-with-multiprocessing.py
 
-# out/nvjpeg-python.o: out nvjpeg-python.c
-# 	gcc -fPIC -o out/nvjpeg-python.o -c nvjpeg-python.c -I${CUDA_PATH}/include -I${PYTHON_INCLUDE_PATH} ${CFLAGS}
-
-# out/${PYTHON_LIB_NAME}: out/nvjpeg-python.o
-# 	gcc --shared -fPIC -o out/${PYTHON_LIB_NAME} out/nvjpeg-python.o -L${CUDA_PATH}/lib64 -lnvjpeg -lcudart -L${PYTHON_LIB_PATH} -lpython${PYTHON_VERSION}m ${CFLAGS}
-python-interface:
+pynvjpeg:
 	${PYTHON_BIN} setup.py build
 
 clean:
 	rm -Rf out build dist pynvjpeg.egg-info
 
-release: clean python-interface
+release: clean pynvjpeg
 	${PYTHON_BIN} setup.py sdist
 	${PYTHON_BIN} -m twine upload dist/*
-
-# install: out/${PYTHON_LIB_NAME}
-# 	cp -f out/${PYTHON_LIB_NAME} ${PYTHON_DYNLOAD_PATH}

include/JpegCoder.hpp

@@ -0,0 +1,82 @@
+#pragma once
+
+#include <sys/types.h>
+#include <malloc.h>
+#include <memory.h>
+#include <iostream>
+#include <exception>
+
+class JpegCoderError: std::runtime_error{
+protected:
+    int _code;
+public:
+    JpegCoderError(int code, const std::string& str):std::runtime_error(str){
+        this->_code = code;
+    }
+    JpegCoderError(int code, const char* str):std::runtime_error(str){
+        this->_code = code;
+    }
+    int code(){
+        return this->_code;
+    }
+};
+
+typedef enum
+{
+    JPEGCODER_CSS_444 = 0,
+    JPEGCODER_CSS_422 = 1,
+    JPEGCODER_CSS_420 = 2,
+    JPEGCODER_CSS_440 = 3,
+    JPEGCODER_CSS_411 = 4,
+    JPEGCODER_CSS_410 = 5,
+    JPEGCODER_CSS_GRAY = 6,
+    JPEGCODER_CSS_UNKNOWN = -1
+} JpegCoderChromaSubsampling;
+
+typedef enum{
+    JPEGCODER_PIXFMT_RGB         = 3,
+    JPEGCODER_PIXFMT_BGR         = 4, 
+    JPEGCODER_PIXFMT_RGBI        = 5, 
+    JPEGCODER_PIXFMT_BGRI        = 6,
+}JpegCoderColorFormat;
+
+class JpegCoderImage{
+public:
+    void* img;
+    JpegCoderChromaSubsampling subsampling;
+    size_t height;
+    size_t width;
+    short nChannel;
+    
+    JpegCoderImage(size_t width, size_t height, short nChannel, JpegCoderChromaSubsampling subsampling);
+    ~JpegCoderImage();
+    void fill(const unsigned char* data);
+    unsigned char* buffer();
+};
+
+class JpegCoderBytes{
+public:
+    size_t size;
+    unsigned char* data;
+    JpegCoderBytes(size_t size){
+        this->data = (unsigned char*)malloc(size);
+        this->size = size;
+    }
+
+    ~JpegCoderBytes(){
+        if(this->data!=nullptr){
+            free(this->data);
+        }
+    }
+};
+
+class JpegCoder{
+protected:
+    static void* _global_context;
+public:
+    JpegCoder();
+    ~JpegCoder();
+    JpegCoderImage* decode(const unsigned char* jpegData, size_t length);
+    JpegCoderBytes* encode(JpegCoderImage* img, int quality);
+    static void cleanUpEnv();
+};