YangWX/crossdesk
1
0
Fork 0
mirror of https://github.com/kunkundi/crossdesk.git synced 2025-10-27 04:35:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

[fix] fix compile error on MacOSX

Browse Source
This commit is contained in:
dijunkun
2025-02-10 15:46:22 +08:00
parent 1f3c93c77a
commit 2c48ce12c5
11 changed files with 23 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/rtp/rtp_packetizer/rtp_packetizer_generic.cpp
View File

@@ -24,9 +24,9 @@ std::vector<RtpPacket> RtpPacketizerGeneric::Build(uint8_t* payload,
payload_size / MAX_NALU_LEN + (last_packet_size ? 1 : 0);
// TODO: use frame timestamp
timestamp_ = std::chrono::duration_cast<std::chrono::microseconds>(
std::chrono::system_clock::now().time_since_epoch())
.count();
uint64_t timestamp = std::chrono::duration_cast<std::chrono::microseconds>(
std::chrono::system_clock::now().time_since_epoch())
.count();
std::vector<RtpPacket> rtp_packets;
for (uint32_t index = 0; index < packet_num; index++) {
@@ -37,11 +37,10 @@ std::vector<RtpPacket> RtpPacketizerGeneric::Build(uint8_t* payload,
marker_ = index == packet_num - 1 ? 1 : 0;
payload_type_ = rtp::PAYLOAD_TYPE(payload_type_);
sequence_number_++;
timestamp_ = timestamp_;
timestamp_ = timestamp;
ssrc_ = ssrc_;
if (!csrc_count_) {
csrcs_ = csrcs_;
}
rtp_packet_frame_.clear();

10
src/rtp/rtp_packetizer/rtp_packetizer_h264.cpp
View File

@@ -81,10 +81,8 @@ std::vector<RtpPacket> RtpPacketizerH264::BuildNalu(uint8_t* payload,
timestamp_ = std::chrono::duration_cast<std::chrono::microseconds>(
std::chrono::system_clock::now().time_since_epoch())
.count();
ssrc_ = ssrc_;
if (!csrc_count_) {
csrcs_ = csrcs_;
}
rtp::FU_INDICATOR fu_indicator;
@@ -141,9 +139,9 @@ std::vector<RtpPacket> RtpPacketizerH264::BuildFua(uint8_t* payload,
payload_size / MAX_NALU_LEN + (last_packet_size ? 1 : 0);
// TODO: use frame timestamp
timestamp_ = std::chrono::duration_cast<std::chrono::microseconds>(
std::chrono::system_clock::now().time_since_epoch())
.count();
uint64_t timestamp = std::chrono::duration_cast<std::chrono::microseconds>(
std::chrono::system_clock::now().time_since_epoch())
.count();
for (uint32_t index = 0; index < packet_num; index++) {
version_ = kRtpVersion;
@@ -153,7 +151,7 @@ std::vector<RtpPacket> RtpPacketizerH264::BuildFua(uint8_t* payload,
marker_ = (index == (packet_num - 1)) ? 1 : 0;
payload_type_ = rtp::PAYLOAD_TYPE(payload_type_);
sequence_number_++;
timestamp_ = timestamp_;
timestamp_ = timestamp;
ssrc_ = ssrc_;
if (!csrc_count_) {

6
src/rtp/rtp_packetizer/rtp_packetizer_h264.h
View File

@@ -18,11 +18,9 @@ class RtpPacketizerH264 : public RtpPacketizer {
std::vector<RtpPacket> Build(uint8_t* payload,
uint32_t payload_size) override;
std::vector<RtpPacket> RtpPacketizerH264::BuildNalu(uint8_t* payload,
uint32_t payload_size);
std::vector<RtpPacket> BuildNalu(uint8_t* payload, uint32_t payload_size);
std::vector<RtpPacket> RtpPacketizerH264::BuildFua(uint8_t* payload,
uint32_t payload_size);
std::vector<RtpPacket> BuildFua(uint8_t* payload, uint32_t payload_size);
private:
bool EncodeH264Fua(RtpPacket& rtp_packet, uint8_t* payload,