andreil/camera-streamer
1
0
Fork 0
mirror of https://github.com/andreili/camera-streamer.git synced 2025-08-23 19:34:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

webrtc: introduce timeout_s by default set to 1h

Browse Source 
Client can overwrite this value to set `timeout_s` as part of webrtc request.

The `0` completely disables the timeout.
This commit is contained in:
Kamil Trzciński 2025-07-02 23:33:28 +02:00
parent 2d3a488437
commit a4bcc14283
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
output/webrtc/webrtc.cc
View File

@ -17,10 +17,12 @@ extern "C" {
#include "util/http/json.hh" #include "util/http/json.hh"
#define DEFAULT_PING_INTERVAL_US (1 * 1000 * 1000) #define DEFAULT_PING_INTERVAL_US (1 * 1000 * 1000)
#define DEFAULT_DISCONNECT_INTERVAL_US (30 * 1000 * 1000) #define DEFAULT_PONG_INTERVAL_US (30 * 1000 * 1000)
#define DEFAULT_TIMEOUT_S (60 * 60)
#ifdef USE_LIBDATACHANNEL #ifdef USE_LIBDATACHANNEL
#include <inttypes.h>
#include <string> #include <string>
#include <memory> #include <memory>
#include <optional> #include <optional>
@ -122,18 +124,23 @@ public:
bool keepAlive() bool keepAlive()
{ {
uint64_t now_us = get_monotonic_time_us(NULL, NULL);
if (deadline_us > 0 && now_us > deadline_us) {
LOG_INFO(this, "The stream reached the deadline.");
return false;
}
if (!dc_keepAlive) if (!dc_keepAlive)
return true; return true;
uint64_t now_us = get_monotonic_time_us(NULL, NULL);
if (dc_keepAlive->isOpen() && now_us - last_ping_us >= DEFAULT_PING_INTERVAL_US) { if (dc_keepAlive->isOpen() && now_us - last_ping_us >= DEFAULT_PING_INTERVAL_US) {
LOG_DEBUG(this, "Checking if client still alive."); LOG_DEBUG(this, "Checking if client still alive.");
dc_keepAlive->send("ping"); dc_keepAlive->send("ping");
last_ping_us = now_us; last_ping_us = now_us;
} }
if (now_us - last_pong_us >= DEFAULT_DISCONNECT_INTERVAL_US) { if (now_us - last_pong_us >= DEFAULT_PONG_INTERVAL_US) {
LOG_INFO(this, "No heartbeat from client."); LOG_INFO(this, "No heartbeat from client.");
return false; return false;
} }
@ -213,6 +220,7 @@ public:
bool requested_key_frame = false; bool requested_key_frame = false;
uint64_t last_ping_us = 0; uint64_t last_ping_us = 0;
uint64_t last_pong_us = 0; uint64_t last_pong_us = 0;
uint64_t deadline_us = 0;
}; };
std::shared_ptr<Client> webrtc_find_client(std::string id) std::shared_ptr<Client> webrtc_find_client(std::string id)
@ -324,6 +332,12 @@ static std::shared_ptr<Client> webrtc_peer_connection(rtc::Configuration config,
LOG_INFO(client.get(), "Client does not support Keep-Alives. This might result in stale streams."); LOG_INFO(client.get(), "Client does not support Keep-Alives. This might result in stale streams.");
} }
int64_t timeout_s = message.value("timeout_s", DEFAULT_TIMEOUT_S);
if (timeout_s > 0) {
LOG_INFO(client.get(), "The stream will auto-close in %" PRId64 "s.", timeout_s);
client->deadline_us = get_monotonic_time_us(NULL, NULL) + timeout_s * 1000 * 1000;
}
pc->onTrack([wclient](std::shared_ptr<rtc::Track> track) { pc->onTrack([wclient](std::shared_ptr<rtc::Track> track) {
if(auto client = wclient.lock()) { if(auto client = wclient.lock()) {
LOG_DEBUG(client.get(), "onTrack: %s", track->mid().c_str()); LOG_DEBUG(client.get(), "onTrack: %s", track->mid().c_str());