diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..dc07671 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,7 @@ +[submodule "3rdparty/cpp-httplib"] + path = 3rdparty/cpp-httplib + url = https://github.com/bondagit/cpp-httplib.git +[submodule "3rdparty/ravenna-alsa-lkm"] + path = 3rdparty/ravenna-alsa-lkm + url = https://github.com/bondagit/ravenna-alsa-lkm.git + branch = aes67-daemon diff --git a/3rdparty/.gitignore b/3rdparty/.gitignore index a31ccab..e69de29 100644 --- a/3rdparty/.gitignore +++ b/3rdparty/.gitignore @@ -1,3 +0,0 @@ -/ravenna-alsa-lkm -/cpp-httplib - diff --git a/3rdparty/cpp-httplib b/3rdparty/cpp-httplib new file mode 160000 index 0000000..07c6e58 --- /dev/null +++ b/3rdparty/cpp-httplib @@ -0,0 +1 @@ +Subproject commit 07c6e58951931f8c74de8291ff35a3298fe481c4 diff --git a/3rdparty/ravenna-alsa-lkm b/3rdparty/ravenna-alsa-lkm new file mode 160000 index 0000000..9897287 --- /dev/null +++ b/3rdparty/ravenna-alsa-lkm @@ -0,0 +1 @@ +Subproject commit 989728785990592cd3544e54d767beab97366fc6 diff --git a/build.sh b/build.sh index cbd4ead..b33954b 100755 --- a/build.sh +++ b/build.sh @@ -9,21 +9,12 @@ export CXX=/usr/bin/clang++ TOPDIR=$(pwd) -cd 3rdparty -if [ ! -d ravenna-alsa-lkm ]; then - git clone --single-branch --branch aes67-daemon https://github.com/bondagit/ravenna-alsa-lkm.git - cd ravenna-alsa-lkm/driver - make - cd ../.. -fi +echo "Init git submodules ..." +git submodule update --init --recursive -if [ ! -d cpp-httplib ]; then - git clone https://github.com/bondagit/cpp-httplib.git - cd cpp-httplib - git checkout 42f9f9107f87ad2ee04be117dbbadd621c449552 - cd .. -fi -cd .. +cd 3rdparty/ravenna-alsa-lkm/driver +make +cd - cd webui echo "Downloading current webui release ..." @@ -47,6 +38,7 @@ cmake \ -DWITH_AVAHI=ON \ -DFAKE_DRIVER=OFF \ -DWITH_SYSTEMD=ON \ + -DWITH_STREAMER=ON \ . make cd .. diff --git a/buildfake.sh b/buildfake.sh index 2c9b325..28d5573 100755 --- a/buildfake.sh +++ b/buildfake.sh @@ -10,19 +10,7 @@ export CXX=/usr/bin/clang++ TOPDIR=$(pwd) git config --global http.sslverify false - -cd 3rdparty -if [ ! -d ravenna-alsa-lkm ]; then - git clone --single-branch --branch aes67-daemon https://github.com/bondagit/ravenna-alsa-lkm.git -fi - -if [ ! -d cpp-httplib ]; then - git clone https://github.com/bondagit/cpp-httplib.git - cd cpp-httplib - git checkout 42f9f9107f87ad2ee04be117dbbadd621c449552 - cd .. -fi -cd .. +git submodule update --init --recursive cd daemon echo "Building aes67-daemon ..." @@ -32,6 +20,7 @@ cmake \ -DENABLE_TESTS=ON \ -DWITH_AVAHI=OFF \ -DFAKE_DRIVER=ON \ + -DWITH_STREAMER=OFF \ . make cd .. diff --git a/daemon/CMakeLists.txt b/daemon/CMakeLists.txt index 38a0a83..b7a8b6e 100644 --- a/daemon/CMakeLists.txt +++ b/daemon/CMakeLists.txt @@ -12,6 +12,7 @@ option(FAKE_DRIVER "Use fake driver instead of RAVENNA" OFF) set(CMAKE_CXX_STANDARD 17) option(WITH_SYSTEMD "Include systemd notify and watchdog support" OFF) +option(WITH_STREAMER "Enable streamer support" ON) # ravena lkm _should_ be provided by the CLI. Nonetheless, we should be able # to find it in system dirs too... @@ -24,9 +25,6 @@ if (NOT CPP_HTTPLIB_DIR) find_path( CPP_HTTPLIB_DIR "httplib.h" REQUIRED) endif() -find_library(ALSA_LIBRARY NAMES asound) -find_library(AAC_LIBRARY NAMES faac) - find_library(AVAHI_LIBRARY-COMMON NAMES avahi-common) find_library(AVAHI_LIBRARY-CLIENT NAMES avahi-client) find_path(AVAHI_INCLUDE_DIR avahi-client/publish.h) @@ -37,7 +35,13 @@ find_package(Boost COMPONENTS system thread log program_options REQUIRED) include_directories(aes67-daemon ${RAVENNA_ALSA_LKM_DIR}/common ${RAVENNA_ALSA_LKM_DIR}/driver ${CPP_HTTPLIB_DIR} ${Boost_INCLUDE_DIR}) add_definitions( -DBOOST_LOG_DYN_LINK -DBOOST_LOG_USE_NATIVE_SYSLOG ) add_compile_options( -Wall ) -set(SOURCES error_code.cpp json.cpp main.cpp session_manager.cpp http_server.cpp config.cpp interface.cpp log.cpp sap.cpp browser.cpp rtsp_client.cpp mdns_client.cpp mdns_server.cpp rtsp_server.cpp utils.cpp streamer.cpp) +set(SOURCES error_code.cpp json.cpp main.cpp session_manager.cpp http_server.cpp config.cpp interface.cpp log.cpp sap.cpp browser.cpp rtsp_client.cpp mdns_client.cpp mdns_server.cpp rtsp_server.cpp utils.cpp) + +if(WITH_STREAMER) + MESSAGE(STATUS "WITH_STREAMER") + add_definitions(-D_USE_STREAMER_) + list(APPEND SOURCES streamer.cpp) +endif() if(FAKE_DRIVER) MESSAGE(STATUS "FAKE_DRIVER") @@ -52,7 +56,7 @@ if(ENABLE_TESTS) add_subdirectory(tests) endif() -target_link_libraries(aes67-daemon ${Boost_LIBRARIES} ${ALSA_LIBRARY} ${AAC_LIBRARY}) +target_link_libraries(aes67-daemon ${Boost_LIBRARIES}) if(WITH_AVAHI) MESSAGE(STATUS "WITH_AVAHI") add_definitions(-D_USE_AVAHI_) @@ -65,3 +69,9 @@ if(WITH_SYSTEMD) add_definitions(-D_USE_SYSTEMD_) target_link_libraries(aes67-daemon systemd) endif() + +if(WITH_STREAMER) + find_library(ALSA_LIBRARY NAMES asound) + find_library(AAC_LIBRARY NAMES faac) + target_link_libraries(aes67-daemon ${ALSA_LIBRARY} ${AAC_LIBRARY}) +endif() diff --git a/daemon/config.cpp b/daemon/config.cpp index 08bd7c5..634fa49 100644 --- a/daemon/config.cpp +++ b/daemon/config.cpp @@ -17,6 +17,8 @@ // along with this program. If not, see . // +#define BOOST_BIND_GLOBAL_PLACEHOLDERS + #include #include #include @@ -72,7 +74,8 @@ std::shared_ptr Config::parse(const std::string& filename, config.streamer_file_duration_ = 1; if (config.streamer_files_num_ < 4 || config.streamer_files_num_ > 16) config.streamer_files_num_ = 8; - if (config.streamer_player_buffer_files_num_ < 1 || config.streamer_player_buffer_files_num_ > 2) + if (config.streamer_player_buffer_files_num_ < 1 || + config.streamer_player_buffer_files_num_ > 2) config.streamer_player_buffer_files_num_ = 1; boost::system::error_code ec; @@ -169,3 +172,17 @@ std::string Config::get_node_id() const { return custom_node_id_; } } + +bool Config::get_streamer_enabled() const { +#ifndef _USE_STREAMER_ + return false; +#endif + return streamer_enabled_; +} + +bool Config::get_mdns_enabled() const { +#ifndef _USE_AVAHI_ + return false; +#endif + return mdns_enabled_; +} diff --git a/daemon/config.hpp b/daemon/config.hpp index 90a56e8..05879cd 100644 --- a/daemon/config.hpp +++ b/daemon/config.hpp @@ -45,7 +45,7 @@ class Config { return streamer_player_buffer_files_num_; }; uint8_t get_streamer_channels() const { return streamer_channels_; }; - bool get_streamer_enabled() const { return streamer_enabled_; }; + bool get_streamer_enabled() const; int get_log_severity() const { return log_severity_; }; uint32_t get_playout_delay() const { return playout_delay_; }; uint32_t get_tic_frame_size_at_1fs() const { return tic_frame_size_at_1fs_; }; @@ -73,7 +73,7 @@ class Config { const std::string& get_ip_addr_str() const { return ip_str_; }; bool get_daemon_restart() const { return daemon_restart_; }; bool get_driver_restart() const { return driver_restart_; }; - bool get_mdns_enabled() const { return mdns_enabled_; }; + bool get_mdns_enabled() const; int get_interface_idx() const { return interface_idx_; }; const std::string& get_ptp_status_script() const { return ptp_status_script_; diff --git a/daemon/http_server.cpp b/daemon/http_server.cpp index e3f67bd..4ce4bf5 100644 --- a/daemon/http_server.cpp +++ b/daemon/http_server.cpp @@ -17,6 +17,8 @@ // along with this program. If not, see . // +#define BOOST_BIND_GLOBAL_PLACEHOLDERS + #include #include #include @@ -323,6 +325,7 @@ bool HttpServer::init() { }); /* retrieve streamer info and position */ +#ifdef _USE_STREAMER_ svr_.Get("/api/streamer/info/([0-9]+)", [this](const Request& req, Response& res) { uint32_t id; @@ -377,10 +380,12 @@ bool HttpServer::init() { set_headers(res, "application/json"); res.body = streamer_info_to_json(info); }); +#endif /* retrieve streamer file */ svr_.Get("/api/streamer/stream/([0-9]+)/([0-9]+)", [this](const Request& req, Response& res) { +#ifdef _USE_STREAMER_ if (!config_->get_streamer_enabled()) { set_error(400, "streamer not enabled", res); return; @@ -411,6 +416,9 @@ bool HttpServer::init() { res.set_header("X-File-Count", std::to_string(fileCount)); res.set_header("X-File-Current-Id", std::to_string(currentFileId)); res.set_header("X-File-Start-Id", std::to_string(startFileId)); +#else + set_error(400, "streamer support not compiled-in", res); +#endif }); svr_.set_logger([](const Request& req, const Response& res) { diff --git a/daemon/http_server.hpp b/daemon/http_server.hpp index 65a6667..41a25b4 100644 --- a/daemon/http_server.hpp +++ b/daemon/http_server.hpp @@ -25,18 +25,25 @@ #include "browser.hpp" #include "config.hpp" #include "session_manager.hpp" + +#ifdef _USE_STREAMER_ #include "streamer.hpp" +#endif class HttpServer { public: HttpServer() = delete; explicit HttpServer(std::shared_ptr session_manager, std::shared_ptr browser, +#ifdef _USE_STREAMER_ std::shared_ptr streamer, +#endif std::shared_ptr config) : session_manager_(session_manager), browser_(browser), +#ifdef _USE_STREAMER_ streamer_(streamer), +#endif config_(config){}; bool init(); bool terminate(); @@ -44,7 +51,9 @@ class HttpServer { private: std::shared_ptr session_manager_; std::shared_ptr browser_; +#ifdef _USE_STREAMER_ std::shared_ptr streamer_; +#endif std::shared_ptr config_; httplib::Server svr_; std::future res_; diff --git a/daemon/json.cpp b/daemon/json.cpp index 27cd0ec..2a7c680 100644 --- a/daemon/json.cpp +++ b/daemon/json.cpp @@ -17,6 +17,8 @@ // along with this program. If not, see . // +#define BOOST_BIND_GLOBAL_PLACEHOLDERS + #include #include #include @@ -290,13 +292,15 @@ std::string remote_sources_to_json(const std::list& sources) { return ss.str(); } +#ifdef _USE_STREAMER_ std::string streamer_info_to_json(const StreamerInfo& info) { std::stringstream ss; ss << "{" << "\n \"status\": " << unsigned(info.status) << ",\n \"file_duration\": " << unsigned(info.file_duration) << ",\n \"files_num\": " << unsigned(info.files_num) - << ",\n \"player_buffer_files_num\": " << unsigned(info.player_buffer_files_num) + << ",\n \"player_buffer_files_num\": " + << unsigned(info.player_buffer_files_num) << ",\n \"start_file_id\": " << unsigned(info.start_file_id) << ",\n \"current_file_id\": " << unsigned(info.current_file_id) << ",\n \"channels\": " << unsigned(info.channels) @@ -304,6 +308,7 @@ std::string streamer_info_to_json(const StreamerInfo& info) { << ",\n \"rate\": " << unsigned(info.rate) << "\n}\n"; return ss.str(); } +#endif Config json_to_config_(std::istream& js, Config& config) { try { diff --git a/daemon/json.hpp b/daemon/json.hpp index 1dd8b04..2804bd3 100644 --- a/daemon/json.hpp +++ b/daemon/json.hpp @@ -24,7 +24,10 @@ #include "browser.hpp" #include "session_manager.hpp" + +#ifdef _USE_STREAMER_ #include "streamer.hpp" +#endif /* JSON serializers */ std::string config_to_json(const Config& config); @@ -39,7 +42,9 @@ std::string streams_to_json(const std::list& sources, const std::list& sinks); std::string remote_source_to_json(const RemoteSource& source); std::string remote_sources_to_json(const std::list& sources); +#ifdef _USE_STREAMER_ std::string streamer_info_to_json(const StreamerInfo& info); +#endif /* JSON deserializers */ Config json_to_config(std::istream& jstream, const Config& curCconfig); diff --git a/daemon/main.cpp b/daemon/main.cpp index e307fd0..bfaec6b 100644 --- a/daemon/main.cpp +++ b/daemon/main.cpp @@ -30,7 +30,10 @@ #include "mdns_server.hpp" #include "rtsp_server.hpp" #include "session_manager.hpp" + +#ifdef _USE_STREAMER_ #include "streamer.hpp" +#endif #ifdef _USE_SYSTEMD_ #include @@ -40,7 +43,7 @@ namespace po = boost::program_options; namespace postyle = boost::program_options::command_line_style; namespace logging = boost::log; -static const std::string version("bondagit-2.0.1"); +static const std::string version("bondagit-2.0.2"); static std::atomic terminate = false; void termination_handler(int signum) { @@ -181,6 +184,7 @@ int main(int argc, char* argv[]) { } /* start streamer */ +#ifdef _USE_STREAMER_ auto streamer = Streamer::create(session_manager, config); if (config->get_streamer_enabled() && (streamer == nullptr || !streamer->init())) { @@ -189,6 +193,9 @@ int main(int argc, char* argv[]) { /* start http server */ HttpServer http_server(session_manager, browser, streamer, config); +#else + HttpServer http_server(session_manager, browser, config); +#endif if (!http_server.init()) { throw std::runtime_error(std::string("HttpServer:: init failed")); } @@ -247,11 +254,13 @@ int main(int argc, char* argv[]) { } /* stop streamer */ +#ifdef _USE_STREAMER_ if (config->get_streamer_enabled()) { if (!streamer->terminate()) { throw std::runtime_error(std::string("Streamer:: terminate failed")); } } +#endif /* stop rtsp server */ if (!rtsp_server.terminate()) { diff --git a/daemon/netlink_client.hpp b/daemon/netlink_client.hpp index f8ce5e8..95e00cf 100644 --- a/daemon/netlink_client.hpp +++ b/daemon/netlink_client.hpp @@ -23,13 +23,14 @@ #include #include #include -#include +#include #include #include #include #include "netlink.hpp" +using namespace boost::placeholders; using boost::asio::deadline_timer; class NetlinkClient { diff --git a/daemon/sap.cpp b/daemon/sap.cpp index 03232d7..cb7e3ae 100644 --- a/daemon/sap.cpp +++ b/daemon/sap.cpp @@ -17,10 +17,11 @@ // along with this program. If not, see . // -#include +#include #include "sap.hpp" +using namespace boost::placeholders; using namespace boost::asio; using namespace boost::asio::ip; diff --git a/daemon/session_manager.cpp b/daemon/session_manager.cpp index 27bfc25..c997b2e 100644 --- a/daemon/session_manager.cpp +++ b/daemon/session_manager.cpp @@ -18,6 +18,7 @@ // #define CPPHTTPLIB_PAYLOAD_MAX_LENGTH 4096 // max for SDP file +#define BOOST_BIND_GLOBAL_PLACEHOLDERS #include #include @@ -463,7 +464,7 @@ void SessionManager::add_source_observer(SourceObserverType type, } void SessionManager::add_sink_observer(SinkObserverType type, - const SinkObserver& cb) { + const SinkObserver& cb) { switch (type) { case SinkObserverType::add_sink: add_sink_observers_.push_back(cb); diff --git a/daemon/tests/daemon_test.cpp b/daemon/tests/daemon_test.cpp index 0dc994d..6c6db84 100644 --- a/daemon/tests/daemon_test.cpp +++ b/daemon/tests/daemon_test.cpp @@ -17,6 +17,8 @@ // #define CPPHTTPLIB_PAYLOAD_MAX_LENGTH 4096 // max for SDP file +#define BOOST_BIND_GLOBAL_PLACEHOLDERS + #include #include #include @@ -404,7 +406,8 @@ BOOST_AUTO_TEST_CASE(get_config) { auto streamer_channels = pt.get("streamer_channels"); auto streamer_files_num = pt.get("streamer_files_num"); auto streamer_file_duration = pt.get("streamer_file_duration"); - auto streamer_player_buffer_files_num = pt.get("streamer_player_buffer_files_num"); + auto streamer_player_buffer_files_num = + pt.get("streamer_player_buffer_files_num"); BOOST_CHECK_MESSAGE(http_port == 9999, "config as excepcted"); // BOOST_CHECK_MESSAGE(log_severity == 5, "config as excepcted"); BOOST_CHECK_MESSAGE(playout_delay == 0, "config as excepcted"); @@ -427,12 +430,17 @@ BOOST_AUTO_TEST_CASE(get_config) { BOOST_CHECK_MESSAGE(node_id == "test node", "config as excepcted"); BOOST_CHECK_MESSAGE(custom_node_id == "test node", "config as excepcted"); BOOST_CHECK_MESSAGE(auto_sinks_update == true, "config as excepcted"); +#ifdef _USE_AVAHI_ BOOST_CHECK_MESSAGE(mdns_enabled == true, "config as excepcted"); +#else + BOOST_CHECK_MESSAGE(mdns_enabled == false, "config as excepcted"); +#endif BOOST_CHECK_MESSAGE(streamer_enabled == false, "config as excepcted"); BOOST_CHECK_MESSAGE(streamer_channels == 8, "config as excepcted"); BOOST_CHECK_MESSAGE(streamer_files_num == 6, "config as excepcted"); BOOST_CHECK_MESSAGE(streamer_file_duration == 3, "config as excepcted"); - BOOST_CHECK_MESSAGE(streamer_player_buffer_files_num == 2, "config as excepcted"); + BOOST_CHECK_MESSAGE(streamer_player_buffer_files_num == 2, + "config as excepcted"); } BOOST_AUTO_TEST_CASE(get_ptp_status) {