izackp/Apollo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add support for periodic ping

Browse Source
This commit is contained in:
loki
2021-07-04 17:12:41 +02:00
parent 9d10eaeef4
commit 616f62fb9f
2 changed files with 25 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sunshine/nvhttp.cpp
+1 -1
View File
@@ -33,7 +33,7 @@
using namespace std::literals; using namespace std::literals;
namespace nvhttp { namespace nvhttp {
constexpr auto VERSION = "7.1.404.0"; constexpr auto VERSION = "7.1.415.0";
constexpr auto GFE_VERSION = "3.12.0.1"; constexpr auto GFE_VERSION = "3.12.0.1";
namespace fs = std::filesystem; namespace fs = std::filesystem;
sunshine/stream.cpp
+24 -20
View File
@@ -11,8 +11,8 @@
#include <openssl/err.h> #include <openssl/err.h>
extern "C" { extern "C" {
#include <moonlight-common-c/src/Video.h>
#include <moonlight-common-c/src/RtpAudioQueue.h> #include <moonlight-common-c/src/RtpAudioQueue.h>
#include <moonlight-common-c/src/Video.h>
#include <rs.h> #include <rs.h>
} }
@@ -33,6 +33,7 @@ extern "C" {
#define IDX_INPUT_DATA 5 #define IDX_INPUT_DATA 5
#define IDX_RUMBLE_DATA 6 #define IDX_RUMBLE_DATA 6
#define IDX_TERMINATION 7 #define IDX_TERMINATION 7
#define IDX_PERIODIC_PING 8
static const short packetTypes[] = { static const short packetTypes[] = {
0x0305, // Start A 0x0305, // Start A
@@ -43,6 +44,7 @@ static const short packetTypes[] = {
0x0206, // Input data 0x0206, // Input data
0x010b, // Rumble data 0x010b, // Rumble data
0x0100, // Termination 0x0100, // Termination
0x0200, // Periodic Ping
}; };
namespace asio = boost::asio; namespace asio = boost::asio;
@@ -91,9 +93,9 @@ struct audio_fec_packet_raw_t {
#pragma pack(pop) #pragma pack(pop)
using rh_t = util::safe_ptr<reed_solomon, reed_solomon_release>; using rh_t = util::safe_ptr<reed_solomon, reed_solomon_release>;
using video_packet_t = util::c_ptr<video_packet_raw_t>; using video_packet_t = util::c_ptr<video_packet_raw_t>;
using audio_packet_t = util::c_ptr<audio_packet_raw_t>; using audio_packet_t = util::c_ptr<audio_packet_raw_t>;
using audio_fec_packet_t = util::c_ptr<audio_fec_packet_raw_t>; using audio_fec_packet_t = util::c_ptr<audio_fec_packet_raw_t>;
using message_queue_t = std::shared_ptr<safe::queue_t<std::pair<std::uint16_t, std::string>>>; using message_queue_t = std::shared_ptr<safe::queue_t<std::pair<std::uint16_t, std::string>>>;
@@ -418,6 +420,8 @@ std::vector<uint8_t> replace(const std::string_view &original, const std::string
} }
void controlBroadcastThread(control_server_t *server) { void controlBroadcastThread(control_server_t *server) {
server->map(packetTypes[IDX_PERIODIC_PING], [](session_t *session, const std::string_view &payload) {});
server->map(packetTypes[IDX_START_A], [&](session_t *session, const std::string_view &payload) { server->map(packetTypes[IDX_START_A], [&](session_t *session, const std::string_view &payload) {
BOOST_LOG(debug) << "type [IDX_START_A]"sv; BOOST_LOG(debug) << "type [IDX_START_A]"sv;
}); });
@@ -685,7 +689,7 @@ void videoBroadcastThread(udp::socket &sock) {
for(auto x = shards.data_shards; x < shards.size(); ++x) { for(auto x = shards.data_shards; x < shards.size(); ++x) {
auto *inspect = (video_packet_raw_t *)shards.data(x); auto *inspect = (video_packet_raw_t *)shards.data(x);
inspect->packet.frameIndex = packet->pts; inspect->packet.frameIndex = packet->pts;
inspect->rtp.header = FLAG_EXTENSION; inspect->rtp.header = FLAG_EXTENSION;
inspect->rtp.sequenceNumber = util::endian::big<uint16_t>(lowseq + x); inspect->rtp.sequenceNumber = util::endian::big<uint16_t>(lowseq + x);
@@ -742,14 +746,14 @@ void audioBroadcastThread(udp::socket &sock) {
memcpy(&rs.get()->m[16], parity, sizeof(parity)); memcpy(&rs.get()->m[16], parity, sizeof(parity));
memcpy(rs.get()->parity, parity, sizeof(parity)); memcpy(rs.get()->parity, parity, sizeof(parity));
audio_packet->rtp.header = 0x80; audio_packet->rtp.header = 0x80;
audio_packet->rtp.packetType = 97; audio_packet->rtp.packetType = 97;
audio_packet->rtp.ssrc = 0; audio_packet->rtp.ssrc = 0;
audio_fec_packet->rtp.header = 0x80; audio_fec_packet->rtp.header = 0x80;
audio_fec_packet->rtp.packetType = 127; audio_fec_packet->rtp.packetType = 127;
audio_fec_packet->rtp.timestamp = 0; audio_fec_packet->rtp.timestamp = 0;
audio_fec_packet->rtp.ssrc = 0; audio_fec_packet->rtp.ssrc = 0;
audio_fec_packet->fecHeader.payloadType = audio_packet->rtp.packetType; audio_fec_packet->fecHeader.payloadType = audio_packet->rtp.packetType;
audio_fec_packet->fecHeader.ssrc = audio_packet->rtp.ssrc; audio_fec_packet->fecHeader.ssrc = audio_packet->rtp.ssrc;
@@ -763,7 +767,7 @@ void audioBroadcastThread(udp::socket &sock) {
auto session = (session_t *)channel_data; auto session = (session_t *)channel_data;
auto sequenceNumber = session->audio.sequenceNumber; auto sequenceNumber = session->audio.sequenceNumber;
auto timestamp = session->audio.timestamp; auto timestamp = session->audio.timestamp;
audio_packet->rtp.sequenceNumber = util::endian::big(sequenceNumber); audio_packet->rtp.sequenceNumber = util::endian::big(sequenceNumber);
audio_packet->rtp.timestamp = util::endian::big(timestamp); audio_packet->rtp.timestamp = util::endian::big(timestamp);
@@ -778,21 +782,21 @@ void audioBroadcastThread(udp::socket &sock) {
BOOST_LOG(verbose) << "Audio ["sv << sequenceNumber << "] :: send..."sv; BOOST_LOG(verbose) << "Audio ["sv << sequenceNumber << "] :: send..."sv;
// initialize the FEC header at the beginning of the FEC block // initialize the FEC header at the beginning of the FEC block
if (sequenceNumber % RTPA_DATA_SHARDS == 0) { if(sequenceNumber % RTPA_DATA_SHARDS == 0) {
audio_fec_packet->fecHeader.baseSequenceNumber = util::endian::big(sequenceNumber); audio_fec_packet->fecHeader.baseSequenceNumber = util::endian::big(sequenceNumber);
audio_fec_packet->fecHeader.baseTimestamp = util::endian::big(timestamp); audio_fec_packet->fecHeader.baseTimestamp = util::endian::big(timestamp);
} }
// generate parity shards at the end of the FEC block // generate parity shards at the end of the FEC block
if ((sequenceNumber + 1) % RTPA_DATA_SHARDS == 0) { if((sequenceNumber + 1) % RTPA_DATA_SHARDS == 0) {
reed_solomon_encode(rs.get(), shards_p.begin(), RTPA_TOTAL_SHARDS, packet_data.size()); reed_solomon_encode(rs.get(), shards_p.begin(), RTPA_TOTAL_SHARDS, packet_data.size());
for(auto x = 0; x < RTPA_FEC_SHARDS; ++x) { for(auto x = 0; x < RTPA_FEC_SHARDS; ++x) {
audio_fec_packet->rtp.sequenceNumber = util::endian::big(sequenceNumber + x + 1); audio_fec_packet->rtp.sequenceNumber = util::endian::big(sequenceNumber + x + 1);
audio_fec_packet->fecHeader.fecShardIndex = x; audio_fec_packet->fecHeader.fecShardIndex = x;
memcpy(audio_fec_packet->payload(), shards_p[RTPA_DATA_SHARDS + x], packet_data.size()); memcpy(audio_fec_packet->payload(), shards_p[RTPA_DATA_SHARDS + x], packet_data.size());
sock.send_to(asio::buffer((char *)audio_fec_packet.get(), sizeof(audio_fec_packet_raw_t) + packet_data.size()), session->audio.peer); sock.send_to(asio::buffer((char *)audio_fec_packet.get(), sizeof(audio_fec_packet_raw_t) + packet_data.size()), session->audio.peer);
BOOST_LOG(verbose) << "Audio FEC ["sv << (sequenceNumber & ~(RTPA_DATA_SHARDS - 1)) << ' ' << x <<"] :: send..."sv; BOOST_LOG(verbose) << "Audio FEC ["sv << (sequenceNumber & ~(RTPA_DATA_SHARDS - 1)) << ' ' << x << "] :: send..."sv;
} }
} }
} }
@@ -1023,7 +1027,7 @@ std::shared_ptr<session_t> alloc(config_t &config, crypto::aes_t &gcm_key, crypt
session->video.lowseq = 0; session->video.lowseq = 0;
session->audio.sequenceNumber = 0; session->audio.sequenceNumber = 0;
session->audio.timestamp = 0; session->audio.timestamp = 0;
session->control.peer = nullptr; session->control.peer = nullptr;
session->state.store(state_e::STOPPED, std::memory_order_relaxed); session->state.store(state_e::STOPPED, std::memory_order_relaxed);