From 9c6852fdf7853fb245c16f6de307153b2a4fe885 Mon Sep 17 00:00:00 2001
From: Devaev Maxim <mdevaev@gmail.com>
Date: Mon, 24 Sep 2018 08:01:25 +0300
Subject: [PATCH] refactoring

---
 Makefile                       |  2 +-
 src/{jpeg.c => jpeg/encoder.c} | 10 ++++++----
 src/{jpeg.h => jpeg/encoder.h} |  4 ++--
 src/stream.c                   |  3 ++-
 src/tools.h                    |  1 +
 5 files changed, 12 insertions(+), 8 deletions(-)
 rename src/{jpeg.c => jpeg/encoder.c} (98%)
 rename src/{jpeg.h => jpeg/encoder.h} (95%)

diff --git a/Makefile b/Makefile
index 75c721b..e031979 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ LIBS = -lm -ljpeg -pthread -levent -levent_pthreads
 CC = gcc
 CFLAGS = -c -std=c99 -O3 -Wall -Wextra -D_GNU_SOURCE
 LDFLAGS =
-SOURCES = $(shell ls src/*.c)
+SOURCES = $(shell ls src/*.c src/jpeg/*.c)
 OBJECTS = $(SOURCES:.c=.o)
 PROG = ustreamer
 
diff --git a/src/jpeg.c b/src/jpeg/encoder.c
similarity index 98%
rename from src/jpeg.c
rename to src/jpeg/encoder.c
index ee69cd2..b9372c5 100644
--- a/src/jpeg.c
+++ b/src/jpeg/encoder.c
@@ -32,9 +32,10 @@
 #include <jpeglib.h>
 #include <linux/videodev2.h>
 
-#include "tools.h"
-#include "device.h"
-#include "jpeg.h"
+#include "../tools.h"
+#include "../device.h"
+
+#include "encoder.h"
 
 
 #define JPEG_OUTPUT_BUFFER_SIZE  4096
@@ -67,7 +68,7 @@ static boolean _jpeg_empty_output_buffer(j_compress_ptr jpeg);
 static void _jpeg_term_destination(j_compress_ptr jpeg);
 
 
-void jpeg_compress_buffer(struct device_t *dev, int index) {
+int jpeg_compress_buffer(struct device_t *dev, int index) {
 	// This function based on compress_image_to_jpeg() from mjpg-streamer
 
 	struct jpeg_compress_struct jpeg;
@@ -109,6 +110,7 @@ void jpeg_compress_buffer(struct device_t *dev, int index) {
 	jpeg_destroy_compress(&jpeg);
 	free(line_buffer);
 	assert(dev->run->pictures[index].size > 0);
+	return 0;
 }
 
 static void _jpeg_set_dest_picture(j_compress_ptr jpeg, unsigned char *picture, unsigned long *written) {
diff --git a/src/jpeg.h b/src/jpeg/encoder.h
similarity index 95%
rename from src/jpeg.h
rename to src/jpeg/encoder.h
index 1440e53..48dfda5 100644
--- a/src/jpeg.h
+++ b/src/jpeg/encoder.h
@@ -24,7 +24,7 @@
 #include <stdlib.h>
 #include <stddef.h>
 
-#include "device.h"
+#include "../device.h"
 
 
-void jpeg_compress_buffer(struct device_t *dev, int index);
+int jpeg_compress_buffer(struct device_t *dev, int index);
diff --git a/src/stream.c b/src/stream.c
index dc71694..fb8c110 100644
--- a/src/stream.c
+++ b/src/stream.c
@@ -32,9 +32,10 @@
 #include "tools.h"
 #include "logging.h"
 #include "device.h"
-#include "jpeg.h"
 #include "stream.h"
 
+#include "jpeg/encoder.h"
+
 
 static long double _stream_get_fluency_delay(struct device_t *dev, struct workers_pool_t *pool);
 static void _stream_expose_picture(struct stream_t *stream, unsigned buf_index);
diff --git a/src/tools.h b/src/tools.h
index 82060d2..62eef8d 100644
--- a/src/tools.h
+++ b/src/tools.h
@@ -29,6 +29,7 @@
 #include <pthread.h>
 #include <time.h>
 #include <assert.h>
+
 #include <sys/ioctl.h>
 #include <sys/types.h>
 #include <sys/syscall.h>