From 57fede95085aff34f43caf3de4c1e843c6f09634 Mon Sep 17 00:00:00 2001 From: xia-chu <771730766@qq.com> Date: Sat, 9 Aug 2025 15:42:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BC=96=E8=AF=91=E8=AD=A6?= =?UTF-8?q?=E5=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Common/MultiMediaSourceMuxer.cpp | 2 +- src/Http/HttpBody.cpp | 4 ++-- src/Record/MPEG.cpp | 2 +- src/Rtcp/Rtcp.cpp | 26 +++++++++++++------------- src/Rtcp/RtcpFCI.cpp | 10 +++++----- src/Rtsp/Rtsp.cpp | 4 ++-- srt/Ack.cpp | 2 +- srt/HSExt.cpp | 6 +++--- srt/Packet.cpp | 4 ++-- srt/PacketQueue.cpp | 4 ++-- srt/Statistic.cpp | 2 +- webrtc/RtpExt.cpp | 2 +- webrtc/Sdp.cpp | 4 ++-- 13 files changed, 36 insertions(+), 36 deletions(-) diff --git a/src/Common/MultiMediaSourceMuxer.cpp b/src/Common/MultiMediaSourceMuxer.cpp index 8a196524..01b9c1bc 100644 --- a/src/Common/MultiMediaSourceMuxer.cpp +++ b/src/Common/MultiMediaSourceMuxer.cpp @@ -177,7 +177,7 @@ static string getTrackInfoStr(const TrackSource *track_src){ break; } } - return std::move(codec_info); + return codec_info; } const ProtocolOption &MultiMediaSourceMuxer::getOption() const { diff --git a/src/Http/HttpBody.cpp b/src/Http/HttpBody.cpp index 018e3618..9c062508 100644 --- a/src/Http/HttpBody.cpp +++ b/src/Http/HttpBody.cpp @@ -296,7 +296,7 @@ Buffer::Ptr HttpFileBody::readData(size_t size) { // Data is read ret->setSize(iRead); _file_offset += iRead; - return std::move(ret); + return ret; } // 读取文件异常，文件真实长度小于声明长度 [AUTO-TRANSLATED:89d09f9b] // File reading exception, the actual length of the file is less than the declared length @@ -385,7 +385,7 @@ string HttpMultiFormBody::multiFormBodyPrefix(const HttpArgs &args, const string << "file" << "\"; filename=\"" << fileName << "\"\r\n"; body << "Content-Type: application/octet-stream\r\n\r\n"; - return std::move(body); + return body; } HttpBufferBody::HttpBufferBody(Buffer::Ptr buffer) { diff --git a/src/Record/MPEG.cpp b/src/Record/MPEG.cpp index 483cf12c..65a9dfd7 100644 --- a/src/Record/MPEG.cpp +++ b/src/Record/MPEG.cpp @@ -68,7 +68,7 @@ bool MpegMuxer::inputFrame(const Frame::Ptr &frame) { } case CodecAAC: { - CHECK(frame->prefixSize(), "Mpeg muxer required aac frame with adts heade"); + CHECK(frame->prefixSize(), "Mpeg muxer required aac frame with adts header"); } default: { diff --git a/src/Rtcp/Rtcp.cpp b/src/Rtcp/Rtcp.cpp index d9c07b29..7d44bf77 100644 --- a/src/Rtcp/Rtcp.cpp +++ b/src/Rtcp/Rtcp.cpp @@ -114,7 +114,7 @@ string RtcpHeader::dumpHeader() const { printer << "pt:" << rtcpTypeToStr((RtcpType)pt) << "\r\n"; printer << "size:" << getSize() << "\r\n"; printer << "--------\r\n"; - return std::move(printer); + return printer; } string RtcpHeader::dumpString() const { @@ -322,7 +322,7 @@ string RtcpSR::dumpString() const { printer << "---- item:" << i++ << " ----\r\n"; printer << item->dumpString(); } - return std::move(printer); + return printer; } #define CHECK_MIN_SIZE(size, kMinSize) \ @@ -385,7 +385,7 @@ string ReportItem::dumpString() const { printer << "jitter:" << jitter << "\r\n"; printer << "last_sr_stamp:" << last_sr_stamp << "\r\n"; printer << "delay_since_last_sr:" << delay_since_last_sr << "\r\n"; - return std::move(printer); + return printer; } void ReportItem::net2Host() { @@ -419,7 +419,7 @@ string RtcpRR::dumpString() const { printer << "---- item:" << i++ << " ----\r\n"; printer << item->dumpString(); } - return std::move(printer); + return printer; } void RtcpRR::net2Host(size_t size) { @@ -467,7 +467,7 @@ string SdesChunk::dumpString() const { printer << "type:" << sdesTypeToStr((SdesType)type) << "\r\n"; printer << "txt_len:" << (int)txt_len << "\r\n"; printer << "text:" << (txt_len ? string(text, txt_len) : "") << "\r\n"; - return std::move(printer); + return printer; } ///////////////////////////////////////////////////////////////////////////// @@ -506,7 +506,7 @@ string RtcpSdes::dumpString() const { printer << "---- item:" << i++ << " ----\r\n"; printer << item->dumpString(); } - return std::move(printer); + return printer; } void RtcpSdes::net2Host(size_t size) { @@ -627,7 +627,7 @@ string RtcpFB::dumpString() const { } default: /*不可达*/ assert(0); break; } - return std::move(printer); + return printer; } void RtcpFB::net2Host(size_t size) { @@ -684,7 +684,7 @@ string RtcpBye::dumpString() const { printer << "ssrc:" << *ssrc << "\r\n"; } printer << "reason:" << getReason(); - return std::move(printer); + return printer; } void RtcpBye::net2Host(size_t size) { @@ -719,7 +719,7 @@ string RtcpXRRRTR::dumpString() const { printer << "block_length : " << block_length << "\r\n"; printer << "ntp msw : " << ntpmsw << "\r\n"; printer << "ntp lsw : " << ntplsw << "\r\n"; - return std::move(printer); + return printer; } void RtcpXRRRTR::net2Host(size_t size) { @@ -743,7 +743,7 @@ string RtcpXRDLRRReportItem::dumpString() const { printer << "last RR (lrr) :" << lrr << "\r\n"; printer << "delay since last RR (dlrr): " << dlrr << "\r\n"; - return std::move(printer); + return printer; } void RtcpXRDLRRReportItem::net2Host() { @@ -774,7 +774,7 @@ string RtcpXRDLRR::dumpString() const { printer << "---- item:" << i++ << " ----\r\n"; printer << item->dumpString(); } - return std::move(printer); + return printer; } void RtcpXRDLRR::net2Host(size_t size) { @@ -809,7 +809,7 @@ string RtcpXRTargetBitrateItem::dumpString() const { printer << "Temporal Layer :" << temporal_layer << "\r\n"; printer << "Target Bitrate: " << target_bitrate << "\r\n"; - return std::move(printer); + return printer; } void RtcpXRTargetBitrateItem::net2Host() { @@ -839,7 +839,7 @@ string RtcpXRTargetBitrate::dumpString() const { printer << "---- item:" << i++ << " ----\r\n"; printer << item->dumpString(); } - return std::move(printer); + return printer; } void RtcpXRTargetBitrate::net2Host(size_t size) { diff --git a/src/Rtcp/RtcpFCI.cpp b/src/Rtcp/RtcpFCI.cpp index 64e7b390..e15732ab 100644 --- a/src/Rtcp/RtcpFCI.cpp +++ b/src/Rtcp/RtcpFCI.cpp @@ -153,7 +153,7 @@ string FCI_REMB::dumpString() const { for (auto &ssrc : ((FCI_REMB *)this)->getSSRC()) { printer << ssrc << " "; } - return std::move(printer); + return printer; } /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// @@ -208,7 +208,7 @@ string FCI_NACK::dumpString() const { } ++pid; } - return std::move(printer); + return printer; } /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// @@ -267,7 +267,7 @@ uint16_t RunLengthChunk::getRunLength() const { string RunLengthChunk::dumpString() const { _StrPrinter printer; printer << "run length chunk, symbol:" << (int)symbol << ", run length:" << getRunLength(); - return std::move(printer); + return printer; } /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// @@ -361,7 +361,7 @@ string StatusVecChunk::dumpString() const { for (auto &item : vec) { printer << (int)item << " "; } - return std::move(printer); + return printer; } /////////////////////////////////////////////////////// @@ -496,7 +496,7 @@ string FCI_TWCC::dumpString(size_t total_size) const { printer << "rtp seq:" << pr.first << ", packet status:" << (int)(pr.second.first) << ", delta:" << pr.second.second << "\n"; } - return std::move(printer); + return printer; } static void appendDeltaString(string &delta_str, FCI_TWCC::TwccPacketStatus &status, int count) { diff --git a/src/Rtsp/Rtsp.cpp b/src/Rtsp/Rtsp.cpp index 27c7eb6f..892ea5c0 100644 --- a/src/Rtsp/Rtsp.cpp +++ b/src/Rtsp/Rtsp.cpp @@ -161,7 +161,7 @@ string SdpTrack::toString(uint16_t port) const { } default: break; } - return std::move(_printer); + return _printer; } static TrackType toTrackType(const string &str) { @@ -644,7 +644,7 @@ string RtpHeader::dumpString(size_t rtp_size) const { printer << "rtp size:" << rtp_size << "\r\n"; printer << "payload offset:" << getPayloadOffset() << "\r\n"; printer << "payload size:" << getPayloadSize(rtp_size) << "\r\n"; - return std::move(printer); + return printer; } /////////////////////////////////////////////////////////////////////// diff --git a/srt/Ack.cpp b/srt/Ack.cpp index 44249cb4..a7c799b1 100644 --- a/srt/Ack.cpp +++ b/srt/Ack.cpp @@ -80,6 +80,6 @@ std::string ACKPacket::dump() { << " rtt_variance=" << rtt_variance << " pkt_recv_rate=" << pkt_recv_rate << " available_buf_size=" << available_buf_size << " estimated_link_capacity=" << estimated_link_capacity << " recv_rate=" << recv_rate; - return std::move(printer); + return printer; } } // namespace SRT \ No newline at end of file diff --git a/srt/HSExt.cpp b/srt/HSExt.cpp index 69c86c1f..826678cd 100644 --- a/srt/HSExt.cpp +++ b/srt/HSExt.cpp @@ -34,7 +34,7 @@ std::string HSExtMessage::dump() { _StrPrinter printer; printer << "srt version : " << std::hex << srt_version << " srt flag : " << std::hex << srt_flag << " recv_tsbpd_delay=" << recv_tsbpd_delay << " send_tsbpd_delay = " << send_tsbpd_delay; - return std::move(printer); + return printer; } bool HSExtMessage::storeToData() { @@ -130,7 +130,7 @@ bool HSExtStreamID::storeToData() { std::string HSExtStreamID::dump() { _StrPrinter printer; printer << " streamid : " << streamid; - return std::move(printer); + return printer; } size_t KeyMaterial::getContentSize() { @@ -263,7 +263,7 @@ std::string KeyMaterial::dump() { << " sLen : " << _slen << " salt : " << std::hex << _salt.data() << " kLen : " << _klen; - return std::move(printer); + return printer; } bool HSExtKeyMaterial::loadFromData(uint8_t *buf, size_t len) { diff --git a/srt/Packet.cpp b/srt/Packet.cpp index edfbe36d..1692d8fa 100644 --- a/srt/Packet.cpp +++ b/srt/Packet.cpp @@ -279,7 +279,7 @@ std::string HandshakePacket::dump(){ for(size_t i=0;idump()<<"\r\n"; } - return std::move(printer); + return printer; } bool HandshakePacket::loadFromData(uint8_t *buf, size_t len) { if (HEADER_SIZE + HS_CONTENT_MIN_SIZE > len) { @@ -627,7 +627,7 @@ std::string NAKPacket::dump() { for (auto it : lost_list) { printer << "[ " << it.first << " , " << it.second - 1 << " ]"; } - return std::move(printer); + return printer; } bool MsgDropReqPacket::loadFromData(uint8_t *buf, size_t len) { diff --git a/srt/PacketQueue.cpp b/srt/PacketQueue.cpp index ce1da952..ecf191dc 100644 --- a/srt/PacketQueue.cpp +++ b/srt/PacketQueue.cpp @@ -233,7 +233,7 @@ std::string PacketQueue::dump() { printer << " last:" << _pkt_map.rbegin()->second->packet_seq_number; printer << " latency:" << timeLatency() / 1e3; } - return std::move(printer); + return printer; } //////////////////// PacketRecvQueue ////////////////////////////////// @@ -395,7 +395,7 @@ std::string PacketRecvQueue::dump() { printer << " start:" << _start; printer << " end:" << _end; } - return std::move(printer); + return printer; } bool PacketRecvQueue::drop(uint32_t first, uint32_t last, std::list &out) { uint32_t diff = 0; diff --git a/srt/Statistic.cpp b/srt/Statistic.cpp index 139e39b8..3f4f7e52 100644 --- a/srt/Statistic.cpp +++ b/srt/Statistic.cpp @@ -91,7 +91,7 @@ std::string PacketRecvRateContext::dump(){ } printer <<"\r\n"; - return std::move(printer); + return printer; } EstimatedLinkCapacityContext::EstimatedLinkCapacityContext(TimePoint start) : _start(start) { for (size_t i = 0; i < SIZE; i++) { diff --git a/webrtc/RtpExt.cpp b/webrtc/RtpExt.cpp index 935075bd..4c0deb29 100644 --- a/webrtc/RtpExt.cpp +++ b/webrtc/RtpExt.cpp @@ -298,7 +298,7 @@ string RtpExt::dumpString() const { break; } } - return std::move(printer); + return printer; } //https://tools.ietf.org/html/rfc6464 diff --git a/webrtc/Sdp.cpp b/webrtc/Sdp.cpp index b23969c1..40fe8e46 100644 --- a/webrtc/Sdp.cpp +++ b/webrtc/Sdp.cpp @@ -174,7 +174,7 @@ string RtcSdpBase::toString() const { for (auto &item : items) { printer << item->getKey() << "=" << item->toString() << "\r\n"; } - return std::move(printer); + return printer; } RtpDirection RtcSdpBase::getDirection() const { @@ -307,7 +307,7 @@ string RtcSessionSdp::toString() const { printer << media.toString(); } - return std::move(printer); + return printer; } //////////////////////////////////////////////////////////////////////////////////////////