YangWX/crossdesk
1
0
Fork 0
mirror of https://github.com/kunkundi/crossdesk.git synced 2026-03-26 19:27:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

[feat] h264 frame assember refactoring

Browse Source
This commit is contained in:
dijunkun
2025-04-01 18:12:15 +08:00
parent e399260daa
commit f361347795
8 changed files with 186 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/rtp/rtp_packet/rtp_packet_h264.cpp
View File

@@ -10,19 +10,25 @@ bool RtpPacketH264::GetFrameHeaderInfo() {
}
const uint8_t* frame_buffer = Payload();
size_t offset = 0;
fu_indicator_.forbidden_bit = (frame_buffer[0] >> 7) & 0x01;
fu_indicator_.nal_reference_idc = (frame_buffer[0] >> 5) & 0x03;
fu_indicator_.nal_unit_type = frame_buffer[0] & 0x1F;
if (rtp::PAYLOAD_TYPE::RTX == PayloadType()) {
osn_ = frame_buffer[0] << 8 | frame_buffer[0 + 1];
offset = 2;
}
fu_indicator_.forbidden_bit = (frame_buffer[0 + offset] >> 7) & 0x01;
fu_indicator_.nal_reference_idc = (frame_buffer[0 + offset] >> 5) & 0x03;
fu_indicator_.nal_unit_type = frame_buffer[0 + offset] & 0x1F;
if (rtp::NAL_UNIT_TYPE::NALU == fu_indicator_.nal_unit_type) {
add_offset_to_payload(1);
add_offset_to_payload(1 + offset);
} else if (rtp::NAL_UNIT_TYPE::FU_A == fu_indicator_.nal_unit_type) {
fu_header_.start = (frame_buffer[1] >> 7) & 0x01;
fu_header_.end = (frame_buffer[1] >> 6) & 0x01;
fu_header_.remain_bit = (frame_buffer[1] >> 5) & 0x01;
fu_header_.nal_unit_type = frame_buffer[1] & 0x1F;
add_offset_to_payload(2);
fu_header_.start = (frame_buffer[1 + offset] >> 7) & 0x01;
fu_header_.end = (frame_buffer[1 + offset] >> 6) & 0x01;
fu_header_.remain_bit = (frame_buffer[1 + offset] >> 5) & 0x01;
fu_header_.nal_unit_type = frame_buffer[1 + offset] & 0x1F;
add_offset_to_payload(2 + offset);
}
fu_info_got_ = true;

3
src/rtp/rtp_packet/rtp_packet_h264.h
View File

@@ -23,7 +23,10 @@ class RtpPacketH264 : public RtpPacket {
bool FuAStart() { return fu_header_.start; }
bool FuAEnd() { return fu_header_.end; }
uint16_t GetOsn() { return osn_; }
private:
uint16_t osn_;
rtp::FU_INDICATOR fu_indicator_;
rtp::FU_HEADER fu_header_;
bool fu_info_got_ = false;

4
src/rtp/rtp_packet/rtp_packet_to_send.cpp
View File

@@ -77,9 +77,7 @@ bool RtpPacketToSend::BuildRtxPacket() {
uint32_t ssrc = Ssrc();
std::vector<uint32_t> csrcs = Csrcs();
uint32_t timestamp = std::chrono::duration_cast<std::chrono::microseconds>(
std::chrono::system_clock::now().time_since_epoch())
.count();
uint32_t timestamp = Timestamp();
if (!csrc_count) {
}

2
src/rtp/rtp_packet/rtx_packet.h
View File

@@ -19,7 +19,7 @@
// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ |
// | Original RTP Packet Payload |
// | |
//+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
class RtxPacket {
public: