diff --git a/modules/video_coding/encoded_frame.cc b/modules/video_coding/encoded_frame.cc index cb9ff6c60f..a3d93b2d5f 100644 --- a/modules/video_coding/encoded_frame.cc +++ b/modules/video_coding/encoded_frame.cc @@ -22,43 +22,6 @@ VCMEncodedFrame::VCMEncodedFrame() _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() { Free(); } diff --git a/modules/video_coding/encoded_frame.h b/modules/video_coding/encoded_frame.h index 17c61d7544..252dea483f 100644 --- a/modules/video_coding/encoded_frame.h +++ b/modules/video_coding/encoded_frame.h @@ -24,8 +24,7 @@ namespace webrtc { class VCMEncodedFrame : protected EncodedImage { public: VCMEncodedFrame(); - explicit VCMEncodedFrame(const webrtc::EncodedImage& rhs); - VCMEncodedFrame(const VCMEncodedFrame& rhs); + VCMEncodedFrame(const VCMEncodedFrame&) = delete; ~VCMEncodedFrame(); /** diff --git a/modules/video_coding/frame_buffer.cc b/modules/video_coding/frame_buffer.cc index 99abf4363f..b9241b93d6 100644 --- a/modules/video_coding/frame_buffer.cc +++ b/modules/video_coding/frame_buffer.cc @@ -25,16 +25,6 @@ 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 { return _sessionInfo.FrameType(); } diff --git a/modules/video_coding/frame_buffer.h b/modules/video_coding/frame_buffer.h index 66f338a4cf..260471738c 100644 --- a/modules/video_coding/frame_buffer.h +++ b/modules/video_coding/frame_buffer.h @@ -27,8 +27,6 @@ class VCMFrameBuffer : public VCMEncodedFrame { VCMFrameBuffer(); virtual ~VCMFrameBuffer(); - VCMFrameBuffer(const VCMFrameBuffer& rhs); - virtual void Reset(); VCMFrameBufferEnum InsertPacket(const VCMPacket& packet,