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 connection status error: send packets only when ice status is ready

Browse Source
This commit is contained in:
dijunkun
2023-12-05 15:12:18 +08:00
parent 936348ba9e
commit 6a6e922fc1
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/media/video/encode/openh264/openh264_encoder.cpp
View File

@@ -222,6 +222,9 @@ int OpenH264Encoder::Encode(
if (on_encoded_image) { if (on_encoded_image) {
on_encoded_image((char *)encoded_frame_, encoded_frame_size_); on_encoded_image((char *)encoded_frame_, encoded_frame_size_);
if (SAVE_H264_STREAM) {
fwrite(encoded_frame_, 1, encoded_frame_size_, file_h264_);
}
} else { } else {
OnEncodedImage((char *)encoded_frame_, encoded_frame_size_); OnEncodedImage((char *)encoded_frame_, encoded_frame_size_);
} }

9
src/pc/peer_connection.cpp
View File

@@ -126,8 +126,7 @@ int PeerConnection::Init(PeerConnectionParams params,
on_connection_status_(ConnectionStatus::Connecting); on_connection_status_(ConnectionStatus::Connecting);
} else if ("disconnected" == ice_status) { } else if ("disconnected" == ice_status) {
on_connection_status_(ConnectionStatus::Disconnected); on_connection_status_(ConnectionStatus::Disconnected);
} else if ("completed" == ice_status || "ready" == ice_status || } else if ("ready" == ice_status) {
"connected" == ice_status) {
ice_ready_ = true; ice_ready_ = true;
on_connection_status_(ConnectionStatus::Connected); on_connection_status_(ConnectionStatus::Connected);
b_force_i_frame_ = true; b_force_i_frame_ = true;
@@ -508,7 +507,7 @@ int PeerConnection::SendVideoData(const char *data, size_t size) {
int ret = video_encoder_->Encode( int ret = video_encoder_->Encode(
(uint8_t *)data, size, [this](char *encoded_frame, size_t size) -> int { (uint8_t *)data, size, [this](char *encoded_frame, size_t size) -> int {
for (auto &ice_trans : ice_transmission_list_) { for (auto &ice_trans : ice_transmission_list_) {
// LOG_ERROR("H264 frame size: [{}]", size); LOG_ERROR("H264 frame size: [{}]", size);
ice_trans.second->SendData(IceTransmission::DATA_TYPE::VIDEO, ice_trans.second->SendData(IceTransmission::DATA_TYPE::VIDEO,
encoded_frame, size); encoded_frame, size);
} }
@@ -529,8 +528,8 @@ int PeerConnection::SendAudioData(const char *data, size_t size) {
[this](char *encoded_audio_buffer, size_t size) -> int { [this](char *encoded_audio_buffer, size_t size) -> int {
for (auto &ice_trans : ice_transmission_list_) { for (auto &ice_trans : ice_transmission_list_) {
// LOG_ERROR("opus frame size: [{}]", size); // LOG_ERROR("opus frame size: [{}]", size);
ice_trans.second->SendData(IceTransmission::DATA_TYPE::AUDIO, // ice_trans.second->SendData(IceTransmission::DATA_TYPE::AUDIO,
encoded_audio_buffer, size); // encoded_audio_buffer, size);
} }
return 0; return 0;
}); });