weiai/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2026-03-23 14:30:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复编译警告

Browse Source
This commit is contained in:
xia-chu
2025-08-09 15:42:28 +08:00
parent d2e099bd23
commit 57fede9508
13 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Common/MultiMediaSourceMuxer.cpp
View File

@@ -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 {

4
src/Http/HttpBody.cpp
View File

@@ -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) {

2
src/Record/MPEG.cpp
View File

@@ -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: {

26
src/Rtcp/Rtcp.cpp
View File

@@ -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) {

10
src/Rtcp/RtcpFCI.cpp
View File

@@ -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) {

4
src/Rtsp/Rtsp.cpp
View File

@@ -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;
}
///////////////////////////////////////////////////////////////////////

2
srt/Ack.cpp
View File

@@ -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

6
srt/HSExt.cpp
View File

@@ -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) {

4
srt/Packet.cpp
View File

@@ -279,7 +279,7 @@ std::string HandshakePacket::dump(){
for(size_t i=0;i<ext_list.size();++i){
printer<<ext_list[i]->dump()<<"\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) {

4
srt/PacketQueue.cpp
View File

@@ -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<DataPacket::Ptr> &out) {
uint32_t diff = 0;

2
srt/Statistic.cpp
View File

@@ -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++) {

2
webrtc/RtpExt.cpp
View File

@@ -298,7 +298,7 @@ string RtpExt::dumpString() const {
break;
}
}
return std::move(printer);
return printer;
}
//https://tools.ietf.org/html/rfc6464

4
webrtc/Sdp.cpp
View File

@@ -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;
}
//////////////////////////////////////////////////////////////////////////////////////////