qiurui
/
uvgrtp-base
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v3c: Move V3C utility files to examples folder

This commit is contained in:
Heikki Tampio 2023-08-23 12:55:43 +03:00
parent d681961c4c
commit 5c146a329e
7 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -99,7 +99,6 @@ target_sources(${PROJECT_NAME} PRIVATE
src/wrapper_c.cc src/wrapper_c.cc
src/socketfactory.cc src/socketfactory.cc
src/rtcp_reader.cc src/rtcp_reader.cc
src/v3c_parser.cc
) )
source_group(src/srtp src/srtp/.*) source_group(src/srtp src/srtp/.*)
@ -153,7 +152,6 @@ target_sources(${PROJECT_NAME} PRIVATE
src/srtp/srtcp.hh src/srtp/srtcp.hh
src/socketfactory.hh src/socketfactory.hh
src/rtcp_reader.hh src/rtcp_reader.hh
include/uvgrtp/v3c_parser.hh
include/uvgrtp/util.hh include/uvgrtp/util.hh
include/uvgrtp/clock.hh include/uvgrtp/clock.hh

12
examples/CMakeLists.txt
View File

@ -30,8 +30,12 @@ target_sources(srtp_zrtp PRIVATE srtp_zrtp.cc)
target_sources(zrtp_multistream PRIVATE zrtp_multistream.cc) target_sources(zrtp_multistream PRIVATE zrtp_multistream.cc)
target_sources(sync_sender PRIVATE sync_sender.cc) target_sources(sync_sender PRIVATE sync_sender.cc)
target_sources(sync_receiver PRIVATE sync_receiver.cc) target_sources(sync_receiver PRIVATE sync_receiver.cc)
target_sources(v3c_receiver PRIVATE v3c_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) 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 # set crypto++ to be linked in examples if available
if (NOT UVGRTP_DISABLE_CRYPTO AND CRYPTOPP_FOUND) if (NOT UVGRTP_DISABLE_CRYPTO AND CRYPTOPP_FOUND)
@ -57,5 +61,5 @@ target_link_libraries(srtp_zrtp PRIVATE uvgrtp ${CRYPTOPP_LIB_NAME})
target_link_libraries(zrtp_multistream 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_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_receiver PRIVATE uvgrtp ${CRYPTOPP_LIB_NAME})
target_link_libraries(v3c_sender PRIVATE uvgrtp ${CRYPTOPP_LIB_NAME}) target_link_libraries(v3c_sender PRIVATE uvgrtp ${CRYPTOPP_LIB_NAME})

2
src/v3c_parser.cc → examples/v3c/v3c_util.cc
View File

@ -1,4 +1,4 @@
#include "uvgrtp/v3c_parser.hh" #include "v3c/v3c_util.hh"
uint32_t combineBytes(uint8_t byte1, uint8_t byte2, uint8_t byte3, uint8_t byte4) { uint32_t combineBytes(uint8_t byte1, uint8_t byte2, uint8_t byte3, uint8_t byte4) {
return (static_cast<uint32_t>(byte1) << 24) | return (static_cast<uint32_t>(byte1) << 24) |

0
include/uvgrtp/v3c_parser.hh → examples/v3c/v3c_util.hh
View File

1
examples/v3c_receiver.cc
View File

@ -1,4 +1,5 @@
#include <uvgrtp/lib.hh> #include <uvgrtp/lib.hh>
#include "v3c/v3c_util.hh"
#include <thread> #include <thread>
#include <iostream> #include <iostream>

1
examples/v3c_sender.cc
View File

@ -1,4 +1,5 @@
#include <uvgrtp/lib.hh> #include <uvgrtp/lib.hh>
#include "v3c/v3c_util.hh"
#include <iostream> #include <iostream>
#include <fstream> #include <fstream>

1
include/uvgrtp/lib.hh
View File

@ -13,4 +13,3 @@
#include "frame.hh" // frame related functions #include "frame.hh" // frame related functions
#include "util.hh" // types #include "util.hh" // types
#include "version.hh" // version #include "version.hh" // version
#include "v3c_parser.hh" // v3c parser