encoders subdir

src/encoder.c

@@ -30,11 +30,11 @@
 #include "device.h"
 #include "encoder.h"
 
-#include "jpeg/encoder.h"
-#include "hw/encoder.h"
+#include "encoders/jpeg/encoder.h"
+#include "encoders/hw/encoder.h"
 
 #ifdef OMX_ENCODER
-#	include "omx/encoder.h"
+#	include "encoders/omx/encoder.h"
 #endif
 
 

src/encoder.h

@@ -28,7 +28,7 @@
 #include "device.h"
 
 #ifdef OMX_ENCODER
-#	include "omx/encoder.h"
+#	include "encoders/omx/encoder.h"
 #	define ENCODER_TYPES_OMX_HINT ", OMX"
 #else
 #	define ENCODER_TYPES_OMX_HINT ""

src/encoders/hw/encoder.c

@@ -25,10 +25,10 @@
 
 #include <linux/videodev2.h>
 
-#include "../tools.h"
-#include "../logging.h"
-#include "../xioctl.h"
-#include "../device.h"
+#include "../../tools.h"
+#include "../../logging.h"
+#include "../../xioctl.h"
+#include "../../device.h"
 
 
 int hw_encoder_prepare_live(struct device_t *dev, unsigned quality) {

src/encoders/hw/encoder.h

@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include "../device.h"
+#include "../../device.h"
 
 
 int hw_encoder_prepare_live(struct device_t *dev, unsigned quality);

src/encoders/jpeg/encoder.c

@@ -33,8 +33,8 @@
 #include <jpeglib.h>
 #include <linux/videodev2.h>
 
-#include "../tools.h"
-#include "../device.h"
+#include "../../tools.h"
+#include "../../device.h"
 
 #include "encoder.h"
 

src/encoders/jpeg/encoder.h

@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include "../device.h"
+#include "../../device.h"
 
 
 void jpeg_encoder_compress_buffer(struct device_t *dev, unsigned index, unsigned quality);

src/encoders/omx/component.c

@@ -25,7 +25,7 @@
 #include <IL/OMX_Core.h>
 #include <IL/OMX_Component.h>
 
-#include "../logging.h"
+#include "../../logging.h"
 
 #include "formatters.h"
 #include "component.h"

src/encoders/omx/encoder.c

@@ -33,9 +33,9 @@
 #include <IL/OMX_Broadcom.h>
 #include <interface/vcos/vcos_semaphore.h>
 
-#include "../logging.h"
-#include "../tools.h"
-#include "../device.h"
+#include "../../logging.h"
+#include "../../tools.h"
+#include "../../device.h"
 
 #include "formatters.h"
 #include "component.h"

src/encoders/omx/encoder.h

@@ -27,7 +27,7 @@
 #include <IL/OMX_Component.h>
 #include <interface/vcos/vcos_semaphore.h>
 
-#include "../device.h"
+#include "../../device.h"
 
 
 #define OMX_MAX_ENCODERS 3

src/encoders/omx/formatters.c

@@ -26,7 +26,7 @@
 #include <IL/OMX_IVCommon.h>
 #include <IL/OMX_Core.h>
 
-#include "../tools.h"
+#include "../../tools.h"
 #include "formatters.h"
 
 

src/encoders/omx/formatters.h

@@ -30,8 +30,8 @@
 #include <IL/OMX_Core.h>
 #include <IL/OMX_Image.h>
 
-#include "../logging.h"
-#include "../tools.h"
+#include "../../logging.h"
+#include "../../tools.h"
 
 
 #define LOG_OMX_ERROR(_error, _msg, ...) { \

src/stream.c

@@ -36,8 +36,6 @@
 #include "encoder.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);