mirror of
https://gitee.com/xia-chu/ZLMediaKit.git
synced 2026-05-20 00:37:49 +08:00
修复编译警告
Some checks are pending
Android / build (push) Waiting to run
CodeQL / Analyze (cpp) (push) Waiting to run
CodeQL / Analyze (javascript) (push) Waiting to run
Docker / build (push) Waiting to run
Linux / build (push) Waiting to run
macOS / build (push) Waiting to run
Windows / build (push) Waiting to run
Some checks are pending
Android / build (push) Waiting to run
CodeQL / Analyze (cpp) (push) Waiting to run
CodeQL / Analyze (javascript) (push) Waiting to run
Docker / build (push) Waiting to run
Linux / build (push) Waiting to run
macOS / build (push) Waiting to run
Windows / build (push) Waiting to run
This commit is contained in:
parent
d2e099bd23
commit
57fede9508
@ -177,7 +177,7 @@ static string getTrackInfoStr(const TrackSource *track_src){
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return std::move(codec_info);
|
return codec_info;
|
||||||
}
|
}
|
||||||
|
|
||||||
const ProtocolOption &MultiMediaSourceMuxer::getOption() const {
|
const ProtocolOption &MultiMediaSourceMuxer::getOption() const {
|
||||||
|
|||||||
@ -296,7 +296,7 @@ Buffer::Ptr HttpFileBody::readData(size_t size) {
|
|||||||
// Data is read
|
// Data is read
|
||||||
ret->setSize(iRead);
|
ret->setSize(iRead);
|
||||||
_file_offset += iRead;
|
_file_offset += iRead;
|
||||||
return std::move(ret);
|
return ret;
|
||||||
}
|
}
|
||||||
// 读取文件异常,文件真实长度小于声明长度 [AUTO-TRANSLATED:89d09f9b]
|
// 读取文件异常,文件真实长度小于声明长度 [AUTO-TRANSLATED:89d09f9b]
|
||||||
// File reading exception, the actual length of the file is less than the declared length
|
// 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"
|
<< "file"
|
||||||
<< "\"; filename=\"" << fileName << "\"\r\n";
|
<< "\"; filename=\"" << fileName << "\"\r\n";
|
||||||
body << "Content-Type: application/octet-stream\r\n\r\n";
|
body << "Content-Type: application/octet-stream\r\n\r\n";
|
||||||
return std::move(body);
|
return body;
|
||||||
}
|
}
|
||||||
|
|
||||||
HttpBufferBody::HttpBufferBody(Buffer::Ptr buffer) {
|
HttpBufferBody::HttpBufferBody(Buffer::Ptr buffer) {
|
||||||
|
|||||||
@ -68,7 +68,7 @@ bool MpegMuxer::inputFrame(const Frame::Ptr &frame) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
case CodecAAC: {
|
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: {
|
default: {
|
||||||
|
|||||||
@ -114,7 +114,7 @@ string RtcpHeader::dumpHeader() const {
|
|||||||
printer << "pt:" << rtcpTypeToStr((RtcpType)pt) << "\r\n";
|
printer << "pt:" << rtcpTypeToStr((RtcpType)pt) << "\r\n";
|
||||||
printer << "size:" << getSize() << "\r\n";
|
printer << "size:" << getSize() << "\r\n";
|
||||||
printer << "--------\r\n";
|
printer << "--------\r\n";
|
||||||
return std::move(printer);
|
return printer;
|
||||||
}
|
}
|
||||||
|
|
||||||
string RtcpHeader::dumpString() const {
|
string RtcpHeader::dumpString() const {
|
||||||
@ -322,7 +322,7 @@ string RtcpSR::dumpString() const {
|
|||||||
printer << "---- item:" << i++ << " ----\r\n";
|
printer << "---- item:" << i++ << " ----\r\n";
|
||||||
printer << item->dumpString();
|
printer << item->dumpString();
|
||||||
}
|
}
|
||||||
return std::move(printer);
|
return printer;
|
||||||
}
|
}
|
||||||
|
|
||||||
#define CHECK_MIN_SIZE(size, kMinSize) \
|
#define CHECK_MIN_SIZE(size, kMinSize) \
|
||||||
@ -385,7 +385,7 @@ string ReportItem::dumpString() const {
|
|||||||
printer << "jitter:" << jitter << "\r\n";
|
printer << "jitter:" << jitter << "\r\n";
|
||||||
printer << "last_sr_stamp:" << last_sr_stamp << "\r\n";
|
printer << "last_sr_stamp:" << last_sr_stamp << "\r\n";
|
||||||
printer << "delay_since_last_sr:" << delay_since_last_sr << "\r\n";
|
printer << "delay_since_last_sr:" << delay_since_last_sr << "\r\n";
|
||||||
return std::move(printer);
|
return printer;
|
||||||
}
|
}
|
||||||
|
|
||||||
void ReportItem::net2Host() {
|
void ReportItem::net2Host() {
|
||||||
@ -419,7 +419,7 @@ string RtcpRR::dumpString() const {
|
|||||||
printer << "---- item:" << i++ << " ----\r\n";
|
printer << "---- item:" << i++ << " ----\r\n";
|
||||||
printer << item->dumpString();
|
printer << item->dumpString();
|
||||||
}
|
}
|
||||||
return std::move(printer);
|
return printer;
|
||||||
}
|
}
|
||||||
|
|
||||||
void RtcpRR::net2Host(size_t size) {
|
void RtcpRR::net2Host(size_t size) {
|
||||||
@ -467,7 +467,7 @@ string SdesChunk::dumpString() const {
|
|||||||
printer << "type:" << sdesTypeToStr((SdesType)type) << "\r\n";
|
printer << "type:" << sdesTypeToStr((SdesType)type) << "\r\n";
|
||||||
printer << "txt_len:" << (int)txt_len << "\r\n";
|
printer << "txt_len:" << (int)txt_len << "\r\n";
|
||||||
printer << "text:" << (txt_len ? string(text, 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:" << i++ << " ----\r\n";
|
||||||
printer << item->dumpString();
|
printer << item->dumpString();
|
||||||
}
|
}
|
||||||
return std::move(printer);
|
return printer;
|
||||||
}
|
}
|
||||||
|
|
||||||
void RtcpSdes::net2Host(size_t size) {
|
void RtcpSdes::net2Host(size_t size) {
|
||||||
@ -627,7 +627,7 @@ string RtcpFB::dumpString() const {
|
|||||||
}
|
}
|
||||||
default: /*不可达*/ assert(0); break;
|
default: /*不可达*/ assert(0); break;
|
||||||
}
|
}
|
||||||
return std::move(printer);
|
return printer;
|
||||||
}
|
}
|
||||||
|
|
||||||
void RtcpFB::net2Host(size_t size) {
|
void RtcpFB::net2Host(size_t size) {
|
||||||
@ -684,7 +684,7 @@ string RtcpBye::dumpString() const {
|
|||||||
printer << "ssrc:" << *ssrc << "\r\n";
|
printer << "ssrc:" << *ssrc << "\r\n";
|
||||||
}
|
}
|
||||||
printer << "reason:" << getReason();
|
printer << "reason:" << getReason();
|
||||||
return std::move(printer);
|
return printer;
|
||||||
}
|
}
|
||||||
|
|
||||||
void RtcpBye::net2Host(size_t size) {
|
void RtcpBye::net2Host(size_t size) {
|
||||||
@ -719,7 +719,7 @@ string RtcpXRRRTR::dumpString() const {
|
|||||||
printer << "block_length : " << block_length << "\r\n";
|
printer << "block_length : " << block_length << "\r\n";
|
||||||
printer << "ntp msw : " << ntpmsw << "\r\n";
|
printer << "ntp msw : " << ntpmsw << "\r\n";
|
||||||
printer << "ntp lsw : " << ntplsw << "\r\n";
|
printer << "ntp lsw : " << ntplsw << "\r\n";
|
||||||
return std::move(printer);
|
return printer;
|
||||||
}
|
}
|
||||||
|
|
||||||
void RtcpXRRRTR::net2Host(size_t size) {
|
void RtcpXRRRTR::net2Host(size_t size) {
|
||||||
@ -743,7 +743,7 @@ string RtcpXRDLRRReportItem::dumpString() const {
|
|||||||
printer << "last RR (lrr) :" << lrr << "\r\n";
|
printer << "last RR (lrr) :" << lrr << "\r\n";
|
||||||
printer << "delay since last RR (dlrr): " << dlrr << "\r\n";
|
printer << "delay since last RR (dlrr): " << dlrr << "\r\n";
|
||||||
|
|
||||||
return std::move(printer);
|
return printer;
|
||||||
}
|
}
|
||||||
|
|
||||||
void RtcpXRDLRRReportItem::net2Host() {
|
void RtcpXRDLRRReportItem::net2Host() {
|
||||||
@ -774,7 +774,7 @@ string RtcpXRDLRR::dumpString() const {
|
|||||||
printer << "---- item:" << i++ << " ----\r\n";
|
printer << "---- item:" << i++ << " ----\r\n";
|
||||||
printer << item->dumpString();
|
printer << item->dumpString();
|
||||||
}
|
}
|
||||||
return std::move(printer);
|
return printer;
|
||||||
}
|
}
|
||||||
|
|
||||||
void RtcpXRDLRR::net2Host(size_t size) {
|
void RtcpXRDLRR::net2Host(size_t size) {
|
||||||
@ -809,7 +809,7 @@ string RtcpXRTargetBitrateItem::dumpString() const {
|
|||||||
printer << "Temporal Layer :" << temporal_layer << "\r\n";
|
printer << "Temporal Layer :" << temporal_layer << "\r\n";
|
||||||
printer << "Target Bitrate: " << target_bitrate << "\r\n";
|
printer << "Target Bitrate: " << target_bitrate << "\r\n";
|
||||||
|
|
||||||
return std::move(printer);
|
return printer;
|
||||||
}
|
}
|
||||||
|
|
||||||
void RtcpXRTargetBitrateItem::net2Host() {
|
void RtcpXRTargetBitrateItem::net2Host() {
|
||||||
@ -839,7 +839,7 @@ string RtcpXRTargetBitrate::dumpString() const {
|
|||||||
printer << "---- item:" << i++ << " ----\r\n";
|
printer << "---- item:" << i++ << " ----\r\n";
|
||||||
printer << item->dumpString();
|
printer << item->dumpString();
|
||||||
}
|
}
|
||||||
return std::move(printer);
|
return printer;
|
||||||
}
|
}
|
||||||
|
|
||||||
void RtcpXRTargetBitrate::net2Host(size_t size) {
|
void RtcpXRTargetBitrate::net2Host(size_t size) {
|
||||||
|
|||||||
@ -153,7 +153,7 @@ string FCI_REMB::dumpString() const {
|
|||||||
for (auto &ssrc : ((FCI_REMB *)this)->getSSRC()) {
|
for (auto &ssrc : ((FCI_REMB *)this)->getSSRC()) {
|
||||||
printer << ssrc << " ";
|
printer << ssrc << " ";
|
||||||
}
|
}
|
||||||
return std::move(printer);
|
return printer;
|
||||||
}
|
}
|
||||||
|
|
||||||
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||||
@ -208,7 +208,7 @@ string FCI_NACK::dumpString() const {
|
|||||||
}
|
}
|
||||||
++pid;
|
++pid;
|
||||||
}
|
}
|
||||||
return std::move(printer);
|
return printer;
|
||||||
}
|
}
|
||||||
|
|
||||||
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||||
@ -267,7 +267,7 @@ uint16_t RunLengthChunk::getRunLength() const {
|
|||||||
string RunLengthChunk::dumpString() const {
|
string RunLengthChunk::dumpString() const {
|
||||||
_StrPrinter printer;
|
_StrPrinter printer;
|
||||||
printer << "run length chunk, symbol:" << (int)symbol << ", run length:" << getRunLength();
|
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) {
|
for (auto &item : vec) {
|
||||||
printer << (int)item << " ";
|
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)
|
printer << "rtp seq:" << pr.first << ", packet status:" << (int)(pr.second.first)
|
||||||
<< ", delta:" << pr.second.second << "\n";
|
<< ", delta:" << pr.second.second << "\n";
|
||||||
}
|
}
|
||||||
return std::move(printer);
|
return printer;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void appendDeltaString(string &delta_str, FCI_TWCC::TwccPacketStatus &status, int count) {
|
static void appendDeltaString(string &delta_str, FCI_TWCC::TwccPacketStatus &status, int count) {
|
||||||
|
|||||||
@ -161,7 +161,7 @@ string SdpTrack::toString(uint16_t port) const {
|
|||||||
}
|
}
|
||||||
default: break;
|
default: break;
|
||||||
}
|
}
|
||||||
return std::move(_printer);
|
return _printer;
|
||||||
}
|
}
|
||||||
|
|
||||||
static TrackType toTrackType(const string &str) {
|
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 << "rtp size:" << rtp_size << "\r\n";
|
||||||
printer << "payload offset:" << getPayloadOffset() << "\r\n";
|
printer << "payload offset:" << getPayloadOffset() << "\r\n";
|
||||||
printer << "payload size:" << getPayloadSize(rtp_size) << "\r\n";
|
printer << "payload size:" << getPayloadSize(rtp_size) << "\r\n";
|
||||||
return std::move(printer);
|
return printer;
|
||||||
}
|
}
|
||||||
|
|
||||||
///////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////
|
||||||
|
|||||||
@ -80,6 +80,6 @@ std::string ACKPacket::dump() {
|
|||||||
<< " rtt_variance=" << rtt_variance << " pkt_recv_rate=" << pkt_recv_rate
|
<< " rtt_variance=" << rtt_variance << " pkt_recv_rate=" << pkt_recv_rate
|
||||||
<< " available_buf_size=" << available_buf_size << " estimated_link_capacity=" << estimated_link_capacity
|
<< " available_buf_size=" << available_buf_size << " estimated_link_capacity=" << estimated_link_capacity
|
||||||
<< " recv_rate=" << recv_rate;
|
<< " recv_rate=" << recv_rate;
|
||||||
return std::move(printer);
|
return printer;
|
||||||
}
|
}
|
||||||
} // namespace SRT
|
} // namespace SRT
|
||||||
@ -34,7 +34,7 @@ std::string HSExtMessage::dump() {
|
|||||||
_StrPrinter printer;
|
_StrPrinter printer;
|
||||||
printer << "srt version : " << std::hex << srt_version << " srt flag : " << std::hex << srt_flag
|
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;
|
<< " recv_tsbpd_delay=" << recv_tsbpd_delay << " send_tsbpd_delay = " << send_tsbpd_delay;
|
||||||
return std::move(printer);
|
return printer;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool HSExtMessage::storeToData() {
|
bool HSExtMessage::storeToData() {
|
||||||
@ -130,7 +130,7 @@ bool HSExtStreamID::storeToData() {
|
|||||||
std::string HSExtStreamID::dump() {
|
std::string HSExtStreamID::dump() {
|
||||||
_StrPrinter printer;
|
_StrPrinter printer;
|
||||||
printer << " streamid : " << streamid;
|
printer << " streamid : " << streamid;
|
||||||
return std::move(printer);
|
return printer;
|
||||||
}
|
}
|
||||||
|
|
||||||
size_t KeyMaterial::getContentSize() {
|
size_t KeyMaterial::getContentSize() {
|
||||||
@ -263,7 +263,7 @@ std::string KeyMaterial::dump() {
|
|||||||
<< " sLen : " << _slen
|
<< " sLen : " << _slen
|
||||||
<< " salt : " << std::hex << _salt.data()
|
<< " salt : " << std::hex << _salt.data()
|
||||||
<< " kLen : " << _klen;
|
<< " kLen : " << _klen;
|
||||||
return std::move(printer);
|
return printer;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool HSExtKeyMaterial::loadFromData(uint8_t *buf, size_t len) {
|
bool HSExtKeyMaterial::loadFromData(uint8_t *buf, size_t len) {
|
||||||
|
|||||||
@ -279,7 +279,7 @@ std::string HandshakePacket::dump(){
|
|||||||
for(size_t i=0;i<ext_list.size();++i){
|
for(size_t i=0;i<ext_list.size();++i){
|
||||||
printer<<ext_list[i]->dump()<<"\r\n";
|
printer<<ext_list[i]->dump()<<"\r\n";
|
||||||
}
|
}
|
||||||
return std::move(printer);
|
return printer;
|
||||||
}
|
}
|
||||||
bool HandshakePacket::loadFromData(uint8_t *buf, size_t len) {
|
bool HandshakePacket::loadFromData(uint8_t *buf, size_t len) {
|
||||||
if (HEADER_SIZE + HS_CONTENT_MIN_SIZE > len) {
|
if (HEADER_SIZE + HS_CONTENT_MIN_SIZE > len) {
|
||||||
@ -627,7 +627,7 @@ std::string NAKPacket::dump() {
|
|||||||
for (auto it : lost_list) {
|
for (auto it : lost_list) {
|
||||||
printer << "[ " << it.first << " , " << it.second - 1 << " ]";
|
printer << "[ " << it.first << " , " << it.second - 1 << " ]";
|
||||||
}
|
}
|
||||||
return std::move(printer);
|
return printer;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool MsgDropReqPacket::loadFromData(uint8_t *buf, size_t len) {
|
bool MsgDropReqPacket::loadFromData(uint8_t *buf, size_t len) {
|
||||||
|
|||||||
@ -233,7 +233,7 @@ std::string PacketQueue::dump() {
|
|||||||
printer << " last:" << _pkt_map.rbegin()->second->packet_seq_number;
|
printer << " last:" << _pkt_map.rbegin()->second->packet_seq_number;
|
||||||
printer << " latency:" << timeLatency() / 1e3;
|
printer << " latency:" << timeLatency() / 1e3;
|
||||||
}
|
}
|
||||||
return std::move(printer);
|
return printer;
|
||||||
}
|
}
|
||||||
|
|
||||||
//////////////////// PacketRecvQueue //////////////////////////////////
|
//////////////////// PacketRecvQueue //////////////////////////////////
|
||||||
@ -395,7 +395,7 @@ std::string PacketRecvQueue::dump() {
|
|||||||
printer << " start:" << _start;
|
printer << " start:" << _start;
|
||||||
printer << " end:" << _end;
|
printer << " end:" << _end;
|
||||||
}
|
}
|
||||||
return std::move(printer);
|
return printer;
|
||||||
}
|
}
|
||||||
bool PacketRecvQueue::drop(uint32_t first, uint32_t last, std::list<DataPacket::Ptr> &out) {
|
bool PacketRecvQueue::drop(uint32_t first, uint32_t last, std::list<DataPacket::Ptr> &out) {
|
||||||
uint32_t diff = 0;
|
uint32_t diff = 0;
|
||||||
|
|||||||
@ -91,7 +91,7 @@ std::string PacketRecvRateContext::dump(){
|
|||||||
}
|
}
|
||||||
printer <<"\r\n";
|
printer <<"\r\n";
|
||||||
|
|
||||||
return std::move(printer);
|
return printer;
|
||||||
}
|
}
|
||||||
EstimatedLinkCapacityContext::EstimatedLinkCapacityContext(TimePoint start) : _start(start) {
|
EstimatedLinkCapacityContext::EstimatedLinkCapacityContext(TimePoint start) : _start(start) {
|
||||||
for (size_t i = 0; i < SIZE; i++) {
|
for (size_t i = 0; i < SIZE; i++) {
|
||||||
|
|||||||
@ -298,7 +298,7 @@ string RtpExt::dumpString() const {
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return std::move(printer);
|
return printer;
|
||||||
}
|
}
|
||||||
|
|
||||||
//https://tools.ietf.org/html/rfc6464
|
//https://tools.ietf.org/html/rfc6464
|
||||||
|
|||||||
@ -174,7 +174,7 @@ string RtcSdpBase::toString() const {
|
|||||||
for (auto &item : items) {
|
for (auto &item : items) {
|
||||||
printer << item->getKey() << "=" << item->toString() << "\r\n";
|
printer << item->getKey() << "=" << item->toString() << "\r\n";
|
||||||
}
|
}
|
||||||
return std::move(printer);
|
return printer;
|
||||||
}
|
}
|
||||||
|
|
||||||
RtpDirection RtcSdpBase::getDirection() const {
|
RtpDirection RtcSdpBase::getDirection() const {
|
||||||
@ -307,7 +307,7 @@ string RtcSessionSdp::toString() const {
|
|||||||
printer << media.toString();
|
printer << media.toString();
|
||||||
}
|
}
|
||||||
|
|
||||||
return std::move(printer);
|
return printer;
|
||||||
}
|
}
|
||||||
|
|
||||||
//////////////////////////////////////////////////////////////////////////////////////////
|
//////////////////////////////////////////////////////////////////////////////////////////
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user