Skip to content

Send valid frame type value in frame header #516

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ReenigneArcher merged 2 commits into from
Dec 16, 2022
Merged

Send valid frame type value in frame header #516

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c60ca69
Send valid frame type value in frame header
cgutman Nov 27, 2022
e10bf8b
Merge branch 'nightly' into frame_header
ReenigneArcher Dec 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 27 additions & 2 deletions src/stream.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,28 @@ enum class socket_e : int {

#pragma pack(push, 1)

struct video_short_frame_header_t {
uint8_t *payload() {
return (uint8_t *)(this + 1);
}

std::uint8_t headerType; // Always 0x01 for short headers
std::uint8_t unknown[2];

// Currently known values:
// 1 = Normal P-frame
// 2 = IDR-frame
// 4 = P-frame with intra-refresh blocks
// 5 = P-frame after reference frame invalidation
std::uint8_t frameType;

std::uint8_t unknown2[4];
};

static_assert(
sizeof(video_short_frame_header_t) == 8,
"Short frame header must be 8 bytes");

struct video_packet_raw_t {
uint8_t *payload() {
return (uint8_t *)(this + 1);
Expand Down Expand Up @@ -896,8 +918,11 @@ void videoBroadcastThread(udp::socket &sock) {
std::string_view payload { (char *)av_packet->data, (size_t)av_packet->size };
std::vector<uint8_t> payload_new;

auto nv_packet_header = "\0017charss"sv;
std::copy(std::begin(nv_packet_header), std::end(nv_packet_header), std::back_inserter(payload_new));
video_short_frame_header_t frame_header = {};
frame_header.headerType = 0x01; // Short header type
frame_header.frameType = (av_packet->flags & AV_PKT_FLAG_KEY) ? 2 : 1;

std::copy_n((uint8_t *)&frame_header, sizeof(frame_header), std::back_inserter(payload_new));
std::copy(std::begin(payload), std::end(payload), std::back_inserter(payload_new));

payload = { (char *)payload_new.data(), payload_new.size() };
Expand Down