zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Delete unused copy constructors for VCMEncodedFrame and VCMFrameBuffer.

Browse Source 
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:
Niels Möller
2018-06-26 11:14:11 +02:00
committed by Commit Bot
parent fe288eb687
commit 72f52a1883
4 changed files with 1 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
modules/video_coding/encoded_frame.cc
View File

@ -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();
}

3
modules/video_coding/encoded_frame.h
View File

@ -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();
/**

10
modules/video_coding/frame_buffer.cc
View File

@ -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();
}

2
modules/video_coding/frame_buffer.h
View File

@ -27,8 +27,6 @@ class VCMFrameBuffer : public VCMEncodedFrame {
VCMFrameBuffer();
virtual ~VCMFrameBuffer();
VCMFrameBuffer(const VCMFrameBuffer& rhs);
virtual void Reset();
VCMFrameBufferEnum InsertPacket(const VCMPacket& packet,