Merge branch 'v3c'

ultravideo · Jan 12, 2024 · 985b290 · 985b290
2 parents 28a270b + 9ce1c2a
commit 985b290
Show file tree

Hide file tree

Showing 25 changed files with 1,559 additions and 81 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -82,6 +82,7 @@ target_sources(${PROJECT_NAME} PRIVATE
         src/formats/h264.cc
         src/formats/h265.cc
         src/formats/h266.cc
+        src/formats/v3c.cc
 
         src/zrtp/zrtp_receiver.cc
         src/zrtp/hello.cc
@@ -130,6 +131,7 @@ target_sources(${PROJECT_NAME} PRIVATE
         src/formats/h265.hh
         src/formats/h266.hh
         src/formats/media.hh
+        src/formats/v3c.hh
 
         src/srtp/base.hh
         src/srtp/srtcp.hh

diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
@@ -13,6 +13,8 @@ add_executable(srtp_zrtp)        # SRTP + ZRTP example
 add_executable(zrtp_multistream) # ZRTP Multistream example
 add_executable(sync_sender)      # Syncing streams example, sender
 add_executable(sync_receiver)    # Syncing streams example, receiver
+add_executable(v3c_receiver)
+add_executable(v3c_sender)
 
 # Sources
 target_sources(binding           PRIVATE binding.cc)
@@ -28,6 +30,12 @@ target_sources(srtp_zrtp         PRIVATE srtp_zrtp.cc)
 target_sources(zrtp_multistream  PRIVATE zrtp_multistream.cc)
 target_sources(sync_sender       PRIVATE sync_sender.cc)
 target_sources(sync_receiver     PRIVATE sync_receiver.cc)
+target_sources(v3c_receiver      PRIVATE v3c_receiver.cc v3c/v3c_util.cc v3c/v3c_util.hh)
+target_sources(v3c_sender        PRIVATE v3c_sender.cc v3c/v3c_util.cc v3c/v3c_util.hh)
+
+# V3C Utility files
+target_include_directories(v3c_receiver PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} v3c)
+target_include_directories(v3c_sender PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} v3c)
 
 # set crypto++ to be linked in examples if available
 if (NOT UVGRTP_DISABLE_CRYPTO AND CRYPTOPP_FOUND)
@@ -52,4 +60,6 @@ target_link_libraries(srtp_user         PRIVATE uvgrtp ${CRYPTOPP_LIB_NAME})
 target_link_libraries(srtp_zrtp         PRIVATE uvgrtp ${CRYPTOPP_LIB_NAME})
 target_link_libraries(zrtp_multistream  PRIVATE uvgrtp ${CRYPTOPP_LIB_NAME})
 target_link_libraries(sync_sender       PRIVATE uvgrtp ${CRYPTOPP_LIB_NAME})
-target_link_libraries(sync_receiver     PRIVATE uvgrtp ${CRYPTOPP_LIB_NAME})
+target_link_libraries(sync_receiver     PRIVATE uvgrtp ${CRYPTOPP_LIB_NAME})
+target_link_libraries(v3c_receiver  PRIVATE uvgrtp ${CRYPTOPP_LIB_NAME})
+target_link_libraries(v3c_sender    PRIVATE uvgrtp ${CRYPTOPP_LIB_NAME})