From a1968b970b80d3a9bba66f6023fed6d1a7bf638d Mon Sep 17 00:00:00 2001 From: Michael Fabian 'Xaymar' Dirks Date: Sun, 14 May 2023 16:21:19 +0200 Subject: [PATCH] code: Migrate encoder::ffmpeg handlers into proper directory Shouldn't have an effect on functionality, only affects location. --- CMakeLists.txt | 42 +++++++++---------- .../{handlers => ffmpeg}/amf_h264_handler.cpp | 0 .../{handlers => ffmpeg}/amf_h264_handler.hpp | 0 .../{handlers => ffmpeg}/amf_hevc_handler.cpp | 0 .../{handlers => ffmpeg}/amf_hevc_handler.hpp | 0 .../{handlers => ffmpeg}/amf_shared.cpp | 0 .../{handlers => ffmpeg}/amf_shared.hpp | 0 .../{handlers => ffmpeg}/debug_handler.cpp | 0 .../{handlers => ffmpeg}/debug_handler.hpp | 0 .../{handlers => ffmpeg}/dnxhd_handler.cpp | 0 .../{handlers => ffmpeg}/dnxhd_handler.hpp | 0 .../encoders/{handlers => ffmpeg}/handler.cpp | 0 .../encoders/{handlers => ffmpeg}/handler.hpp | 0 .../nvenc_h264_handler.cpp | 0 .../nvenc_h264_handler.hpp | 0 .../nvenc_hevc_handler.cpp | 0 .../nvenc_hevc_handler.hpp | 0 .../{handlers => ffmpeg}/nvenc_shared.cpp | 0 .../{handlers => ffmpeg}/nvenc_shared.hpp | 0 .../prores_aw_handler.cpp | 0 .../prores_aw_handler.hpp | 0 21 files changed, 21 insertions(+), 21 deletions(-) rename source/encoders/{handlers => ffmpeg}/amf_h264_handler.cpp (100%) rename source/encoders/{handlers => ffmpeg}/amf_h264_handler.hpp (100%) rename source/encoders/{handlers => ffmpeg}/amf_hevc_handler.cpp (100%) rename source/encoders/{handlers => ffmpeg}/amf_hevc_handler.hpp (100%) rename source/encoders/{handlers => ffmpeg}/amf_shared.cpp (100%) rename source/encoders/{handlers => ffmpeg}/amf_shared.hpp (100%) rename source/encoders/{handlers => ffmpeg}/debug_handler.cpp (100%) rename source/encoders/{handlers => ffmpeg}/debug_handler.hpp (100%) rename source/encoders/{handlers => ffmpeg}/dnxhd_handler.cpp (100%) rename source/encoders/{handlers => ffmpeg}/dnxhd_handler.hpp (100%) rename source/encoders/{handlers => ffmpeg}/handler.cpp (100%) rename source/encoders/{handlers => ffmpeg}/handler.hpp (100%) rename source/encoders/{handlers => ffmpeg}/nvenc_h264_handler.cpp (100%) rename source/encoders/{handlers => ffmpeg}/nvenc_h264_handler.hpp (100%) rename source/encoders/{handlers => ffmpeg}/nvenc_hevc_handler.cpp (100%) rename source/encoders/{handlers => ffmpeg}/nvenc_hevc_handler.hpp (100%) rename source/encoders/{handlers => ffmpeg}/nvenc_shared.cpp (100%) rename source/encoders/{handlers => ffmpeg}/nvenc_shared.hpp (100%) rename source/encoders/{handlers => ffmpeg}/prores_aw_handler.cpp (100%) rename source/encoders/{handlers => ffmpeg}/prores_aw_handler.hpp (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 20ce83af..f98c937b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1146,10 +1146,10 @@ if(T_CHECK) "source/encoders/codecs/dnxhr.cpp" # Encoders/Handlers - "source/encoders/handlers/handler.hpp" - "source/encoders/handlers/handler.cpp" - "source/encoders/handlers/debug_handler.hpp" - "source/encoders/handlers/debug_handler.cpp" + "source/encoders/ffmpeg/handler.hpp" + "source/encoders/ffmpeg/handler.cpp" + "source/encoders/ffmpeg/debug_handler.hpp" + "source/encoders/ffmpeg/debug_handler.cpp" ) list(APPEND PROJECT_DEFINITIONS ENABLE_ENCODER_FFMPEG @@ -1159,12 +1159,12 @@ if(T_CHECK) is_feature_enabled(ENCODER_FFMPEG_AMF T_CHECK) if(T_CHECK) list(APPEND PROJECT_PRIVATE_SOURCE - "source/encoders/handlers/amf_shared.hpp" - "source/encoders/handlers/amf_shared.cpp" - "source/encoders/handlers/amf_h264_handler.hpp" - "source/encoders/handlers/amf_h264_handler.cpp" - "source/encoders/handlers/amf_hevc_handler.hpp" - "source/encoders/handlers/amf_hevc_handler.cpp" + "source/encoders/ffmpeg/amf_shared.hpp" + "source/encoders/ffmpeg/amf_shared.cpp" + "source/encoders/ffmpeg/amf_h264_handler.hpp" + "source/encoders/ffmpeg/amf_h264_handler.cpp" + "source/encoders/ffmpeg/amf_hevc_handler.hpp" + "source/encoders/ffmpeg/amf_hevc_handler.cpp" ) list(APPEND PROJECT_DEFINITIONS ENABLE_ENCODER_FFMPEG_AMF @@ -1175,12 +1175,12 @@ if(T_CHECK) is_feature_enabled(ENCODER_FFMPEG_NVENC T_CHECK) if(T_CHECK) list(APPEND PROJECT_PRIVATE_SOURCE - "source/encoders/handlers/nvenc_shared.hpp" - "source/encoders/handlers/nvenc_shared.cpp" - "source/encoders/handlers/nvenc_h264_handler.hpp" - "source/encoders/handlers/nvenc_h264_handler.cpp" - "source/encoders/handlers/nvenc_hevc_handler.hpp" - "source/encoders/handlers/nvenc_hevc_handler.cpp" + "source/encoders/ffmpeg/nvenc_shared.hpp" + "source/encoders/ffmpeg/nvenc_shared.cpp" + "source/encoders/ffmpeg/nvenc_h264_handler.hpp" + "source/encoders/ffmpeg/nvenc_h264_handler.cpp" + "source/encoders/ffmpeg/nvenc_hevc_handler.hpp" + "source/encoders/ffmpeg/nvenc_hevc_handler.cpp" ) list(APPEND PROJECT_DEFINITIONS ENABLE_ENCODER_FFMPEG_NVENC @@ -1191,8 +1191,8 @@ if(T_CHECK) is_feature_enabled(ENCODER_FFMPEG_PRORES T_CHECK) if(T_CHECK) list(APPEND PROJECT_PRIVATE_SOURCE - "source/encoders/handlers/prores_aw_handler.hpp" - "source/encoders/handlers/prores_aw_handler.cpp" + "source/encoders/ffmpeg/prores_aw_handler.hpp" + "source/encoders/ffmpeg/prores_aw_handler.cpp" ) list(APPEND PROJECT_DEFINITIONS ENABLE_ENCODER_FFMPEG_PRORES @@ -1203,11 +1203,11 @@ if(T_CHECK) is_feature_enabled(ENCODER_FFMPEG_DNXHR T_CHECK) if(T_CHECK) list(APPEND PROJECT_PRIVATE_SOURCE - "source/encoders/handlers/dnxhd_handler.hpp" - "source/encoders/handlers/dnxhd_handler.cpp" + "source/encoders/ffmpeg/dnxhd_handler.hpp" + "source/encoders/ffmpeg/dnxhd_handler.cpp" ) list(APPEND PROJECT_DEFINITIONS - ENABLE_ENCODER_FFMPEG_DNXHR + ENABLE_ENCODER_FFMPEG_DNXHR ) endif() endif() diff --git a/source/encoders/handlers/amf_h264_handler.cpp b/source/encoders/ffmpeg/amf_h264_handler.cpp similarity index 100% rename from source/encoders/handlers/amf_h264_handler.cpp rename to source/encoders/ffmpeg/amf_h264_handler.cpp diff --git a/source/encoders/handlers/amf_h264_handler.hpp b/source/encoders/ffmpeg/amf_h264_handler.hpp similarity index 100% rename from source/encoders/handlers/amf_h264_handler.hpp rename to source/encoders/ffmpeg/amf_h264_handler.hpp diff --git a/source/encoders/handlers/amf_hevc_handler.cpp b/source/encoders/ffmpeg/amf_hevc_handler.cpp similarity index 100% rename from source/encoders/handlers/amf_hevc_handler.cpp rename to source/encoders/ffmpeg/amf_hevc_handler.cpp diff --git a/source/encoders/handlers/amf_hevc_handler.hpp b/source/encoders/ffmpeg/amf_hevc_handler.hpp similarity index 100% rename from source/encoders/handlers/amf_hevc_handler.hpp rename to source/encoders/ffmpeg/amf_hevc_handler.hpp diff --git a/source/encoders/handlers/amf_shared.cpp b/source/encoders/ffmpeg/amf_shared.cpp similarity index 100% rename from source/encoders/handlers/amf_shared.cpp rename to source/encoders/ffmpeg/amf_shared.cpp diff --git a/source/encoders/handlers/amf_shared.hpp b/source/encoders/ffmpeg/amf_shared.hpp similarity index 100% rename from source/encoders/handlers/amf_shared.hpp rename to source/encoders/ffmpeg/amf_shared.hpp diff --git a/source/encoders/handlers/debug_handler.cpp b/source/encoders/ffmpeg/debug_handler.cpp similarity index 100% rename from source/encoders/handlers/debug_handler.cpp rename to source/encoders/ffmpeg/debug_handler.cpp diff --git a/source/encoders/handlers/debug_handler.hpp b/source/encoders/ffmpeg/debug_handler.hpp similarity index 100% rename from source/encoders/handlers/debug_handler.hpp rename to source/encoders/ffmpeg/debug_handler.hpp diff --git a/source/encoders/handlers/dnxhd_handler.cpp b/source/encoders/ffmpeg/dnxhd_handler.cpp similarity index 100% rename from source/encoders/handlers/dnxhd_handler.cpp rename to source/encoders/ffmpeg/dnxhd_handler.cpp diff --git a/source/encoders/handlers/dnxhd_handler.hpp b/source/encoders/ffmpeg/dnxhd_handler.hpp similarity index 100% rename from source/encoders/handlers/dnxhd_handler.hpp rename to source/encoders/ffmpeg/dnxhd_handler.hpp diff --git a/source/encoders/handlers/handler.cpp b/source/encoders/ffmpeg/handler.cpp similarity index 100% rename from source/encoders/handlers/handler.cpp rename to source/encoders/ffmpeg/handler.cpp diff --git a/source/encoders/handlers/handler.hpp b/source/encoders/ffmpeg/handler.hpp similarity index 100% rename from source/encoders/handlers/handler.hpp rename to source/encoders/ffmpeg/handler.hpp diff --git a/source/encoders/handlers/nvenc_h264_handler.cpp b/source/encoders/ffmpeg/nvenc_h264_handler.cpp similarity index 100% rename from source/encoders/handlers/nvenc_h264_handler.cpp rename to source/encoders/ffmpeg/nvenc_h264_handler.cpp diff --git a/source/encoders/handlers/nvenc_h264_handler.hpp b/source/encoders/ffmpeg/nvenc_h264_handler.hpp similarity index 100% rename from source/encoders/handlers/nvenc_h264_handler.hpp rename to source/encoders/ffmpeg/nvenc_h264_handler.hpp diff --git a/source/encoders/handlers/nvenc_hevc_handler.cpp b/source/encoders/ffmpeg/nvenc_hevc_handler.cpp similarity index 100% rename from source/encoders/handlers/nvenc_hevc_handler.cpp rename to source/encoders/ffmpeg/nvenc_hevc_handler.cpp diff --git a/source/encoders/handlers/nvenc_hevc_handler.hpp b/source/encoders/ffmpeg/nvenc_hevc_handler.hpp similarity index 100% rename from source/encoders/handlers/nvenc_hevc_handler.hpp rename to source/encoders/ffmpeg/nvenc_hevc_handler.hpp diff --git a/source/encoders/handlers/nvenc_shared.cpp b/source/encoders/ffmpeg/nvenc_shared.cpp similarity index 100% rename from source/encoders/handlers/nvenc_shared.cpp rename to source/encoders/ffmpeg/nvenc_shared.cpp diff --git a/source/encoders/handlers/nvenc_shared.hpp b/source/encoders/ffmpeg/nvenc_shared.hpp similarity index 100% rename from source/encoders/handlers/nvenc_shared.hpp rename to source/encoders/ffmpeg/nvenc_shared.hpp diff --git a/source/encoders/handlers/prores_aw_handler.cpp b/source/encoders/ffmpeg/prores_aw_handler.cpp similarity index 100% rename from source/encoders/handlers/prores_aw_handler.cpp rename to source/encoders/ffmpeg/prores_aw_handler.cpp diff --git a/source/encoders/handlers/prores_aw_handler.hpp b/source/encoders/ffmpeg/prores_aw_handler.hpp similarity index 100% rename from source/encoders/handlers/prores_aw_handler.hpp rename to source/encoders/ffmpeg/prores_aw_handler.hpp