From 3b223f5c49e858f9f814f1e2672cc399565f4a43 Mon Sep 17 00:00:00 2001
From: Devaev Maxim <mdevaev@gmail.com>
Date: Sun, 27 Dec 2020 02:41:47 +0300
Subject: [PATCH] refactoring

---
 src/{ustreamer => common}/frame.c    | 0
 src/{ustreamer => common}/frame.h    | 4 ++--
 src/ustreamer/blank.h                | 2 +-
 src/ustreamer/encoder.h              | 2 +-
 src/ustreamer/encoders/cpu/encoder.h | 2 +-
 src/ustreamer/encoders/hw/encoder.h  | 2 +-
 src/ustreamer/encoders/omx/encoder.h | 4 ++--
 src/ustreamer/http/server.h          | 2 +-
 src/ustreamer/options.h              | 2 +-
 src/ustreamer/stream.h               | 3 +--
 10 files changed, 11 insertions(+), 12 deletions(-)
 rename src/{ustreamer => common}/frame.c (100%)
 rename src/{ustreamer => common}/frame.h (97%)

diff --git a/src/ustreamer/frame.c b/src/common/frame.c
similarity index 100%
rename from src/ustreamer/frame.c
rename to src/common/frame.c
diff --git a/src/ustreamer/frame.h b/src/common/frame.h
similarity index 97%
rename from src/ustreamer/frame.h
rename to src/common/frame.h
index 43911c2..ca727c5 100644
--- a/src/ustreamer/frame.h
+++ b/src/common/frame.h
@@ -29,8 +29,8 @@
 #include <string.h>
 #include <assert.h>
 
-#include "../common/tools.h"
-#include "../common/logging.h"
+#include "tools.h"
+#include "logging.h"
 
 
 typedef struct {
diff --git a/src/ustreamer/blank.h b/src/ustreamer/blank.h
index 8650970..8d74843 100644
--- a/src/ustreamer/blank.h
+++ b/src/ustreamer/blank.h
@@ -30,7 +30,7 @@
 
 #include "../common/tools.h"
 #include "../common/logging.h"
-#include "frame.h"
+#include "../common/frame.h"
 
 #include "data/blank_jpeg.h"
 
diff --git a/src/ustreamer/encoder.h b/src/ustreamer/encoder.h
index ad1e341..2c58e7e 100644
--- a/src/ustreamer/encoder.h
+++ b/src/ustreamer/encoder.h
@@ -33,9 +33,9 @@
 #include "../common/tools.h"
 #include "../common/threading.h"
 #include "../common/logging.h"
+#include "../common/frame.h"
 
 #include "device.h"
-#include "frame.h"
 
 #include "encoders/cpu/encoder.h"
 #include "encoders/hw/encoder.h"
diff --git a/src/ustreamer/encoders/cpu/encoder.h b/src/ustreamer/encoders/cpu/encoder.h
index f331d04..72a18c4 100644
--- a/src/ustreamer/encoders/cpu/encoder.h
+++ b/src/ustreamer/encoders/cpu/encoder.h
@@ -32,7 +32,7 @@
 #include <linux/videodev2.h>
 
 #include "../../../common/tools.h"
-#include "../../frame.h"
+#include "../../../common/frame.h"
 #include "../../device.h"
 
 
diff --git a/src/ustreamer/encoders/hw/encoder.h b/src/ustreamer/encoders/hw/encoder.h
index 7ebaaca..33c856f 100644
--- a/src/ustreamer/encoders/hw/encoder.h
+++ b/src/ustreamer/encoders/hw/encoder.h
@@ -31,8 +31,8 @@
 
 #include "../../../common/tools.h"
 #include "../../../common/logging.h"
+#include "../../../common/frame.h"
 #include "../../xioctl.h"
-#include "../../frame.h"
 #include "../../device.h"
 
 #include "huffman.h"
diff --git a/src/ustreamer/encoders/omx/encoder.h b/src/ustreamer/encoders/omx/encoder.h
index 3401c58..71e7fd0 100644
--- a/src/ustreamer/encoders/omx/encoder.h
+++ b/src/ustreamer/encoders/omx/encoder.h
@@ -36,10 +36,10 @@
 #include <IL/OMX_Broadcom.h>
 #include <interface/vcos/vcos_semaphore.h>
 
-#include "../../../common/logging.h"
 #include "../../../common/tools.h"
+#include "../../../common/logging.h"
+#include "../../../common/frame.h"
 #include "../../device.h"
-#include "../../frame.h"
 
 #include "formatters.h"
 #include "component.h"
diff --git a/src/ustreamer/http/server.h b/src/ustreamer/http/server.h
index 4f05e8a..ccc98eb 100644
--- a/src/ustreamer/http/server.h
+++ b/src/ustreamer/http/server.h
@@ -57,8 +57,8 @@
 #include "../../common/threading.h"
 #include "../../common/logging.h"
 #include "../../common/process.h"
+#include "../../common/frame.h"
 #include "../data/index_html.h"
-#include "../frame.h"
 #include "../encoder.h"
 #include "../stream.h"
 #ifdef WITH_GPIO
diff --git a/src/ustreamer/options.h b/src/ustreamer/options.h
index f0b4e78..77ec9e0 100644
--- a/src/ustreamer/options.h
+++ b/src/ustreamer/options.h
@@ -36,12 +36,12 @@
 #include "../common/config.h"
 #include "../common/logging.h"
 #include "../common/process.h"
+#include "../common/frame.h"
 #ifdef WITH_RAWSINK
 #	include "../rawsink/rawsink.h"
 #endif
 
 #include "device.h"
-#include "frame.h"
 #include "encoder.h"
 #include "blank.h"
 #include "stream.h"
diff --git a/src/ustreamer/stream.h b/src/ustreamer/stream.h
index 8475695..72f490d 100644
--- a/src/ustreamer/stream.h
+++ b/src/ustreamer/stream.h
@@ -35,10 +35,9 @@
 #include "../common/tools.h"
 #include "../common/threading.h"
 #include "../common/logging.h"
+#include "../common/frame.h"
 
 #include "blank.h"
-
-#include "frame.h"
 #include "device.h"
 #include "encoder.h"
 #ifdef WITH_RAWSINK