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

Fix unused variables warnning

Browse Source
This commit is contained in:
dijunkun
2023-12-13 17:23:20 +08:00
parent d4abc318a4
commit 0b80124b3c
19 changed files with 73 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
README.md
View File

@@ -11,6 +11,13 @@ sudo apt-get install nvidia-cuda-toolkit
solve <cuda.h> solve <cuda.h>
sudo apt-get install libxcb-randr0-dev libxcb-xtest0-dev libxcb-xinerama0-dev libxcb-shape0-dev libxcb-xkb-dev libxcb-xfixes0-dev libxv-dev sudo apt-get install libxcb-randr0-dev libxcb-xtest0-dev libxcb-xinerama0-dev libxcb-shape0-dev libxcb-xkb-dev libxcb-xfixes0-dev libxv-dev
solve x11
sudo apt-get -y install libasound2-dev libsndio-dev libxcb-shm0-dev
solve asound sndio xcb-shm
sudo apt-get -y install libasound2-dev libpulse-dev && rebuild
solve error dsp no such audio device
sudo apt-get install libavcodec-dev libavformat-dev libavutil-dev libavfilter-dev libavdevice-dev sudo apt-get install libavcodec-dev libavformat-dev libavutil-dev libavfilter-dev libavdevice-dev

2
src/frame/audio_frame.h
View File

@@ -25,7 +25,7 @@ class AudioFrame {
public: public:
const uint8_t *Buffer() { return buffer_; } const uint8_t *Buffer() { return buffer_; }
const size_t Size() { return size_; } size_t Size() { return size_; }
uint8_t *GetBuffer() { return buffer_; } uint8_t *GetBuffer() { return buffer_; }

6
src/frame/video_frame.h
View File

@@ -25,15 +25,15 @@ class VideoFrame {
public: public:
const uint8_t *Buffer() { return buffer_; } const uint8_t *Buffer() { return buffer_; }
const size_t Size() { return size_; } size_t Size() { return size_; }
uint8_t *GetBuffer() { return buffer_; } uint8_t *GetBuffer() { return buffer_; }
private: private:
size_t width_ = 0;
size_t height_ = 0;
uint8_t *buffer_ = nullptr; uint8_t *buffer_ = nullptr;
size_t size_ = 0; size_t size_ = 0;
size_t width_ = 0;
size_t height_ = 0;
}; };
#endif #endif

2
src/media/audio/encode/audio_encoder.cpp
View File

@@ -29,8 +29,6 @@ int AudioEncoder::Init() {
std::chrono::high_resolution_clock::now().time_since_epoch()) std::chrono::high_resolution_clock::now().time_since_epoch())
.count()); .count());
int err; int err;
int applications[3] = {OPUS_APPLICATION_AUDIO, OPUS_APPLICATION_VOIP,
OPUS_APPLICATION_RESTRICTED_LOWDELAY};
opus_encoder_ = opus_encoder_create(sample_rate_, channel_num_, opus_encoder_ = opus_encoder_create(sample_rate_, channel_num_,
OPUS_APPLICATION_VOIP, &err); OPUS_APPLICATION_VOIP, &err);

16
src/media/video/decode/ffmpeg/ffmpeg_video_decoder.cpp
View File

