Delete unused copy constructors for VCMEncodedFrame and VCMFrameBuffer.
Bug: webrtc:9378 Change-Id: I742c7e2ca11f9c12d65add2bac9d7d19e09e3f14 Reviewed-on: https://webrtc-review.googlesource.com/85367 Reviewed-by: Rasmus Brandt <brandtr@webrtc.org> Commit-Queue: Niels Moller <nisse@webrtc.org> Cr-Commit-Position: refs/heads/master@{#23744}
This commit is contained in:
@ -22,43 +22,6 @@ VCMEncodedFrame::VCMEncodedFrame()
|
|||||||
_codecSpecificInfo.codecType = kVideoCodecUnknown;
|
_codecSpecificInfo.codecType = kVideoCodecUnknown;
|
||||||
}
|
}
|
||||||
|
|
||||||
VCMEncodedFrame::VCMEncodedFrame(const webrtc::EncodedImage& rhs)
|
|
||||||
: webrtc::EncodedImage(rhs),
|
|
||||||
_renderTimeMs(-1),
|
|
||||||
_payloadType(0),
|
|
||||||
_missingFrame(false),
|
|
||||||
_codec(kVideoCodecUnknown),
|
|
||||||
_rotation_set(false) {
|
|
||||||
_codecSpecificInfo.codecType = kVideoCodecUnknown;
|
|
||||||
_buffer = NULL;
|
|
||||||
_size = 0;
|
|
||||||
_length = 0;
|
|
||||||
if (rhs._buffer != NULL) {
|
|
||||||
VerifyAndAllocate(rhs._length +
|
|
||||||
EncodedImage::GetBufferPaddingBytes(_codec));
|
|
||||||
memcpy(_buffer, rhs._buffer, rhs._length);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
VCMEncodedFrame::VCMEncodedFrame(const VCMEncodedFrame& rhs)
|
|
||||||
: webrtc::EncodedImage(rhs),
|
|
||||||
_renderTimeMs(rhs._renderTimeMs),
|
|
||||||
_payloadType(rhs._payloadType),
|
|
||||||
_missingFrame(rhs._missingFrame),
|
|
||||||
_codecSpecificInfo(rhs._codecSpecificInfo),
|
|
||||||
_codec(rhs._codec),
|
|
||||||
_rotation_set(rhs._rotation_set) {
|
|
||||||
_buffer = NULL;
|
|
||||||
_size = 0;
|
|
||||||
_length = 0;
|
|
||||||
if (rhs._buffer != NULL) {
|
|
||||||
VerifyAndAllocate(rhs._length +
|
|
||||||
EncodedImage::GetBufferPaddingBytes(_codec));
|
|
||||||
memcpy(_buffer, rhs._buffer, rhs._length);
|
|
||||||
_length = rhs._length;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
VCMEncodedFrame::~VCMEncodedFrame() {
|
VCMEncodedFrame::~VCMEncodedFrame() {
|
||||||
Free();
|
Free();
|
||||||
}
|
}
|
||||||
|
@ -24,8 +24,7 @@ namespace webrtc {
|
|||||||
class VCMEncodedFrame : protected EncodedImage {
|
class VCMEncodedFrame : protected EncodedImage {
|
||||||
public:
|
public:
|
||||||
VCMEncodedFrame();
|
VCMEncodedFrame();
|
||||||
explicit VCMEncodedFrame(const webrtc::EncodedImage& rhs);
|
VCMEncodedFrame(const VCMEncodedFrame&) = delete;
|
||||||
VCMEncodedFrame(const VCMEncodedFrame& rhs);
|
|
||||||
|
|
||||||
~VCMEncodedFrame();
|
~VCMEncodedFrame();
|
||||||
/**
|
/**
|
||||||
|
@ -25,16 +25,6 @@ VCMFrameBuffer::VCMFrameBuffer()
|
|||||||
|
|
||||||
VCMFrameBuffer::~VCMFrameBuffer() {}
|
VCMFrameBuffer::~VCMFrameBuffer() {}
|
||||||
|
|
||||||
VCMFrameBuffer::VCMFrameBuffer(const VCMFrameBuffer& rhs)
|
|
||||||
: VCMEncodedFrame(rhs),
|
|
||||||
_state(rhs._state),
|
|
||||||
_sessionInfo(),
|
|
||||||
_nackCount(rhs._nackCount),
|
|
||||||
_latestPacketTimeMs(rhs._latestPacketTimeMs) {
|
|
||||||
_sessionInfo = rhs._sessionInfo;
|
|
||||||
_sessionInfo.UpdateDataPointers(rhs._buffer, _buffer);
|
|
||||||
}
|
|
||||||
|
|
||||||
webrtc::FrameType VCMFrameBuffer::FrameType() const {
|
webrtc::FrameType VCMFrameBuffer::FrameType() const {
|
||||||
return _sessionInfo.FrameType();
|
return _sessionInfo.FrameType();
|
||||||
}
|
}
|
||||||
|
@ -27,8 +27,6 @@ class VCMFrameBuffer : public VCMEncodedFrame {
|
|||||||
VCMFrameBuffer();
|
VCMFrameBuffer();
|
||||||
virtual ~VCMFrameBuffer();
|
virtual ~VCMFrameBuffer();
|
||||||
|
|
||||||
VCMFrameBuffer(const VCMFrameBuffer& rhs);
|
|
||||||
|
|
||||||
virtual void Reset();
|
virtual void Reset();
|
||||||
|
|
||||||
VCMFrameBufferEnum InsertPacket(const VCMPacket& packet,
|
VCMFrameBufferEnum InsertPacket(const VCMPacket& packet,
|
||||||
|
Reference in New Issue
Block a user