Refactoring dec/enc

Author: nicledomaS

CMakeLists.txt

@@ -4,6 +4,7 @@ project(VideoStreamer)
 
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
+set(Boost_USE_STATIC_LIBS        ON)
 
 if(WIN32)
     set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MT")
@@ -22,8 +23,8 @@ executable(${PROJECT_NAME}
             SOURCES "src/"
             THREADS
             CONAN_MODULES toml11 ffmpeg
-            BOOST program_options
-            MODULES GSL http_streamer)
+            # BOOST program_options
+            MODULES http_streamer GSL)
 
 install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin)
 

cmake

@@ -1,9 +1,10 @@
 [http_streamer]
-url = "https://192.168.1.144:5000"
+url = "http://192.168.1.144:5000"
 cert = "/home/pi/cert/kovalenko.crt"
 key = "/home/pi/cert/kovalenko.key"
+log_level = "DEBUG"
 
 [inputs]
 items = [ 
-    { id = "video1", type = "WebCamera", url = "/dev/video1", hw_name = "", hw_id = 0 }
+    { id = "video1", input_format = "v4l2", url = "/dev/video1", hw_name = "", hw_id = 0, options = { "video_size" = "1280x720", "framerate" = "10", "pixel_format" = "mjpeg" }}
 ]

config.toml

@@ -5,11 +5,15 @@ project(http_streamer)
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
-shared_library(${PROJECT_NAME}
+if(WIN32)
+    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MT")
+    set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MTd")
+endif()
+
+static_library(${PROJECT_NAME}
     SOURCES "src/"
     THREADS
-    CONAN_MODULES ffmpeg
-    #BOOST system
+    CONAN_MODULES toml11 ffmpeg
     MODULES GSL)
 
 install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin)

modules/http_streamer/CMakeLists.txt

@@ -0,0 +1,3 @@
+#pragma once
+
+#include "../src/InputConfig.h"

modules/http_streamer/include/FFmpegInput.h

@@ -0,0 +1,3 @@
+#pragma once
+
+#include "../src/InputVideoStream.h"

modules/http_streamer/include/InputConfig.h

@@ -0,0 +1,3 @@
+#pragma once
+
+#include "../src/StreamChannel.h"

modules/http_streamer/include/InputVideoStream.h

@@ -0,0 +1,66 @@
+#include "AVMemory.h"
+#include "FFmpeg.h"
+
+namespace video_streamer
+{
+
+namespace
+{
+
+void freeAVFormatContext(AVFormatContext* formatContext)
+{
+    avformat_free_context(formatContext);
+}
+
+void freeAVCodecContext(AVCodecContext* codecContext)
+{
+    avcodec_free_context(&codecContext);
+}
+
+void freeAVPacket(AVPacket* packet)
+{
+    av_packet_unref(packet);
+    av_packet_free(&packet);
+}
+
+void freeAVFrame(AVFrame* frame)
+{
+    av_frame_unref(frame);
+    av_frame_free(&frame);
+}
+
+void freeAVBufferRef(AVBufferRef* bufferRef)
+{
+    av_buffer_unref(&bufferRef);
+}
+
+} // anonymous
+
+AVUniquePtr<AVFormatContext> makeAVFormatContext()
+{
+    return makeAVUniquePtr<AVFormatContext>(&avformat_alloc_context, &freeAVFormatContext);
+}
+
+AVUniquePtr<AVCodecContext> makeAVCodecContext(const AVCodec *codec)
+{
+    return makeAVUniquePtr<AVCodecContext>(
+        std::bind(&avcodec_alloc_context3, codec), &freeAVCodecContext);
+}
+
+AVUniquePtr<AVPacket> makeAVPacket()
+{
+    return makeAVUniquePtr<AVPacket>(&av_packet_alloc, &freeAVPacket);
+}
+
+AVUniquePtr<AVFrame> makeAVFrame()
+{
+    return makeAVUniquePtr<AVFrame>(&av_frame_alloc, &freeAVFrame);
+}
+
+AVUniquePtr<AVBufferRef> makeHWFrameCtx(AVBufferRef* bufferRef)
+{
+    return makeAVUniquePtr<AVBufferRef>(
+        std::bind(&av_hwframe_ctx_alloc, bufferRef), &freeAVBufferRef);
+}
+
+} // video_streamer

modules/http_streamer/include/StreamChannel.h

@@ -0,0 +1,33 @@
+#pragma once
+
+#include <memory>
+#include <functional>
+
+struct AVFormatContext;
+struct AVCodecContext;
+struct AVCodec;
+struct AVPacket;
+struct AVFrame;
+struct AVBufferRef;
+
+namespace video_streamer
+{
+
+template <typename T>
+using AVUniquePtr = std::unique_ptr<T, std::function<void(T*)>>;
+
+template <typename T, typename AllocateFunc, typename Deleter>
+AVUniquePtr<T> makeAVUniquePtr(AllocateFunc allocateFunc, Deleter deleter)
+{
+    AVUniquePtr<T> ptr(nullptr, deleter);
+    ptr.reset(allocateFunc());
+    return ptr;
+}
+
+AVUniquePtr<AVFormatContext> makeAVFormatContext();
+AVUniquePtr<AVCodecContext> makeAVCodecContext(const AVCodec *codec);
+AVUniquePtr<AVPacket> makeAVPacket();
+AVUniquePtr<AVFrame> makeAVFrame();
+AVUniquePtr<AVBufferRef> makeHWFrameCtx(AVBufferRef* bufferRef);
+
+} // video_streamer