diff --git a/webrtc/modules/interface/module_common_types.h b/webrtc/modules/interface/module_common_types.h index 66bbf1994f..dc8617631b 100644 --- a/webrtc/modules/interface/module_common_types.h +++ b/webrtc/modules/interface/module_common_types.h @@ -288,98 +288,6 @@ class CallStatsObserver { virtual ~CallStatsObserver() {} }; -// class describing a complete, or parts of an encoded frame. -class EncodedVideoData { - public: - EncodedVideoData() - : payloadType(0), - timeStamp(0), - renderTimeMs(0), - encodedWidth(0), - encodedHeight(0), - completeFrame(false), - missingFrame(false), - payloadData(NULL), - payloadSize(0), - bufferSize(0), - fragmentationHeader(), - frameType(kVideoFrameDelta), - codec(kVideoCodecUnknown) {}; - - EncodedVideoData(const EncodedVideoData& data) { - payloadType = data.payloadType; - timeStamp = data.timeStamp; - renderTimeMs = data.renderTimeMs; - encodedWidth = data.encodedWidth; - encodedHeight = data.encodedHeight; - completeFrame = data.completeFrame; - missingFrame = data.missingFrame; - payloadSize = data.payloadSize; - fragmentationHeader.CopyFrom(data.fragmentationHeader); - frameType = data.frameType; - codec = data.codec; - if (data.payloadSize > 0) { - payloadData = new uint8_t[data.payloadSize]; - memcpy(payloadData, data.payloadData, data.payloadSize); - bufferSize = data.payloadSize; - } else { - payloadData = NULL; - } - } - - ~EncodedVideoData() { - delete[] payloadData; - }; - - EncodedVideoData& operator=(const EncodedVideoData& data) { - if (this == &data) { - return *this; - } - payloadType = data.payloadType; - timeStamp = data.timeStamp; - renderTimeMs = data.renderTimeMs; - encodedWidth = data.encodedWidth; - encodedHeight = data.encodedHeight; - completeFrame = data.completeFrame; - missingFrame = data.missingFrame; - payloadSize = data.payloadSize; - fragmentationHeader.CopyFrom(data.fragmentationHeader); - frameType = data.frameType; - codec = data.codec; - if (data.payloadSize > 0) { - delete[] payloadData; - payloadData = new uint8_t[data.payloadSize]; - memcpy(payloadData, data.payloadData, data.payloadSize); - bufferSize = data.payloadSize; - } - return *this; - }; - void VerifyAndAllocate(const size_t size) { - if (bufferSize < size) { - uint8_t* oldPayload = payloadData; - payloadData = new uint8_t[size]; - memcpy(payloadData, oldPayload, sizeof(uint8_t) * payloadSize); - - bufferSize = size; - delete[] oldPayload; - } - } - - uint8_t payloadType; - uint32_t timeStamp; - int64_t renderTimeMs; - uint32_t encodedWidth; - uint32_t encodedHeight; - bool completeFrame; - bool missingFrame; - uint8_t* payloadData; - size_t payloadSize; - size_t bufferSize; - RTPFragmentationHeader fragmentationHeader; - FrameType frameType; - VideoCodecType codec; -}; - struct VideoContentMetrics { VideoContentMetrics() : motion_magnitude(0.0f),