943596da6d
Loss recovery for the streaming path: - PLI over signaling: the depacketizer now reports damaged frames (DepacketizeResult) and the receiver asks the sender for a keyframe (SessionPli, rate-limited to one per 500 ms). The sender keeps the signaling channel open during the session and honors PLIs through the new thread-safe SenderPipeline::request_keyframe(). Recovery takes one frame time instead of waiting out the GOP. - RtpJitterBuffer: reorders RTP packets by sequence number (16 packets / 60 ms) before the in-order depacketizer, so Wi-Fi reordering is not misread as loss; in-order streams release immediately, and a straggler older than the delivered sequence is discarded. - Hardware H.264 decode probe: DecoderFactory tries h264_v4l2m2m (the VideoCore path on the Pi) with an automatic software fallback and a clear journal line for the chosen path; --swdecode opts out. Validated: PLI end-to-end with a probe that drops a mid-keyframe packet over real UDP (receiver logged the damaged frame and the PLI arrived with the session id); hardware probe fails cleanly and falls back on this desktop; jitter reordering covered by unit tests. meson test 5/5 in both build configurations, valgrind clean.
123 lines
4.2 KiB
C++
123 lines
4.2 KiB
C++
// Phase 6 signaling test: a client offers a session to a server over a real
|
|
// localhost TCP connection and receives the server's answer.
|
|
|
|
#include "screencast/network/signaling.h"
|
|
|
|
#include <atomic>
|
|
#include <chrono>
|
|
#include <cstdio>
|
|
#include <cstdlib>
|
|
#include <future>
|
|
#include <memory>
|
|
#include <string>
|
|
#include <thread>
|
|
|
|
namespace {
|
|
|
|
[[noreturn]] void fail(const char* what) {
|
|
std::fprintf(stderr, "test_signaling: FAIL: %s\n", what);
|
|
std::abort();
|
|
}
|
|
|
|
void check(bool condition, const char* what) {
|
|
if (!condition) {
|
|
fail(what);
|
|
}
|
|
}
|
|
|
|
void check_result(const char* what, const sc::NetworkResult<std::unique_ptr<sc::SignalingChannel>>& result) {
|
|
if (sc::is_network_error(result)) {
|
|
std::fprintf(stderr, "test_signaling: FAIL: %s: %s\n", what, sc::network_error(result).message.c_str());
|
|
std::abort();
|
|
}
|
|
}
|
|
|
|
} // namespace
|
|
|
|
int main() {
|
|
// Bind the server to the first free port in a small range.
|
|
std::unique_ptr<sc::SignalingChannel> server;
|
|
uint16_t server_port = 0;
|
|
for (uint16_t port = 45940; port < 45960; ++port) {
|
|
auto server_result = sc::SignalingFactory::create_server(port);
|
|
if (!sc::is_network_error(server_result)) {
|
|
server = std::move(sc::network_value(server_result));
|
|
server_port = port;
|
|
break;
|
|
}
|
|
}
|
|
check(server != nullptr, "server listens");
|
|
check(server_port != 0, "server port");
|
|
|
|
constexpr uint16_t advertised_rtp_port = 45999;
|
|
|
|
// The receiver side of the handshake: reply to offers with an answer.
|
|
server->on_message([&](const sc::SignalingMessage& message) {
|
|
const sc::SessionOffer* offer = std::get_if<sc::SessionOffer>(&message);
|
|
if (offer == nullptr) {
|
|
return;
|
|
}
|
|
sc::SessionAnswer answer;
|
|
answer.session_id = offer->session_id;
|
|
answer.rtp_endpoint = sc::Endpoint{"", advertised_rtp_port};
|
|
server->send(answer);
|
|
});
|
|
|
|
// The sender side: connect, offer, and wait for the answer.
|
|
auto client_result = sc::SignalingFactory::create_client();
|
|
check_result("client create", client_result);
|
|
std::unique_ptr<sc::SignalingChannel> client = std::move(sc::network_value(client_result));
|
|
|
|
check(client->connect(sc::Endpoint{"127.0.0.1", server_port}), "client connect");
|
|
|
|
std::promise<sc::SessionAnswer> answer_promise;
|
|
auto answer_future = answer_promise.get_future();
|
|
std::atomic<bool> answered{false};
|
|
client->on_message([&](const sc::SignalingMessage& message) {
|
|
if (const sc::SessionAnswer* answer = std::get_if<sc::SessionAnswer>(&message)) {
|
|
if (!answered.exchange(true)) {
|
|
answer_promise.set_value(*answer);
|
|
}
|
|
}
|
|
});
|
|
|
|
sc::SessionOffer offer;
|
|
offer.session_id = "test-session-0001";
|
|
offer.codec_name = "h264";
|
|
offer.frame_rate_num = 25;
|
|
offer.frame_rate_den = 1;
|
|
client->send(offer);
|
|
|
|
check(answer_future.wait_for(std::chrono::seconds(5)) == std::future_status::ready, "answer received");
|
|
const sc::SessionAnswer answer = answer_future.get();
|
|
check(answer.session_id == "test-session-0001", "session id echoes");
|
|
check(answer.rtp_endpoint.port == advertised_rtp_port, "rtp port in answer");
|
|
|
|
// PLI: the receiver side asks for a keyframe mid-session; the client
|
|
// must receive it with the session id intact.
|
|
std::promise<sc::SessionPli> pli_promise;
|
|
auto pli_future = pli_promise.get_future();
|
|
std::atomic<bool> pli_seen{false};
|
|
client->on_message([&](const sc::SignalingMessage& message) {
|
|
if (const sc::SessionPli* pli = std::get_if<sc::SessionPli>(&message)) {
|
|
if (!pli_seen.exchange(true)) {
|
|
pli_promise.set_value(*pli);
|
|
}
|
|
}
|
|
});
|
|
|
|
sc::SessionPli pli;
|
|
pli.session_id = "test-session-0001";
|
|
server->send(pli);
|
|
|
|
check(pli_future.wait_for(std::chrono::seconds(5)) == std::future_status::ready, "pli received");
|
|
const sc::SessionPli received_pli = pli_future.get();
|
|
check(received_pli.session_id == "test-session-0001", "pli session id echoes");
|
|
|
|
client->disconnect();
|
|
server->disconnect();
|
|
|
|
std::puts("test_signaling: all checks passed");
|
|
return 0;
|
|
}
|