From 036b7436df64662958b697917c8a66fad99c4007 Mon Sep 17 00:00:00 2001 From: "turaj@webrtc.org" Date: Wed, 11 Sep 2013 18:45:02 +0000 Subject: [PATCH] Adding APIs. These APIs are not implemented yet, they are to help developement of ACM. Un-implemented APIs. TBR=henrik.lundin@webrtc.org BUG= Review URL: https://webrtc-codereview.appspot.com/2191008 git-svn-id: http://webrtc.googlecode.com/svn/trunk@4725 4adac7df-926f-26a2-2b94-8c16560cd09d --- .../modules/audio_coding/neteq4/interface/neteq.h | 14 ++++++++++++++ webrtc/modules/audio_coding/neteq4/neteq_impl.cc | 11 +++++++++++ webrtc/modules/audio_coding/neteq4/neteq_impl.h | 7 +++++++ 3 files changed, 32 insertions(+) diff --git a/webrtc/modules/audio_coding/neteq4/interface/neteq.h b/webrtc/modules/audio_coding/neteq4/interface/neteq.h index 1f1ee67928..7c39cb1f4c 100644 --- a/webrtc/modules/audio_coding/neteq4/interface/neteq.h +++ b/webrtc/modules/audio_coding/neteq4/interface/neteq.h @@ -65,6 +65,12 @@ enum NetEqPlayoutMode { kPlayoutStreaming }; +enum NetEqBackgroundNoiseMode { + kBgnOn, + kBgnFade, + kBgnOff +}; + // This is the interface class for NetEq. class NetEq { public: @@ -237,6 +243,14 @@ class NetEq { // This method is to facilitate NACK. virtual int DecodedRtpInfo(int* sequence_number, uint32_t* timestamp) = 0; + // Not implemented. + virtual int InsertSyncPacket(const WebRtcRTPHeader& rtp_header, + uint32_t receive_timestamp) = 0; + + virtual void SetBackgroundNoiseMode(NetEqBackgroundNoiseMode mode) = 0; + + virtual NetEqBackgroundNoiseMode BackgroundNoiseMode() const = 0; + protected: NetEq() {} diff --git a/webrtc/modules/audio_coding/neteq4/neteq_impl.cc b/webrtc/modules/audio_coding/neteq4/neteq_impl.cc index 64addf8732..ee2aedce62 100644 --- a/webrtc/modules/audio_coding/neteq4/neteq_impl.cc +++ b/webrtc/modules/audio_coding/neteq4/neteq_impl.cc @@ -374,6 +374,17 @@ int NetEqImpl::DecodedRtpInfo(int* sequence_number, uint32_t* timestamp) { return 0; } +int NetEqImpl::InsertSyncPacket(const WebRtcRTPHeader& /* rtp_header */, + uint32_t /* receive_timestamp */) { + return kNotImplemented; +} + +void NetEqImpl::SetBackgroundNoiseMode(NetEqBackgroundNoiseMode /* mode */) {} + +NetEqBackgroundNoiseMode NetEqImpl::BackgroundNoiseMode() const { + return kBgnOn; +} + // Methods below this line are private. diff --git a/webrtc/modules/audio_coding/neteq4/neteq_impl.h b/webrtc/modules/audio_coding/neteq4/neteq_impl.h index b000961d72..9bdafdde3d 100644 --- a/webrtc/modules/audio_coding/neteq4/neteq_impl.h +++ b/webrtc/modules/audio_coding/neteq4/neteq_impl.h @@ -171,6 +171,13 @@ class NetEqImpl : public webrtc::NetEq { // This method is to facilitate NACK. virtual int DecodedRtpInfo(int* sequence_number, uint32_t* timestamp); + virtual int InsertSyncPacket(const WebRtcRTPHeader& rtp_header, + uint32_t receive_timestamp); + + virtual void SetBackgroundNoiseMode(NetEqBackgroundNoiseMode mode); + + virtual NetEqBackgroundNoiseMode BackgroundNoiseMode() const; + private: static const int kOutputSizeMs = 10; static const int kMaxFrameSize = 2880; // 60 ms @ 48 kHz.