Mark all virtual overrides in the hierarchy of AudioPacketizationCallback,
RTPStream, and NetEq as such. Also mark all other virtual overrides in the same
files.
This will make further changes to these classes safer by ensuring that the
compile breaks if the base class changes and not all overrides are fixed.
This also deletes ACMTest.cc, which existed solely to define ~ACMTest(), which
was marked pure virtual in the header. (Pure virtual destructors still need a
definition.) Because there is another pure virtual method in this class, the
class is already abstract, so there's no benefit to making the desturctor pure.
Making it non-pure allows removing the separate source file.
BUG=none
TEST=none
R=henrik.lundin@webrtc.org, niklas.enbom@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/29389004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7144 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/webrtc/modules/utility/source/coder.h b/webrtc/modules/utility/source/coder.h
index ead1e22..e04372d 100644
--- a/webrtc/modules/utility/source/coder.h
+++ b/webrtc/modules/utility/source/coder.h
@@ -27,11 +27,11 @@
int32_t SetEncodeCodec(
const CodecInst& codecInst,
- ACMAMRPackingFormat amrFormat = AMRBandwidthEfficient);
+ ACMAMRPackingFormat amrFormat = AMRBandwidthEfficient);
int32_t SetDecodeCodec(
const CodecInst& codecInst,
- ACMAMRPackingFormat amrFormat = AMRBandwidthEfficient);
+ ACMAMRPackingFormat amrFormat = AMRBandwidthEfficient);
int32_t Decode(AudioFrame& decodedAudio, uint32_t sampFreqHz,
const int8_t* incomingPayload, int32_t payloadLength);
@@ -42,12 +42,13 @@
uint32_t& encodedLengthInBytes);
protected:
- virtual int32_t SendData(FrameType frameType,
- uint8_t payloadType,
- uint32_t timeStamp,
- const uint8_t* payloadData,
- uint16_t payloadSize,
- const RTPFragmentationHeader* fragmentation);
+ virtual int32_t SendData(
+ FrameType frameType,
+ uint8_t payloadType,
+ uint32_t timeStamp,
+ const uint8_t* payloadData,
+ uint16_t payloadSize,
+ const RTPFragmentationHeader* fragmentation) OVERRIDE;
private:
scoped_ptr<AudioCodingModule> _acm;