Make rtcp packets copyable
That would simplify their usage in tests where perfomance is not critical. BUG=None Review-Url: https://codereview.webrtc.org/2675713005 Cr-Commit-Position: refs/heads/master@{#16461}
This commit is contained in:
parent
1959b63b61
commit
4a9a595ab4
@ -12,7 +12,6 @@
|
||||
#define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_APP_H_
|
||||
|
||||
#include "webrtc/base/buffer.h"
|
||||
#include "webrtc/base/constructormagic.h"
|
||||
#include "webrtc/modules/rtp_rtcp/source/rtcp_packet.h"
|
||||
|
||||
namespace webrtc {
|
||||
@ -56,8 +55,6 @@ class App : public RtcpPacket {
|
||||
uint32_t ssrc_;
|
||||
uint32_t name_;
|
||||
rtc::Buffer data_;
|
||||
|
||||
RTC_DISALLOW_COPY_AND_ASSIGN(App);
|
||||
};
|
||||
|
||||
} // namespace rtcp
|
||||
|
||||
@ -15,7 +15,6 @@
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
#include "webrtc/base/constructormagic.h"
|
||||
#include "webrtc/modules/rtp_rtcp/source/rtcp_packet.h"
|
||||
|
||||
namespace webrtc {
|
||||
@ -54,8 +53,6 @@ class Bye : public RtcpPacket {
|
||||
uint32_t sender_ssrc_;
|
||||
std::vector<uint32_t> csrcs_;
|
||||
std::string reason_;
|
||||
|
||||
RTC_DISALLOW_COPY_AND_ASSIGN(Bye);
|
||||
};
|
||||
|
||||
} // namespace rtcp
|
||||
|
||||
@ -13,7 +13,6 @@
|
||||
|
||||
#include <vector>
|
||||
|
||||
#include "webrtc/base/constructormagic.h"
|
||||
#include "webrtc/modules/rtp_rtcp/source/rtcp_packet.h"
|
||||
|
||||
namespace webrtc {
|
||||
@ -51,8 +50,6 @@ class ExtendedJitterReport : public RtcpPacket {
|
||||
}
|
||||
|
||||
std::vector<uint32_t> inter_arrival_jitters_;
|
||||
|
||||
RTC_DISALLOW_COPY_AND_ASSIGN(ExtendedJitterReport);
|
||||
};
|
||||
|
||||
} // namespace rtcp
|
||||
|
||||
@ -13,7 +13,6 @@
|
||||
|
||||
#include <vector>
|
||||
|
||||
#include "webrtc/base/constructormagic.h"
|
||||
#include "webrtc/base/optional.h"
|
||||
#include "webrtc/modules/rtp_rtcp/source/rtcp_packet.h"
|
||||
#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/dlrr.h"
|
||||
@ -84,8 +83,6 @@ class ExtendedReports : public RtcpPacket {
|
||||
Dlrr dlrr_block_; // Dlrr without items treated same as no dlrr block.
|
||||
rtc::Optional<VoipMetric> voip_metric_block_;
|
||||
rtc::Optional<TargetBitrate> target_bitrate_;
|
||||
|
||||
RTC_DISALLOW_COPY_AND_ASSIGN(ExtendedReports);
|
||||
};
|
||||
} // namespace rtcp
|
||||
} // namespace webrtc
|
||||
|
||||
@ -14,7 +14,6 @@
|
||||
#include <vector>
|
||||
|
||||
#include "webrtc/base/basictypes.h"
|
||||
#include "webrtc/base/constructormagic.h"
|
||||
#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/rtpfb.h"
|
||||
|
||||
namespace webrtc {
|
||||
@ -53,8 +52,6 @@ class Nack : public Rtpfb {
|
||||
|
||||
std::vector<PackedNack> packed_;
|
||||
std::vector<uint16_t> packet_ids_;
|
||||
|
||||
RTC_DISALLOW_COPY_AND_ASSIGN(Nack);
|
||||
};
|
||||
|
||||
} // namespace rtcp
|
||||
|
||||
@ -11,7 +11,6 @@
|
||||
#define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_PLI_H_
|
||||
|
||||
#include "webrtc/base/basictypes.h"
|
||||
#include "webrtc/base/constructormagic.h"
|
||||
#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/psfb.h"
|
||||
|
||||
namespace webrtc {
|
||||
@ -37,8 +36,6 @@ class Pli : public Psfb {
|
||||
size_t BlockLength() const override {
|
||||
return kHeaderLength + kCommonFeedbackLength;
|
||||
}
|
||||
|
||||
RTC_DISALLOW_COPY_AND_ASSIGN(Pli);
|
||||
};
|
||||
|
||||
} // namespace rtcp
|
||||
|
||||
@ -12,7 +12,6 @@
|
||||
#define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_RAPID_RESYNC_REQUEST_H_
|
||||
|
||||
#include "webrtc/base/basictypes.h"
|
||||
#include "webrtc/base/constructormagic.h"
|
||||
#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/rtpfb.h"
|
||||
|
||||
namespace webrtc {
|
||||
@ -40,8 +39,6 @@ class RapidResyncRequest : public Rtpfb {
|
||||
size_t BlockLength() const override {
|
||||
return kHeaderLength + kCommonFeedbackLength;
|
||||
}
|
||||
|
||||
RTC_DISALLOW_COPY_AND_ASSIGN(RapidResyncRequest);
|
||||
};
|
||||
} // namespace rtcp
|
||||
} // namespace webrtc
|
||||
|
||||
@ -14,7 +14,6 @@
|
||||
#include <vector>
|
||||
|
||||
#include "webrtc/base/basictypes.h"
|
||||
#include "webrtc/base/constructormagic.h"
|
||||
#include "webrtc/modules/rtp_rtcp/source/rtcp_packet.h"
|
||||
#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/report_block.h"
|
||||
|
||||
@ -56,8 +55,6 @@ class ReceiverReport : public RtcpPacket {
|
||||
|
||||
uint32_t sender_ssrc_;
|
||||
std::vector<ReportBlock> report_blocks_;
|
||||
|
||||
RTC_DISALLOW_COPY_AND_ASSIGN(ReceiverReport);
|
||||
};
|
||||
|
||||
} // namespace rtcp
|
||||
|
||||
@ -14,7 +14,6 @@
|
||||
#include <vector>
|
||||
|
||||
#include "webrtc/base/basictypes.h"
|
||||
#include "webrtc/base/constructormagic.h"
|
||||
#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/psfb.h"
|
||||
|
||||
namespace webrtc {
|
||||
@ -58,8 +57,6 @@ class Remb : public Psfb {
|
||||
|
||||
uint64_t bitrate_bps_;
|
||||
std::vector<uint32_t> ssrcs_;
|
||||
|
||||
RTC_DISALLOW_COPY_AND_ASSIGN(Remb);
|
||||
};
|
||||
} // namespace rtcp
|
||||
} // namespace webrtc
|
||||
|
||||
@ -12,7 +12,6 @@
|
||||
#define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_RPSI_H_
|
||||
|
||||
#include "webrtc/base/basictypes.h"
|
||||
#include "webrtc/base/constructormagic.h"
|
||||
#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/psfb.h"
|
||||
|
||||
namespace webrtc {
|
||||
@ -49,8 +48,6 @@ class Rpsi : public Psfb {
|
||||
uint8_t payload_type_;
|
||||
uint64_t picture_id_;
|
||||
size_t block_length_;
|
||||
|
||||
RTC_DISALLOW_COPY_AND_ASSIGN(Rpsi);
|
||||
};
|
||||
} // namespace rtcp
|
||||
} // namespace webrtc
|
||||
|
||||
@ -15,7 +15,6 @@
|
||||
#include <vector>
|
||||
|
||||
#include "webrtc/base/basictypes.h"
|
||||
#include "webrtc/base/constructormagic.h"
|
||||
#include "webrtc/modules/rtp_rtcp/source/rtcp_packet.h"
|
||||
|
||||
namespace webrtc {
|
||||
@ -53,8 +52,6 @@ class Sdes : public RtcpPacket {
|
||||
|
||||
std::vector<Chunk> chunks_;
|
||||
size_t block_length_;
|
||||
|
||||
RTC_DISALLOW_COPY_AND_ASSIGN(Sdes);
|
||||
};
|
||||
} // namespace rtcp
|
||||
} // namespace webrtc
|
||||
|
||||
@ -13,7 +13,6 @@
|
||||
|
||||
#include <vector>
|
||||
|
||||
#include "webrtc/base/constructormagic.h"
|
||||
#include "webrtc/modules/rtp_rtcp/source/rtcp_packet.h"
|
||||
#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/report_block.h"
|
||||
#include "webrtc/system_wrappers/include/ntp_time.h"
|
||||
@ -77,8 +76,6 @@ class SenderReport : public RtcpPacket {
|
||||
uint32_t sender_packet_count_;
|
||||
uint32_t sender_octet_count_;
|
||||
std::vector<ReportBlock> report_blocks_;
|
||||
|
||||
RTC_DISALLOW_COPY_AND_ASSIGN(SenderReport);
|
||||
};
|
||||
|
||||
} // namespace rtcp
|
||||
|
||||
@ -14,7 +14,6 @@
|
||||
#include <vector>
|
||||
|
||||
#include "webrtc/base/basictypes.h"
|
||||
#include "webrtc/base/constructormagic.h"
|
||||
#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/psfb.h"
|
||||
|
||||
namespace webrtc {
|
||||
@ -73,8 +72,6 @@ class Sli : public Psfb {
|
||||
}
|
||||
|
||||
std::vector<Macroblocks> items_;
|
||||
|
||||
RTC_DISALLOW_COPY_AND_ASSIGN(Sli);
|
||||
};
|
||||
|
||||
} // namespace rtcp
|
||||
|
||||
@ -14,7 +14,6 @@
|
||||
#include <vector>
|
||||
|
||||
#include "webrtc/base/basictypes.h"
|
||||
#include "webrtc/base/constructormagic.h"
|
||||
#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/rtpfb.h"
|
||||
#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmb_item.h"
|
||||
|
||||
@ -55,8 +54,6 @@ class Tmmbn : public Rtpfb {
|
||||
uint32_t media_ssrc() const;
|
||||
|
||||
std::vector<TmmbItem> items_;
|
||||
|
||||
RTC_DISALLOW_COPY_AND_ASSIGN(Tmmbn);
|
||||
};
|
||||
} // namespace rtcp
|
||||
} // namespace webrtc
|
||||
|
||||
@ -14,7 +14,6 @@
|
||||
#include <vector>
|
||||
|
||||
#include "webrtc/base/basictypes.h"
|
||||
#include "webrtc/base/constructormagic.h"
|
||||
#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/rtpfb.h"
|
||||
#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmb_item.h"
|
||||
|
||||
@ -54,8 +53,6 @@ class Tmmbr : public Rtpfb {
|
||||
void SetMediaSsrc(uint32_t ssrc);
|
||||
|
||||
std::vector<TmmbItem> items_;
|
||||
|
||||
RTC_DISALLOW_COPY_AND_ASSIGN(Tmmbr);
|
||||
};
|
||||
} // namespace rtcp
|
||||
} // namespace webrtc
|
||||
|
||||
@ -14,7 +14,6 @@
|
||||
#include <memory>
|
||||
#include <vector>
|
||||
|
||||
#include "webrtc/base/constructormagic.h"
|
||||
#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/rtpfb.h"
|
||||
|
||||
namespace webrtc {
|
||||
@ -109,8 +108,6 @@ class TransportFeedback : public Rtpfb {
|
||||
std::vector<uint16_t> encoded_chunks_;
|
||||
const std::unique_ptr<LastChunk> last_chunk_;
|
||||
size_t size_bytes_;
|
||||
|
||||
RTC_DISALLOW_COPY_AND_ASSIGN(TransportFeedback);
|
||||
};
|
||||
|
||||
} // namespace rtcp
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user