@@ -125,10 +125,10 @@ int FfmpegVideoDecoder::Decode(
} }
if (on_receive_decoded_frame) { if (on_receive_decoded_frame) {
uint64_t start_ts = static_cast<uint64_t>( // uint64_t start_ts = static_cast<uint64_t>(
std::chrono::duration_cast<std::chrono::microseconds>( // std::chrono::duration_cast<std::chrono::microseconds>(
std::chrono::high_resolution_clock::now().time_since_epoch()) // std::chrono::high_resolution_clock::now().time_since_epoch())
.count()); // .count());
if (1) { if (1) {
av_image_fill_arrays(frame_nv12_->data, frame_nv12_->linesize, av_image_fill_arrays(frame_nv12_->data, frame_nv12_->linesize,
@@ -144,10 +144,10 @@ int FfmpegVideoDecoder::Decode(
frame_->data[1], frame_->width * frame_->height / 2); frame_->data[1], frame_->width * frame_->height / 2);
} }
uint64_t now_ts = static_cast<uint64_t>( // uint64_t now_ts = static_cast<uint64_t>(
std::chrono::duration_cast<std::chrono::microseconds>( // std::chrono::duration_cast<std::chrono::microseconds>(
std::chrono::high_resolution_clock::now().time_since_epoch()) // std::chrono::high_resolution_clock::now().time_since_epoch())
.count()); // .count());
// LOG_ERROR("cost {}", now_ts - start_ts); // LOG_ERROR("cost {}", now_ts - start_ts);

7
src/media/video/decode/openh264/openh264_decoder.cpp
View File

@@ -133,7 +133,7 @@ int OpenH264Decoder::Init() {
sDecParam.eEcActiveIdc = ERROR_CON_SLICE_COPY; sDecParam.eEcActiveIdc = ERROR_CON_SLICE_COPY;
sDecParam.sVideoProperty.eVideoBsType = VIDEO_BITSTREAM_DEFAULT; sDecParam.sVideoProperty.eVideoBsType = VIDEO_BITSTREAM_DEFAULT;
int32_t iRet = openh264_decoder_->Initialize(&sDecParam); openh264_decoder_->Initialize(&sDecParam);
int trace_level = WELS_LOG_QUIET; int trace_level = WELS_LOG_QUIET;
openh264_decoder_->SetOption(DECODER_OPTION_TRACE_LEVEL, &trace_level); openh264_decoder_->SetOption(DECODER_OPTION_TRACE_LEVEL, &trace_level);
@@ -156,11 +156,10 @@ int OpenH264Decoder::Decode(
// LOG_WARN("Receive key frame"); // LOG_WARN("Receive key frame");
} }
SBufferInfo sDstBufInfo = {0}; SBufferInfo sDstBufInfo;
memset(&sDstBufInfo, 0, sizeof(SBufferInfo)); memset(&sDstBufInfo, 0, sizeof(SBufferInfo));
int iRet = openh264_decoder_->DecodeFrameNoDelay(data, size, yuv_data_, openh264_decoder_->DecodeFrameNoDelay(data, size, yuv_data_, &sDstBufInfo);
&sDstBufInfo);
if (sDstBufInfo.iBufferStatus == 1) { if (sDstBufInfo.iBufferStatus == 1) {
if (on_receive_decoded_frame) { if (on_receive_decoded_frame) {

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

@@ -206,7 +206,6 @@ int OpenH264Encoder::Encode(
} }
} }
const uint8_t start_code[4] = {0, 0, 0, 1};
size_t frag = 0; size_t frag = 0;
int encoded_frame_size = 0; int encoded_frame_size = 0;
for (int layer = 0; layer < info.iLayerNum; ++layer) { for (int layer = 0; layer < info.iLayerNum; ++layer) {

11
src/pc/peer_connection.cpp
View File

@@ -167,9 +167,10 @@ int PeerConnection::Init(PeerConnectionParams params,
} }
int PeerConnection::CreateVideoCodec(bool hardware_acceleration) { int PeerConnection::CreateVideoCodec(bool hardware_acceleration) {
hardware_acceleration_ = hardware_acceleration;
#ifdef __APPLE__ #ifdef __APPLE__
if (hardware_acceleration) { if (hardware_acceleration_) {
hardware_acceleration = false; hardware_acceleration_ = false;
LOG_WARN( LOG_WARN(
"MacOS not support hardware acceleration, use default software codec"); "MacOS not support hardware acceleration, use default software codec");
} }
@@ -238,8 +239,7 @@ int PeerConnection::CreateAudioCodec() {
return 0; return 0;
} }
int PeerConnection::Create(PeerConnectionParams params, int PeerConnection::Create(const std::string &transmission_id,
const std::string &transmission_id,
const std::string &password) { const std::string &password) {
if (SignalStatus::SignalConnected != GetSignalStatus()) { if (SignalStatus::SignalConnected != GetSignalStatus()) {
LOG_ERROR("Signal not connected"); LOG_ERROR("Signal not connected");
@@ -263,8 +263,7 @@ int PeerConnection::Create(PeerConnectionParams params,
return ret; return ret;
} }
int PeerConnection::Join(PeerConnectionParams params, int PeerConnection::Join(const std::string &transmission_id,
const std::string &transmission_id,
const std::string &password) { const std::string &password) {
if (SignalStatus::SignalConnected != GetSignalStatus()) { if (SignalStatus::SignalConnected != GetSignalStatus()) {
LOG_ERROR("Signal not connected"); LOG_ERROR("Signal not connected");

5
src/pc/peer_connection.h
View File

@@ -40,11 +40,10 @@ class PeerConnection {
public: public:
int Init(PeerConnectionParams params, const std::string &user_id); int Init(PeerConnectionParams params, const std::string &user_id);
int Create(PeerConnectionParams params, int Create(const std::string &transmission_id = "",
const std::string &transmission_id = "",
const std::string &password = ""); const std::string &password = "");
int Join(PeerConnectionParams params, const std::string &transmission_id, int Join(const std::string &transmission_id,
const std::string &password = ""); const std::string &password = "");
int Leave(); int Leave();

8
src/rtc/x_inner.cpp
View File

@@ -10,8 +10,6 @@
using nlohmann::json; using nlohmann::json;
static PeerConnection *peer_connection;
PeerPtr *CreatePeer(const Params *params) { PeerPtr *CreatePeer(const Params *params) {
PeerPtr *peer_ptr = new PeerPtr; PeerPtr *peer_ptr = new PeerPtr;
peer_ptr->peer_connection = new PeerConnection(); peer_ptr->peer_connection = new PeerConnection();
@@ -46,8 +44,7 @@ int CreateConnection(PeerPtr *peer_ptr, const char *transmission_id,
LOG_INFO("CreateConnection [{}] with password [{}]", transmission_id, LOG_INFO("CreateConnection [{}] with password [{}]", transmission_id,
password); password);
return peer_ptr->peer_connection->Create(peer_ptr->pc_params, transmission_id, return peer_ptr->peer_connection->Create(transmission_id, password);
password);
} }
int JoinConnection(PeerPtr *peer_ptr, const char *transmission_id, int JoinConnection(PeerPtr *peer_ptr, const char *transmission_id,
@@ -57,8 +54,7 @@ int JoinConnection(PeerPtr *peer_ptr, const char *transmission_id,
return -1; return -1;
} }
peer_ptr->peer_connection->Join(peer_ptr->pc_params, transmission_id, peer_ptr->peer_connection->Join(transmission_id, password);
password);
LOG_INFO("JoinConnection[{}] with password [{}]", transmission_id, password); LOG_INFO("JoinConnection[{}] with password [{}]", transmission_id, password);
return 0; return 0;
} }

2
src/rtcp/rtcp_receiver_report.cpp
View File

@@ -24,7 +24,7 @@ void RtcpReceiverReport::SetReportBlock(
} }
const uint8_t *RtcpReceiverReport::Encode() { const uint8_t *RtcpReceiverReport::Encode() {
int pos = rtcp_header_.Encode(DEFAULT_RTCP_VERSION, 0, DEFAULT_RR_BLOCK_NUM, rtcp_header_.Encode(DEFAULT_RTCP_VERSION, 0, DEFAULT_RR_BLOCK_NUM,
RTCP_TYPE::RR, DEFAULT_RR_SIZE, buffer_); RTCP_TYPE::RR, DEFAULT_RR_SIZE, buffer_);
return buffer_; return buffer_;

16
src/rtp/rtp_audio_receiver.cpp
View File

@@ -24,14 +24,16 @@ void RtpAudioReceiver::InsertRtpPacket(RtpPacket& rtp_packet) {
RtcpReceiverReport rtcp_rr; RtcpReceiverReport rtcp_rr;
RtcpReportBlock report; RtcpReportBlock report;
auto duration = std::chrono::system_clock::now().time_since_epoch(); // auto duration = std::chrono::system_clock::now().time_since_epoch();
auto seconds = std::chrono::duration_cast<std::chrono::seconds>(duration); // auto seconds =
uint32_t seconds_u32 = static_cast<uint32_t>( // std::chrono::duration_cast<std::chrono::seconds>(duration); uint32_t
std::chrono::duration_cast<std::chrono::seconds>(duration).count()); // seconds_u32 = static_cast<uint32_t>(
// std::chrono::duration_cast<std::chrono::seconds>(duration).count());
uint32_t fraction_u32 = static_cast<uint32_t>( // uint32_t fraction_u32 = static_cast<uint32_t>(
std::chrono::duration_cast<std::chrono::nanoseconds>(duration - seconds) // std::chrono::duration_cast<std::chrono::nanoseconds>(duration -
.count()); // seconds)
// .count());
report.source_ssrc = 0x00; report.source_ssrc = 0x00;
report.fraction_lost = 0; report.fraction_lost = 0;

2
src/rtp/rtp_audio_sender.cpp
View File

@@ -36,8 +36,6 @@ int RtpAudioSender::SendRtpPacket(RtpPacket& rtp_packet) {
return -1; return -1;
} }
int ret = 0;
if (0 != if (0 !=
data_send_func_((const char*)rtp_packet.Buffer(), rtp_packet.Size())) { data_send_func_((const char*)rtp_packet.Buffer(), rtp_packet.Size())) {
LOG_ERROR("Send rtp packet failed"); LOG_ERROR("Send rtp packet failed");

16
src/rtp/rtp_data_receiver.cpp
View File

@@ -24,14 +24,16 @@ void RtpDataReceiver::InsertRtpPacket(RtpPacket& rtp_packet) {
RtcpReceiverReport rtcp_rr; RtcpReceiverReport rtcp_rr;
RtcpReportBlock report; RtcpReportBlock report;
auto duration = std::chrono::system_clock::now().time_since_epoch(); // auto duration = std::chrono::system_clock::now().time_since_epoch();
auto seconds = std::chrono::duration_cast<std::chrono::seconds>(duration); // auto seconds =
uint32_t seconds_u32 = static_cast<uint32_t>( // std::chrono::duration_cast<std::chrono::seconds>(duration); uint32_t
std::chrono::duration_cast<std::chrono::seconds>(duration).count()); // seconds_u32 = static_cast<uint32_t>(
// std::chrono::duration_cast<std::chrono::seconds>(duration).count());
uint32_t fraction_u32 = static_cast<uint32_t>( // uint32_t fraction_u32 = static_cast<uint32_t>(
std::chrono::duration_cast<std::chrono::nanoseconds>(duration - seconds) // std::chrono::duration_cast<std::chrono::nanoseconds>(duration -
.count()); // seconds)
// .count());
report.source_ssrc = 0x00; report.source_ssrc = 0x00;
report.fraction_lost = 0; report.fraction_lost = 0;

2
src/rtp/rtp_data_sender.cpp
View File

@@ -36,8 +36,6 @@ int RtpDataSender::SendRtpPacket(RtpPacket& rtp_packet) {
return -1; return -1;
} }
int ret = 0;
if (0 != if (0 !=
data_send_func_((const char*)rtp_packet.Buffer(), rtp_packet.Size())) { data_send_func_((const char*)rtp_packet.Buffer(), rtp_packet.Size())) {
LOG_ERROR("Send rtp packet failed"); LOG_ERROR("Send rtp packet failed");

4
src/rtp/rtp_packet.h
View File

@@ -258,9 +258,9 @@ class RtpPacket {
return extension_data_; return extension_data_;
} }
const uint8_t FecSymbolId() { return fec_symbol_id_; } uint8_t FecSymbolId() { return fec_symbol_id_; }
const uint8_t FecSourceSymbolNum() { return fec_source_symbol_num_; } uint8_t FecSourceSymbolNum() { return fec_source_symbol_num_; }
// Payload // Payload
const uint8_t *Payload() { const uint8_t *Payload() {

14
src/rtp/rtp_video_receiver.cpp
View File

@@ -27,14 +27,14 @@ void RtpVideoReceiver::InsertRtpPacket(RtpPacket& rtp_packet) {
RtcpReceiverReport rtcp_rr; RtcpReceiverReport rtcp_rr;
RtcpReportBlock report; RtcpReportBlock report;
auto duration = std::chrono::system_clock::now().time_since_epoch(); // auto duration = std::chrono::system_clock::now().time_since_epoch();
auto seconds = std::chrono::duration_cast<std::chrono::seconds>(duration); // auto seconds = std::chrono::duration_cast<std::chrono::seconds>(duration);
uint32_t seconds_u32 = static_cast<uint32_t>( // uint32_t seconds_u32 = static_cast<uint32_t>(
std::chrono::duration_cast<std::chrono::seconds>(duration).count()); // std::chrono::duration_cast<std::chrono::seconds>(duration).count());
uint32_t fraction_u32 = static_cast<uint32_t>( // uint32_t fraction_u32 = static_cast<uint32_t>(
std::chrono::duration_cast<std::chrono::nanoseconds>(duration - seconds) // std::chrono::duration_cast<std::chrono::nanoseconds>(duration - seconds)
.count()); // .count());
report.source_ssrc = 0x00; report.source_ssrc = 0x00;
report.fraction_lost = 0; report.fraction_lost = 0;

2
src/rtp/rtp_video_sender.cpp
View File

@@ -36,8 +36,6 @@ int RtpVideoSender::SendRtpPacket(RtpPacket& rtp_packet) {
return -1; return -1;
} }
int ret = 0;
if (0 != if (0 !=
data_send_func_((const char*)rtp_packet.Buffer(), rtp_packet.Size())) { data_send_func_((const char*)rtp_packet.Buffer(), rtp_packet.Size())) {
LOG_ERROR("Send rtp packet failed"); LOG_ERROR("Send rtp packet failed");

24
src/transmission/ice_transmission.h
View File

@@ -86,6 +86,19 @@ class IceTransmission {
uint8_t CheckIsAudioPacket(const char *buffer, size_t size); uint8_t CheckIsAudioPacket(const char *buffer, size_t size);
uint8_t CheckIsDataPacket(const char *buffer, size_t size); uint8_t CheckIsDataPacket(const char *buffer, size_t size);
private:
std::string local_sdp_;
std::string remote_sdp_;
std::string local_candidates_;
std::string remote_candidates_;
unsigned int connection_id_ = 0;
bool offer_peer_;
std::string transmission_id_;
std::string user_id_;
std::string remote_user_id_;
std::string remote_ice_username_ = "";
NiceComponentState state_ = NICE_COMPONENT_STATE_DISCONNECTED;
private: private:
std::unique_ptr<IceAgent> ice_agent_ = nullptr; std::unique_ptr<IceAgent> ice_agent_ = nullptr;
std::shared_ptr<WsTransmission> ice_ws_transport_ = nullptr; std::shared_ptr<WsTransmission> ice_ws_transport_ = nullptr;
@@ -97,17 +110,6 @@ class IceTransmission {
std::function<void(const char *, size_t, const char *, size_t)> std::function<void(const char *, size_t, const char *, size_t)>
on_receive_data_ = nullptr; on_receive_data_ = nullptr;
std::function<void(std::string)> on_ice_status_change_ = nullptr; std::function<void(std::string)> on_ice_status_change_ = nullptr;
std::string local_sdp_;
std::string remote_sdp_;
std::string local_candidates_;
std::string remote_candidates_;
unsigned int connection_id_ = 0;
std::string transmission_id_ = "";
std::string user_id_ = "";
std::string remote_user_id_ = "";
bool offer_peer_ = true;
std::string remote_ice_username_ = "";
NiceComponentState state_ = NICE_COMPONENT_STATE_DISCONNECTED;
private: private:
std::unique_ptr<RtpCodec> video_rtp_codec_ = nullptr; std::unique_ptr<RtpCodec> video_rtp_codec_ = nullptr;