From 3e1e94212b36d6304e3c81edceddba39f3fc9393 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C3=ABl=20Carr=C3=A9?= <rafael.carre@savoirfairelinux.com> Date: Wed, 10 Aug 2011 14:53:05 -0400 Subject: [PATCH] audio algorithms : remove unused prototype --- sflphone-common/src/audio/algorithm.h | 9 --------- sflphone-common/src/audio/audioprocessing.cpp | 7 ------- sflphone-common/src/audio/audioprocessing.h | 5 ----- sflphone-common/src/audio/dcblocker.cpp | 2 -- sflphone-common/src/audio/dcblocker.h | 8 -------- sflphone-common/src/audio/delaydetection.cpp | 2 -- sflphone-common/src/audio/delaydetection.h | 2 -- sflphone-common/src/audio/echocancel.cpp | 5 ----- sflphone-common/src/audio/echocancel.h | 8 -------- sflphone-common/src/audio/echosuppress.cpp | 2 -- sflphone-common/src/audio/echosuppress.h | 10 ---------- sflphone-common/src/audio/noisesuppress.cpp | 2 -- sflphone-common/src/audio/noisesuppress.h | 5 ----- sflphone-common/src/audio/speexechocancel.cpp | 5 ----- sflphone-common/src/audio/speexechocancel.h | 10 ---------- 15 files changed, 82 deletions(-) diff --git a/sflphone-common/src/audio/algorithm.h b/sflphone-common/src/audio/algorithm.h index b73e3820ca..8afb3fd24a 100644 --- a/sflphone-common/src/audio/algorithm.h +++ b/sflphone-common/src/audio/algorithm.h @@ -67,15 +67,6 @@ class Algorithm */ virtual int process (SFLDataFormat *inputData, SFLDataFormat *outputData, int nbBytes) = 0; - /** - * Class implementing this interface must define this function - * for audio processing that require synchronization between spkr and mic - * \param micData - * \param spkrData - * \param outputData - */ - virtual void process (SFLDataFormat *micData, SFLDataFormat *spkrData, SFLDataFormat *outputData, int nbBytes) = 0; - }; #endif diff --git a/sflphone-common/src/audio/audioprocessing.cpp b/sflphone-common/src/audio/audioprocessing.cpp index e2b42c283b..f7aba723f5 100644 --- a/sflphone-common/src/audio/audioprocessing.cpp +++ b/sflphone-common/src/audio/audioprocessing.cpp @@ -71,10 +71,3 @@ int AudioProcessing::processAudio (SFLDataFormat *inputData, SFLDataFormat *outp else return 0; } - - -void AudioProcessing::processAudio (SFLDataFormat *micData, SFLDataFormat *spkrData, SFLDataFormat *outputData, int nbBytes) -{ - if (_algorithm) - _algorithm->process (micData, spkrData, outputData, nbBytes); -} diff --git a/sflphone-common/src/audio/audioprocessing.h b/sflphone-common/src/audio/audioprocessing.h index c92b7503d1..195549a4d6 100644 --- a/sflphone-common/src/audio/audioprocessing.h +++ b/sflphone-common/src/audio/audioprocessing.h @@ -83,11 +83,6 @@ class AudioProcessing */ int processAudio (SFLDataFormat *inputData, SFLDataFormat *outputData, int nbBytes); - /** - * Process some audio data. - */ - void processAudio (SFLDataFormat *micData, SFLDataFormat *spkrData, SFLDataFormat *outputData, int nbBytes); - private: Algorithm *_algorithm; diff --git a/sflphone-common/src/audio/dcblocker.cpp b/sflphone-common/src/audio/dcblocker.cpp index 08766e6774..0d83af22fe 100644 --- a/sflphone-common/src/audio/dcblocker.cpp +++ b/sflphone-common/src/audio/dcblocker.cpp @@ -86,5 +86,3 @@ int DcBlocker::process (SFLDataFormat *inputData, SFLDataFormat *outputData, int return 0; } - -void DcBlocker::process (SFLDataFormat *micData UNUSED, SFLDataFormat *spkrData UNUSED, SFLDataFormat *outputData UNUSED, int nbBytes UNUSED) {} diff --git a/sflphone-common/src/audio/dcblocker.h b/sflphone-common/src/audio/dcblocker.h index ebaef02b2c..563fd82b99 100644 --- a/sflphone-common/src/audio/dcblocker.h +++ b/sflphone-common/src/audio/dcblocker.h @@ -69,14 +69,6 @@ class DcBlocker : public Algorithm */ virtual int process (SFLDataFormat *inputData, SFLDataFormat *outputData, int nbBytes); - /** - * Perform echo cancellation, application must provide its own buffer - * \param micData containing mixed echo and voice data - * \param spkrData containing far-end voice data to be sent to speakers - * \param outputData containing the processed data - */ - virtual void process (SFLDataFormat *micData, SFLDataFormat *spkrData, SFLDataFormat *outputData, int nbBytes); - private: SFLDataFormat _y, _x, _xm1, _ym1; diff --git a/sflphone-common/src/audio/delaydetection.cpp b/sflphone-common/src/audio/delaydetection.cpp index 5ff2b8818f..a68f5588bb 100644 --- a/sflphone-common/src/audio/delaydetection.cpp +++ b/sflphone-common/src/audio/delaydetection.cpp @@ -217,8 +217,6 @@ int DelayDetection::process (SFLDataFormat *intputData UNUSED, SFLDataFormat *ou return 0; } -void DelayDetection::process (SFLDataFormat *micData UNUSED, SFLDataFormat *spkrData UNUSED, SFLDataFormat *outputData UNUSED, int nbBytes UNUSED) {} - void DelayDetection::crossCorrelate (float *ref, float *seg, float *res, int refSize, int segSize) { diff --git a/sflphone-common/src/audio/delaydetection.h b/sflphone-common/src/audio/delaydetection.h index 45b5e6d1b6..17aab0f41d 100644 --- a/sflphone-common/src/audio/delaydetection.h +++ b/sflphone-common/src/audio/delaydetection.h @@ -114,8 +114,6 @@ class DelayDetection : public Algorithm virtual int process (SFLDataFormat *inputData, SFLDataFormat *outputData, int nbBytes); - virtual void process (SFLDataFormat *micData, SFLDataFormat *spkrData, SFLDataFormat *outputData, int nbBytes); - private: enum State { diff --git a/sflphone-common/src/audio/echocancel.cpp b/sflphone-common/src/audio/echocancel.cpp index 28a3271b02..5f2c47c37c 100644 --- a/sflphone-common/src/audio/echocancel.cpp +++ b/sflphone-common/src/audio/echocancel.cpp @@ -330,11 +330,6 @@ int EchoCancel::process (SFLDataFormat *inputData, SFLDataFormat *outputData, in return nbFrame * _smplPerFrame; } -void EchoCancel::process (SFLDataFormat *micData UNUSED, SFLDataFormat *spkrData UNUSED, SFLDataFormat *outputData UNUSED, int nbBytes UNUSED) -{ - -} - void EchoCancel::setSamplingRate (int smplRate) { diff --git a/sflphone-common/src/audio/echocancel.h b/sflphone-common/src/audio/echocancel.h index 594ba4d815..66802d89f2 100644 --- a/sflphone-common/src/audio/echocancel.h +++ b/sflphone-common/src/audio/echocancel.h @@ -106,14 +106,6 @@ class EchoCancel : public Algorithm */ virtual int process (SFLDataFormat *inputData, SFLDataFormat *outputData, int nbBytes); - /** - * Perform echo cancellation, application must provide its own buffer - * \param micData containing mixed echo and voice data - * \param spkrData containing far-end voice data to be sent to speakers - * \param outputData containing the processed data - */ - virtual void process (SFLDataFormat *micData, SFLDataFormat *spkrData, SFLDataFormat *outputData, int nbBytes); - /** * Set echo canceller internal sampling rate, reset if sampling rate changed */ diff --git a/sflphone-common/src/audio/echosuppress.cpp b/sflphone-common/src/audio/echosuppress.cpp index b3df5b8f00..4ea3826263 100644 --- a/sflphone-common/src/audio/echosuppress.cpp +++ b/sflphone-common/src/audio/echosuppress.cpp @@ -74,5 +74,3 @@ int EchoSuppress::getData(SFLDataFormat *outputData) void EchoSuppress::process (SFLDataFormat *data UNUSED, int nbBytes UNUSED) {} int EchoSuppress::process (SFLDataFormat *inputData, SFLDataFormat *outputData, int nbBytes) { return 0; } - -void EchoSuppress::process (SFLDataFormat *micData UNUSED, SFLDataFormat *spkrData UNUSED, SFLDataFormat *outputData UNUSED, int nbBytes UNUSED) {} diff --git a/sflphone-common/src/audio/echosuppress.h b/sflphone-common/src/audio/echosuppress.h index 1298c77f4a..a60c7152e7 100644 --- a/sflphone-common/src/audio/echosuppress.h +++ b/sflphone-common/src/audio/echosuppress.h @@ -40,16 +40,6 @@ public: * \param outputData containing */ virtual int process (SFLDataFormat *, SFLDataFormat *, int); - - /** - * Perform echo cancellation, application must provide its own buffer - * \param micData containing mixed echo and voice data - * \param spkrData containing far-end voice data to be sent to speakers - * \param outputData containing the processed data - * \param size in bytes - */ - virtual void process (SFLDataFormat *, SFLDataFormat *, SFLDataFormat *, int); - private: /** diff --git a/sflphone-common/src/audio/noisesuppress.cpp b/sflphone-common/src/audio/noisesuppress.cpp index 2c7d09423e..7016b5f10d 100644 --- a/sflphone-common/src/audio/noisesuppress.cpp +++ b/sflphone-common/src/audio/noisesuppress.cpp @@ -69,8 +69,6 @@ int NoiseSuppress::process (SFLDataFormat *inputData, SFLDataFormat *outputData, return 0; } -void NoiseSuppress::process (SFLDataFormat *micData, SFLDataFormat *spkrData, SFLDataFormat *outputData, int nbBytes) {} - void NoiseSuppress::initNewNoiseSuppressor (int smplPerFrame, int samplingRate) { _noiseState = speex_preprocess_state_init (smplPerFrame, samplingRate); diff --git a/sflphone-common/src/audio/noisesuppress.h b/sflphone-common/src/audio/noisesuppress.h index 6f54ccad84..19897cb4b0 100644 --- a/sflphone-common/src/audio/noisesuppress.h +++ b/sflphone-common/src/audio/noisesuppress.h @@ -70,11 +70,6 @@ class NoiseSuppress : public Algorithm */ virtual int process (SFLDataFormat *inputData, SFLDataFormat *outputData, int nbBytes); - /** - * Unused - */ - virtual void process (SFLDataFormat *micData, SFLDataFormat *spkrData, SFLDataFormat *outputData, int nbBytes); - private: void initNewNoiseSuppressor (int _smplPerFrame, int samplingRate); diff --git a/sflphone-common/src/audio/speexechocancel.cpp b/sflphone-common/src/audio/speexechocancel.cpp index 1d5a17384d..130f04f3cf 100644 --- a/sflphone-common/src/audio/speexechocancel.cpp +++ b/sflphone-common/src/audio/speexechocancel.cpp @@ -205,8 +205,3 @@ int SpeexEchoCancel::process (SFLDataFormat *inputData, SFLDataFormat *outputDat return nbFrame * EC_FRAME_SIZE * sizeof(SFLDataFormat); } - -void SpeexEchoCancel::process (SFLDataFormat *micData UNUSED, SFLDataFormat *spkrData UNUSED, SFLDataFormat *outputData UNUSED, int nbBytes UNUSED) -{ - -} diff --git a/sflphone-common/src/audio/speexechocancel.h b/sflphone-common/src/audio/speexechocancel.h index 788546848e..74e9bbf00a 100644 --- a/sflphone-common/src/audio/speexechocancel.h +++ b/sflphone-common/src/audio/speexechocancel.h @@ -57,16 +57,6 @@ class SpeexEchoCancel : public Algorithm */ virtual int process (SFLDataFormat *, SFLDataFormat *, int); - /** - * Perform echo cancellation, application must provide its own buffer - * \param micData containing mixed echo and voice data - * \param spkrData containing far-end voice data to be sent to speakers - * \param outputData containing the processed data - * \param size in bytes - */ - - virtual void process (SFLDataFormat *, SFLDataFormat *, SFLDataFormat *, int); - private: SpeexEchoState *_echoState; -- GitLab