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

[fix] fix h264 frame assember

Browse Source
This commit is contained in:
dijunkun
2025-03-28 15:16:41 +08:00
parent 0d9d3c5eca
commit 506ded3027
2 changed files with 29 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/transport/channel/rtp_video_receiver.cpp
View File

@@ -7,7 +7,7 @@
#include "nack.h" #include "nack.h"
#include "rtcp_sender.h" #include "rtcp_sender.h"
#define SAVE_RTP_RECV_STREAM // #define SAVE_RTP_RECV_STREAM
#define NV12_BUFFER_SIZE (1280 * 720 * 3 / 2) #define NV12_BUFFER_SIZE (1280 * 720 * 3 / 2)
#define RTCP_RR_INTERVAL 1000 #define RTCP_RR_INTERVAL 1000
@@ -200,31 +200,41 @@ void RtpVideoReceiver::InsertRtpPacket(RtpPacket& rtp_packet) {
if (rtp_packet.Buffer().data() != nullptr && rtp_packet.Size() > 0 && if (rtp_packet.Buffer().data() != nullptr && rtp_packet.Size() > 0 &&
rtp_packet_h264->Build(rtp_packet.Buffer().data(), rtp_packet.Size())) { rtp_packet_h264->Build(rtp_packet.Buffer().data(), rtp_packet.Size())) {
rtp_packet_h264->GetFrameHeaderInfo(); rtp_packet_h264->GetFrameHeaderInfo();
std::vector<std::unique_ptr<RtpPacketH264>> complete_frame = rtp::NAL_UNIT_TYPE nalu_type = rtp_packet_h264->NalUnitType();
h264_frame_assembler_.InsertPacket(std::move(rtp_packet_h264)); if (rtp::NAL_UNIT_TYPE::NALU == nalu_type) {
if (!complete_frame.empty()) { ReceivedFrame received_frame(rtp_packet_h264->Payload(),
uint8_t* nv12_data_ = new uint8_t[NV12_BUFFER_SIZE]; rtp_packet_h264->PayloadSize());
uint8_t* dest = nv12_data_;
size_t complete_frame_size = 0;
for (auto& frame : complete_frame) {
memcpy(dest, frame->Payload(), frame->PayloadSize());
dest += frame->PayloadSize();
complete_frame_size += frame->PayloadSize();
}
ReceivedFrame received_frame(nv12_data_, complete_frame_size);
received_frame.SetReceivedTimestamp(clock_->CurrentTime().us()); received_frame.SetReceivedTimestamp(clock_->CurrentTime().us());
received_frame.SetCapturedTimestamp( received_frame.SetCapturedTimestamp(
(static_cast<int64_t>(complete_frame[0]->Timestamp()) / (static_cast<int64_t>(rtp_packet_h264->Timestamp()) /
rtp::kMsToRtpTimestamp - rtp::kMsToRtpTimestamp -
delta_ntp_internal_ms_) * delta_ntp_internal_ms_) *
1000); 1000);
compelete_video_frame_queue_.push(received_frame); compelete_video_frame_queue_.push(received_frame);
} else if (rtp::NAL_UNIT_TYPE::FU_A == nalu_type) {
std::vector<std::unique_ptr<RtpPacketH264>> complete_frame =
h264_frame_assembler_.InsertPacket(std::move(rtp_packet_h264));
if (!complete_frame.empty()) {
uint8_t* nv12_data_ = new uint8_t[NV12_BUFFER_SIZE];
uint8_t* dest = nv12_data_;
size_t complete_frame_size = 0;
for (auto& frame : complete_frame) {
memcpy(dest, frame->Payload(), frame->PayloadSize());
dest += frame->PayloadSize();
complete_frame_size += frame->PayloadSize();
}
fwrite((unsigned char*)received_frame.Buffer(), 1, ReceivedFrame received_frame(nv12_data_, complete_frame_size);
received_frame.Size(), file_rtp_recv_); received_frame.SetReceivedTimestamp(clock_->CurrentTime().us());
received_frame.SetCapturedTimestamp(
(static_cast<int64_t>(complete_frame[0]->Timestamp()) /
rtp::kMsToRtpTimestamp -
delta_ntp_internal_ms_) *
1000);
compelete_video_frame_queue_.push(received_frame);
delete[] nv12_data_; delete[] nv12_data_;
}
} }
} }

2
src/transport/channel/video_channel_send.cpp
View File

@@ -3,7 +3,7 @@
#include "log.h" #include "log.h"
#include "rtc_base/network/sent_packet.h" #include "rtc_base/network/sent_packet.h"
#define SAVE_RTP_SENT_STREAM // #define SAVE_RTP_SENT_STREAM
VideoChannelSend::VideoChannelSend( VideoChannelSend::VideoChannelSend(
std::shared_ptr<SystemClock> clock, std::shared_ptr<IceAgent> ice_agent, std::shared_ptr<SystemClock> clock, std::shared_ptr<IceAgent> ice_agent,