From 0b80124b3c9751c72382adc838a53ac5a2f47db9 Mon Sep 17 00:00:00 2001 From: dijunkun Date: Wed, 13 Dec 2023 17:23:20 +0800 Subject: [PATCH] Fix unused variables warnning --- README.md | 7 ++++++ src/frame/audio_frame.h | 2 +- src/frame/video_frame.h | 6 ++--- src/media/audio/encode/audio_encoder.cpp | 2 -- .../decode/ffmpeg/ffmpeg_video_decoder.cpp | 16 ++++++------- .../decode/openh264/openh264_decoder.cpp | 7 +++--- .../encode/openh264/openh264_encoder.cpp | 1 - src/pc/peer_connection.cpp | 11 ++++----- src/pc/peer_connection.h | 5 ++-- src/rtc/x_inner.cpp | 8 ++----- src/rtcp/rtcp_receiver_report.cpp | 4 ++-- src/rtp/rtp_audio_receiver.cpp | 16 +++++++------ src/rtp/rtp_audio_sender.cpp | 2 -- src/rtp/rtp_data_receiver.cpp | 16 +++++++------ src/rtp/rtp_data_sender.cpp | 2 -- src/rtp/rtp_packet.h | 4 ++-- src/rtp/rtp_video_receiver.cpp | 14 +++++------ src/rtp/rtp_video_sender.cpp | 2 -- src/transmission/ice_transmission.h | 24 ++++++++++--------- 19 files changed, 73 insertions(+), 76 deletions(-) diff --git a/README.md b/README.md index 1469c4a..d48e44c 100644 --- a/README.md +++ b/README.md @@ -11,6 +11,13 @@ sudo apt-get install nvidia-cuda-toolkit solve 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 diff --git a/src/frame/audio_frame.h b/src/frame/audio_frame.h index 3ad4a6b..dc5cc8e 100644 --- a/src/frame/audio_frame.h +++ b/src/frame/audio_frame.h @@ -25,7 +25,7 @@ class AudioFrame { public: const uint8_t *Buffer() { return buffer_; } - const size_t Size() { return size_; } + size_t Size() { return size_; } uint8_t *GetBuffer() { return buffer_; } diff --git a/src/frame/video_frame.h b/src/frame/video_frame.h index de55742..c4a1ffd 100644 --- a/src/frame/video_frame.h +++ b/src/frame/video_frame.h @@ -25,15 +25,15 @@ class VideoFrame { public: const uint8_t *Buffer() { return buffer_; } - const size_t Size() { return size_; } + size_t Size() { return size_; } uint8_t *GetBuffer() { return buffer_; } private: - size_t width_ = 0; - size_t height_ = 0; uint8_t *buffer_ = nullptr; size_t size_ = 0; + size_t width_ = 0; + size_t height_ = 0; }; #endif \ No newline at end of file diff --git a/src/media/audio/encode/audio_encoder.cpp b/src/media/audio/encode/audio_encoder.cpp index 104a5d4..4638009 100644 --- a/src/media/audio/encode/audio_encoder.cpp +++ b/src/media/audio/encode/audio_encoder.cpp @@ -29,8 +29,6 @@ int AudioEncoder::Init() { std::chrono::high_resolution_clock::now().time_since_epoch()) .count()); 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_APPLICATION_VOIP, &err); diff --git a/src/media/video/decode/ffmpeg/ffmpeg_video_decoder.cpp b/src/media/video/decode/ffmpeg/ffmpeg_video_decoder.cpp index a5be277..9d0d977 100644 --- a/src/media/video/decode/ffmpeg/ffmpeg_video_decoder.cpp +++ b/src/media/video/decode/ffmpeg/ffmpeg_video_decoder.cpp @@ -125,10 +125,10 @@ int FfmpegVideoDecoder::Decode( } if (on_receive_decoded_frame) { - uint64_t start_ts = static_cast( - std::chrono::duration_cast( - std::chrono::high_resolution_clock::now().time_since_epoch()) - .count()); + // uint64_t start_ts = static_cast( + // std::chrono::duration_cast( + // std::chrono::high_resolution_clock::now().time_since_epoch()) + // .count()); if (1) { 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); } - uint64_t now_ts = static_cast( - std::chrono::duration_cast( - std::chrono::high_resolution_clock::now().time_since_epoch()) - .count()); + // uint64_t now_ts = static_cast( + // std::chrono::duration_cast( + // std::chrono::high_resolution_clock::now().time_since_epoch()) + // .count()); // LOG_ERROR("cost {}", now_ts - start_ts); diff --git a/src/media/video/decode/openh264/openh264_decoder.cpp b/src/media/video/decode/openh264/openh264_decoder.cpp index c235997..e91f9bf 100644 --- a/src/media/video/decode/openh264/openh264_decoder.cpp +++ b/src/media/video/decode/openh264/openh264_decoder.cpp @@ -133,7 +133,7 @@ int OpenH264Decoder::Init() { sDecParam.eEcActiveIdc = ERROR_CON_SLICE_COPY; sDecParam.sVideoProperty.eVideoBsType = VIDEO_BITSTREAM_DEFAULT; - int32_t iRet = openh264_decoder_->Initialize(&sDecParam); + openh264_decoder_->Initialize(&sDecParam); int trace_level = WELS_LOG_QUIET; openh264_decoder_->SetOption(DECODER_OPTION_TRACE_LEVEL, &trace_level); @@ -156,11 +156,10 @@ int OpenH264Decoder::Decode( // LOG_WARN("Receive key frame"); } - SBufferInfo sDstBufInfo = {0}; + SBufferInfo sDstBufInfo; memset(&sDstBufInfo, 0, sizeof(SBufferInfo)); - int iRet = openh264_decoder_->DecodeFrameNoDelay(data, size, yuv_data_, - &sDstBufInfo); + openh264_decoder_->DecodeFrameNoDelay(data, size, yuv_data_, &sDstBufInfo); if (sDstBufInfo.iBufferStatus == 1) { if (on_receive_decoded_frame) { diff --git a/src/media/video/encode/openh264/openh264_encoder.cpp b/src/media/video/encode/openh264/openh264_encoder.cpp index b3ff5e8..fc7ceb8 100644 --- a/src/media/video/encode/openh264/openh264_encoder.cpp +++ b/src/media/video/encode/openh264/openh264_encoder.cpp @@ -206,7 +206,6 @@ int OpenH264Encoder::Encode( } } - const uint8_t start_code[4] = {0, 0, 0, 1}; size_t frag = 0; int encoded_frame_size = 0; for (int layer = 0; layer < info.iLayerNum; ++layer) { diff --git a/src/pc/peer_connection.cpp b/src/pc/peer_connection.cpp index 74bd3b8..cf98676 100644 --- a/src/pc/peer_connection.cpp +++ b/src/pc/peer_connection.cpp @@ -167,9 +167,10 @@ int PeerConnection::Init(PeerConnectionParams params, } int PeerConnection::CreateVideoCodec(bool hardware_acceleration) { + hardware_acceleration_ = hardware_acceleration; #ifdef __APPLE__ - if (hardware_acceleration) { - hardware_acceleration = false; + if (hardware_acceleration_) { + hardware_acceleration_ = false; LOG_WARN( "MacOS not support hardware acceleration, use default software codec"); } @@ -238,8 +239,7 @@ int PeerConnection::CreateAudioCodec() { return 0; } -int PeerConnection::Create(PeerConnectionParams params, - const std::string &transmission_id, +int PeerConnection::Create(const std::string &transmission_id, const std::string &password) { if (SignalStatus::SignalConnected != GetSignalStatus()) { LOG_ERROR("Signal not connected"); @@ -263,8 +263,7 @@ int PeerConnection::Create(PeerConnectionParams params, return ret; } -int PeerConnection::Join(PeerConnectionParams params, - const std::string &transmission_id, +int PeerConnection::Join(const std::string &transmission_id, const std::string &password) { if (SignalStatus::SignalConnected != GetSignalStatus()) { LOG_ERROR("Signal not connected"); diff --git a/src/pc/peer_connection.h b/src/pc/peer_connection.h index 6942708..d0c8873 100644 --- a/src/pc/peer_connection.h +++ b/src/pc/peer_connection.h @@ -40,11 +40,10 @@ class PeerConnection { public: int Init(PeerConnectionParams params, const std::string &user_id); - int Create(PeerConnectionParams params, - const std::string &transmission_id = "", + int Create(const std::string &transmission_id = "", const std::string &password = ""); - int Join(PeerConnectionParams params, const std::string &transmission_id, + int Join(const std::string &transmission_id, const std::string &password = ""); int Leave(); diff --git a/src/rtc/x_inner.cpp b/src/rtc/x_inner.cpp index 28247a5..28afa2b 100644 --- a/src/rtc/x_inner.cpp +++ b/src/rtc/x_inner.cpp @@ -10,8 +10,6 @@ using nlohmann::json; -static PeerConnection *peer_connection; - PeerPtr *CreatePeer(const Params *params) { PeerPtr *peer_ptr = new PeerPtr; 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, password); - return peer_ptr->peer_connection->Create(peer_ptr->pc_params, transmission_id, - password); + return peer_ptr->peer_connection->Create(transmission_id, password); } int JoinConnection(PeerPtr *peer_ptr, const char *transmission_id, @@ -57,8 +54,7 @@ int JoinConnection(PeerPtr *peer_ptr, const char *transmission_id, return -1; } - peer_ptr->peer_connection->Join(peer_ptr->pc_params, transmission_id, - password); + peer_ptr->peer_connection->Join(transmission_id, password); LOG_INFO("JoinConnection[{}] with password [{}]", transmission_id, password); return 0; } diff --git a/src/rtcp/rtcp_receiver_report.cpp b/src/rtcp/rtcp_receiver_report.cpp index 8548721..66f09e6 100644 --- a/src/rtcp/rtcp_receiver_report.cpp +++ b/src/rtcp/rtcp_receiver_report.cpp @@ -24,8 +24,8 @@ void RtcpReceiverReport::SetReportBlock( } const uint8_t *RtcpReceiverReport::Encode() { - int pos = rtcp_header_.Encode(DEFAULT_RTCP_VERSION, 0, DEFAULT_RR_BLOCK_NUM, - RTCP_TYPE::RR, DEFAULT_RR_SIZE, buffer_); + rtcp_header_.Encode(DEFAULT_RTCP_VERSION, 0, DEFAULT_RR_BLOCK_NUM, + RTCP_TYPE::RR, DEFAULT_RR_SIZE, buffer_); return buffer_; } \ No newline at end of file diff --git a/src/rtp/rtp_audio_receiver.cpp b/src/rtp/rtp_audio_receiver.cpp index c381173..6d56f3a 100644 --- a/src/rtp/rtp_audio_receiver.cpp +++ b/src/rtp/rtp_audio_receiver.cpp @@ -24,14 +24,16 @@ void RtpAudioReceiver::InsertRtpPacket(RtpPacket& rtp_packet) { RtcpReceiverReport rtcp_rr; RtcpReportBlock report; - auto duration = std::chrono::system_clock::now().time_since_epoch(); - auto seconds = std::chrono::duration_cast(duration); - uint32_t seconds_u32 = static_cast( - std::chrono::duration_cast(duration).count()); + // auto duration = std::chrono::system_clock::now().time_since_epoch(); + // auto seconds = + // std::chrono::duration_cast(duration); uint32_t + // seconds_u32 = static_cast( + // std::chrono::duration_cast(duration).count()); - uint32_t fraction_u32 = static_cast( - std::chrono::duration_cast(duration - seconds) - .count()); + // uint32_t fraction_u32 = static_cast( + // std::chrono::duration_cast(duration - + // seconds) + // .count()); report.source_ssrc = 0x00; report.fraction_lost = 0; diff --git a/src/rtp/rtp_audio_sender.cpp b/src/rtp/rtp_audio_sender.cpp index f90fff7..27a481f 100644 --- a/src/rtp/rtp_audio_sender.cpp +++ b/src/rtp/rtp_audio_sender.cpp @@ -36,8 +36,6 @@ int RtpAudioSender::SendRtpPacket(RtpPacket& rtp_packet) { return -1; } - int ret = 0; - if (0 != data_send_func_((const char*)rtp_packet.Buffer(), rtp_packet.Size())) { LOG_ERROR("Send rtp packet failed"); diff --git a/src/rtp/rtp_data_receiver.cpp b/src/rtp/rtp_data_receiver.cpp index 2185fd2..92e0bd4 100644 --- a/src/rtp/rtp_data_receiver.cpp +++ b/src/rtp/rtp_data_receiver.cpp @@ -24,14 +24,16 @@ void RtpDataReceiver::InsertRtpPacket(RtpPacket& rtp_packet) { RtcpReceiverReport rtcp_rr; RtcpReportBlock report; - auto duration = std::chrono::system_clock::now().time_since_epoch(); - auto seconds = std::chrono::duration_cast(duration); - uint32_t seconds_u32 = static_cast( - std::chrono::duration_cast(duration).count()); + // auto duration = std::chrono::system_clock::now().time_since_epoch(); + // auto seconds = + // std::chrono::duration_cast(duration); uint32_t + // seconds_u32 = static_cast( + // std::chrono::duration_cast(duration).count()); - uint32_t fraction_u32 = static_cast( - std::chrono::duration_cast(duration - seconds) - .count()); + // uint32_t fraction_u32 = static_cast( + // std::chrono::duration_cast(duration - + // seconds) + // .count()); report.source_ssrc = 0x00; report.fraction_lost = 0; diff --git a/src/rtp/rtp_data_sender.cpp b/src/rtp/rtp_data_sender.cpp index 767f1bd..842505b 100644 --- a/src/rtp/rtp_data_sender.cpp +++ b/src/rtp/rtp_data_sender.cpp @@ -36,8 +36,6 @@ int RtpDataSender::SendRtpPacket(RtpPacket& rtp_packet) { return -1; } - int ret = 0; - if (0 != data_send_func_((const char*)rtp_packet.Buffer(), rtp_packet.Size())) { LOG_ERROR("Send rtp packet failed"); diff --git a/src/rtp/rtp_packet.h b/src/rtp/rtp_packet.h index d9e8eb6..e243176 100644 --- a/src/rtp/rtp_packet.h +++ b/src/rtp/rtp_packet.h @@ -258,9 +258,9 @@ class RtpPacket { 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 const uint8_t *Payload() { diff --git a/src/rtp/rtp_video_receiver.cpp b/src/rtp/rtp_video_receiver.cpp index 5ca7fea..8b0fda3 100644 --- a/src/rtp/rtp_video_receiver.cpp +++ b/src/rtp/rtp_video_receiver.cpp @@ -27,14 +27,14 @@ void RtpVideoReceiver::InsertRtpPacket(RtpPacket& rtp_packet) { RtcpReceiverReport rtcp_rr; RtcpReportBlock report; - auto duration = std::chrono::system_clock::now().time_since_epoch(); - auto seconds = std::chrono::duration_cast(duration); - uint32_t seconds_u32 = static_cast( - std::chrono::duration_cast(duration).count()); + // auto duration = std::chrono::system_clock::now().time_since_epoch(); + // auto seconds = std::chrono::duration_cast(duration); + // uint32_t seconds_u32 = static_cast( + // std::chrono::duration_cast(duration).count()); - uint32_t fraction_u32 = static_cast( - std::chrono::duration_cast(duration - seconds) - .count()); + // uint32_t fraction_u32 = static_cast( + // std::chrono::duration_cast(duration - seconds) + // .count()); report.source_ssrc = 0x00; report.fraction_lost = 0; diff --git a/src/rtp/rtp_video_sender.cpp b/src/rtp/rtp_video_sender.cpp index 9484022..062845d 100644 --- a/src/rtp/rtp_video_sender.cpp +++ b/src/rtp/rtp_video_sender.cpp @@ -36,8 +36,6 @@ int RtpVideoSender::SendRtpPacket(RtpPacket& rtp_packet) { return -1; } - int ret = 0; - if (0 != data_send_func_((const char*)rtp_packet.Buffer(), rtp_packet.Size())) { LOG_ERROR("Send rtp packet failed"); diff --git a/src/transmission/ice_transmission.h b/src/transmission/ice_transmission.h index df24915..d0eeb08 100644 --- a/src/transmission/ice_transmission.h +++ b/src/transmission/ice_transmission.h @@ -86,6 +86,19 @@ class IceTransmission { uint8_t CheckIsAudioPacket(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: std::unique_ptr ice_agent_ = nullptr; std::shared_ptr ice_ws_transport_ = nullptr; @@ -97,17 +110,6 @@ class IceTransmission { std::function on_receive_data_ = nullptr; std::function 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: std::unique_ptr video_rtp_codec_ = nullptr;