diff --git a/sflphone-common/src/audio/algorithm.h b/sflphone-common/src/audio/algorithm.h index b73e3820ca1f78ca267ed528794f21c676dffc7a..8afb3fd24a635f60e6259909c6642860e43a6a94 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 e2b42c283bbcc8b2f09d8151aafe0cca6f022fff..f7aba723f50b2bab92d9082c534256696a9e0421 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 c92b7503d10f57b3e4528c4c9ab8b5e4d4fd2371..195549a4d60b43c12d977f2dc7f3255492a3cff4 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 08766e6774658f9eb05271419e9422d8d40a4cf4..0d83af22fe8d5446c49591007b5896f267b6a4f0 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 ebaef02b2cad83a37bfda83903d5fea6dd4e615a..563fd82b99e27fe4b01ad58894cc0aa1f39c31a7 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 5ff2b8818f8267d8aed16c7c3dd3f707b2cf6ca3..a68f5588bbc7393eca4ed94a417e49350b6da21a 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 45b5e6d1b6bd987c10afabd1114f998ea4152593..17aab0f41dbc0ef11668fa111f1a7de251727a59 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 28a3271b0280a1d653131e9244f5e79826ca68a3..5f2c47c37c610f4fac649afe05e2426ffa5c9b79 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 594ba4d815e65342e3b66287babb77b5cf506cfd..66802d89f2259346f04d697e44358b2e46f79762 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 b3df5b8f00251c84c3eb46d9577b7593837b2a91..4ea38262632489c03f2aaf38c83b82259dd4a192 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 1298c77f4abae0ef5b056823e6754d3b62d43f43..a60c7152e7d2a7dfcdb9660e37373f19416073f9 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 2c7d09423e4771107b8a66f2245356570f0a119f..7016b5f10d1c87440d52d83095853a96e2566b2e 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 6f54ccad84cbbdce402279f95476f068236f1866..19897cb4b0cb18e71e9fea4a643b0fffd4bb6278 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 1d5a17384d1d47bcb3c4ee7e67d4e55b5aaf310d..130f04f3cf988ea60a43a1724d23aadd1e867183 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 788546848e6f71d5ea5283aa5d2ae3c90aef4c11..74e9bbf00a0f07785443d253096118b8abddc3eb 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;