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

NetEq4: Make the algorithm buffer a member variable

Browse Source 
This reduces the alloc count by more than 100,000 for
NetEqDecodingTest.TestBitExactness.

BUG=1363
TEST=out/Release/modules_unittests --gtest_filter=NetEqDecodingTest.TestBitExactness
R=turaj@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/2119004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4651 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
henrik.lundin@webrtc.org
2013-09-02 07:59:30 +00:00
parent cadf9040cb
commit c487c6abb0
2 changed files with 74 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
webrtc/modules/audio_coding/neteq4/neteq_impl.h
View File

@ -222,49 +222,42 @@ class NetEqImpl : public webrtc::NetEq {
// Sub-method which calls the Normal class to perform the normal operation.
void DoNormal(const int16_t* decoded_buffer, size_t decoded_length,
AudioDecoder::SpeechType speech_type, bool play_dtmf,
AudioMultiVector<int16_t>* algorithm_buffer);
AudioDecoder::SpeechType speech_type, bool play_dtmf);
// Sub-method which calls the Merge class to perform the merge operation.
void DoMerge(int16_t* decoded_buffer, size_t decoded_length,
AudioDecoder::SpeechType speech_type, bool play_dtmf,
AudioMultiVector<int16_t>* algorithm_buffer);
AudioDecoder::SpeechType speech_type, bool play_dtmf);
// Sub-method which calls the Expand class to perform the expand operation.
int DoExpand(bool play_dtmf, AudioMultiVector<int16_t>* algorithm_buffer);
int DoExpand(bool play_dtmf);
// Sub-method which calls the Accelerate class to perform the accelerate
// operation.
int DoAccelerate(int16_t* decoded_buffer, size_t decoded_length,
AudioDecoder::SpeechType speech_type, bool play_dtmf,
AudioMultiVector<int16_t>* algorithm_buffer);
AudioDecoder::SpeechType speech_type, bool play_dtmf);
// Sub-method which calls the PreemptiveExpand class to perform the
// preemtive expand operation.
int DoPreemptiveExpand(int16_t* decoded_buffer, size_t decoded_length,
AudioDecoder::SpeechType speech_type, bool play_dtmf,
AudioMultiVector<int16_t>* algorithm_buffer);
AudioDecoder::SpeechType speech_type, bool play_dtmf);
// Sub-method which calls the ComfortNoise class to generate RFC 3389 comfort
// noise. |packet_list| can either contain one SID frame to update the
// noise parameters, or no payload at all, in which case the previously
// received parameters are used.
int DoRfc3389Cng(PacketList* packet_list, bool play_dtmf,
AudioMultiVector<int16_t>* algorithm_buffer);
int DoRfc3389Cng(PacketList* packet_list, bool play_dtmf);
// Calls the audio decoder to generate codec-internal comfort noise when
// no packet was received.
void DoCodecInternalCng(AudioMultiVector<int16_t>* algorithm_buffer);
void DoCodecInternalCng();
// Calls the DtmfToneGenerator class to generate DTMF tones.
int DoDtmf(const DtmfEvent& dtmf_event, bool* play_dtmf,
AudioMultiVector<int16_t>* algorithm_buffer);
int DoDtmf(const DtmfEvent& dtmf_event, bool* play_dtmf);
// Produces packet-loss concealment using alternative methods. If the codec
// has an internal PLC, it is called to generate samples. Otherwise, the
// method performs zero-stuffing.
void DoAlternativePlc(bool increase_timestamp,
AudioMultiVector<int16_t>* algorithm_buffer);
void DoAlternativePlc(bool increase_timestamp);
// Overdub DTMF on top of |output|.
int DtmfOverdub(const DtmfEvent& dtmf_event, size_t num_channels,
@ -296,6 +289,7 @@ class NetEqImpl : public webrtc::NetEq {
scoped_ptr<TimestampScaler> timestamp_scaler_;
scoped_ptr<DecisionLogic> decision_logic_;
scoped_ptr<PostDecodeVad> vad_;
AudioMultiVector<int16_t>* algorithm_buffer_;
SyncBuffer* sync_buffer_;
Expand* expand_;
RandomVector random_vector_;