Add FFmpeg interface

This feature is experimental and not fully validated.
Use at your own risk, behavior may change or be removed in future
revisions.

Author: gugautie

.gitignore

@@ -2,3 +2,4 @@ build
 _*
 docs
 sdp
+.clangd-trace

.gitlab-ci.yml

@@ -50,6 +50,19 @@ build-v3crtp:
       - _build/CI/src/app/uvgVPCCenc
     expire_in: 1 week
 
+# Test building uvgVPCCenc with v3c rtp integration
+build-ffmpeg:
+  stage: build
+  script:
+    - apt-get update && apt-get install -y ffmpeg libavcodec-dev libavformat-dev libavutil-dev
+    - export PATH="${HOME}/bin:${PATH}"
+    - cmake --preset=CI -DENABLE_FFMPEG=ON
+    - cmake --build --preset=CI
+  artifacts:
+    paths:
+      - _build/CI/src/app/uvgVPCCenc
+    expire_in: 1 week
+
 # Test long default
 test-long-default:
   stage: test-default

CMakeLists.txt

@@ -18,6 +18,11 @@ option(BUILD_SHARED_LIBS "Build using shared uvgVPCCenc library" ON)
 
 # Control if uvgVPCCenc should be build with RTP support
 option(ENABLE_V3CRTP "Enable RTP support" OFF)
+option(ENABLE_FFMPEG "Link ffmpeg library" OFF)
+
+if(ENABLE_FFMPEG)
+    add_compile_definitions(LINK_FFMPEG)
+endif()
 
 project(uvgVPCCenc
   VERSION ${uvgVPCCenc_VER}

src/lib/bitstreamGeneration/vps.cpp

@@ -42,9 +42,12 @@
 #include "uvgvpcc/uvgvpcc.hpp"
 
 vps::vps(const uvgvpcc_enc::Parameters& paramUVG, const std::shared_ptr<uvgvpcc_enc::GOF>& gofUVG) {
-    if (paramUVG.occupancyEncoderName=="Kvazaar" &&paramUVG.geometryEncoderName=="Kvazaar" &&paramUVG.attributeEncoderName=="Kvazaar" /*|| paramUVG.useEncoderCommand*/) {
+    if (paramUVG.occupancyEncoderName=="Kvazaar" && paramUVG.geometryEncoderName=="Kvazaar" && paramUVG.attributeEncoderName=="Kvazaar" /*|| paramUVG.useEncoderCommand*/) {
         codec_group_ = 1;  // TMC2 : CODEC_GROUP_HEVC_MAIN10
-    
+    #if LINK_FFMPEG
+    } else if (paramUVG.occupancyEncoderName=="FFmpeg" || paramUVG.geometryEncoderName=="FFmpeg" || paramUVG.attributeEncoderName=="FFmpeg") {
+        codec_group_ = 1;  // TMC2 : CODEC_GROUP_HEVC_MAIN10
+    #endif
     /**} else if (paramUVG.occupancyEncoderName=="uvg266" &&paramUVG.geometryEncoderName=="uvg266" &&paramUVG.attributeEncoderName=="uvg266") {
         codec_group_ = 3;  // TMC2 : CODEC_GROUP_VVC_MAIN10
     **/

src/lib/mapEncoding/CMakeLists.txt

@@ -22,6 +22,44 @@ else()
     message(FATAL_ERROR "Could not find stdio.h")
 endif()
 
+
+add_library(catchLibLogLibrary STATIC
+    catchLibLog.cpp
+)
+
+set(CMAKE_CXX_CLANG_TIDY "${CLANG_TIDY_DEFAULT}")
+
+# Set the default build libraries
+set(LIB_SOURCES "mapEncoding.cpp" "catchLibLog.cpp" "encoderKvazaar.cpp")
+
+if(ENABLE_FFMPEG)
+    # check if ffmpeg is available if available include encoderFFmpeg.cpp
+    find_package(PkgConfig QUIET)
+    if(PKG_CONFIG_FOUND)
+        pkg_check_modules(FFMPEG REQUIRED IMPORTED_TARGET 
+            libavcodec
+            libavformat
+            libavutil
+        )
+        message(STATUS "FFmpeg found: ${FFMPEG_VERSION}")
+        set(LIB_SOURCES ${LIB_SOURCES} encoderFFmpeg.cpp)
+        set(FFMPEG_LIBS PkgConfig::FFMPEG)
+    else()
+        message(WARNING "FFmpeg not found, skipping encoderFFmpeg")
+        set(FFMPEG_LIBS "")
+    endif()
+endif()
+
+# Define the library
+add_library(mapEncodingLibrary STATIC
+    ${LIB_SOURCES}
+)
+
+if(FFMPEG_LIBS)
+    target_link_libraries(mapEncodingLibrary PUBLIC ${FFMPEG_LIBS})
+endif()
+
+
 set(STDIO_PREFIX "kvazaar")
 set(KVAZAAR_STDIO_LIB ${STDIO_PREFIX}_stdio)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/uvg_stdio.h.in ${CMAKE_CURRENT_BINARY_DIR}/include/${STDIO_PREFIX}_stdio.h @ONLY)
@@ -60,20 +98,9 @@ ExternalProject_Add(
 )
 add_dependencies(kvazaar ${KVAZAAR_STDIO_LIB})
 
-# Define the library
-add_library(catchLibLogLibrary STATIC
-    catchLibLog.cpp
-)
 
 set(CMAKE_CXX_CLANG_TIDY "${CLANG_TIDY_DEFAULT}")
 
-# Define the library
-add_library(mapEncodingLibrary STATIC
-    encoderKvazaar.cpp
-    mapEncoding.cpp
-    catchLibLog.cpp
-)
-
 # Include directories for headers
 target_include_directories(mapEncodingLibrary PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/include)