mirror of
https://github.com/ZLMediaKit/ZLMediaKit.git
synced 2026-07-07 12:18:12 +08:00
修复clang下编译警告和错误
This commit is contained in:
@@ -236,7 +236,6 @@ public:
|
||||
}
|
||||
|
||||
private:
|
||||
std::size_t _size;
|
||||
std::shared_ptr<RtcpHeader> _rtcp;
|
||||
};
|
||||
|
||||
@@ -604,7 +603,7 @@ std::shared_ptr<RtcpBye> RtcpBye::create(const std::vector<uint32_t> &ssrcs, con
|
||||
setupHeader(ptr, RtcpType::RTCP_BYE, ssrcs.size(), bytes);
|
||||
setupPadding(ptr, bytes - real_size);
|
||||
|
||||
auto *ssrc_ptr = &(((RtcpBye *) ptr)->ssrc);
|
||||
auto ssrc_ptr = ((RtcpBye *) ptr)->ssrc;
|
||||
for (auto ssrc : ssrcs) {
|
||||
*ssrc_ptr = htonl(ssrc);
|
||||
++ssrc_ptr;
|
||||
@@ -623,7 +622,7 @@ std::shared_ptr<RtcpBye> RtcpBye::create(const std::vector<uint32_t> &ssrcs, con
|
||||
|
||||
vector<uint32_t *> RtcpBye::getSSRC() {
|
||||
vector<uint32_t *> ret;
|
||||
uint32_t *ssrc_ptr = &ssrc;
|
||||
auto ssrc_ptr = ssrc;
|
||||
for (size_t i = 0; i < report_count; ++i) {
|
||||
ret.emplace_back(ssrc_ptr);
|
||||
ssrc_ptr += 1;
|
||||
@@ -652,7 +651,7 @@ string RtcpBye::dumpString() const {
|
||||
void RtcpBye::net2Host(size_t size) {
|
||||
static const size_t kMinSize = sizeof(RtcpHeader);
|
||||
CHECK_MIN_SIZE(size, kMinSize);
|
||||
uint32_t *ssrc_ptr = &ssrc;
|
||||
auto ssrc_ptr = ssrc;
|
||||
size_t offset = kMinSize;
|
||||
size_t i = 0;
|
||||
for (; i < report_count && offset + sizeof(ssrc) <= size; ++i) {
|
||||
|
||||
@@ -622,7 +622,7 @@ class RtcpBye : public RtcpHeader {
|
||||
public:
|
||||
friend class RtcpHeader;
|
||||
/* 变长,根据count决定有多少个ssrc */
|
||||
uint32_t ssrc;
|
||||
uint32_t ssrc[1];
|
||||
|
||||
/** 中间可能有若干个 ssrc **/
|
||||
|
||||
|
||||
@@ -149,7 +149,7 @@ string FCI_REMB::dumpString() const {
|
||||
for (auto &ssrc : ((FCI_REMB *) this)->getSSRC()) {
|
||||
printer << ssrc << " ";
|
||||
}
|
||||
return printer;
|
||||
return std::move(printer);
|
||||
}
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
Reference in New Issue
Block a user