8df5d4f15b
In order for the change to be reviewable, the move was made into two steps consisting of the first two patches in this CL. Step 1 (patch set 1): -Changed file types to use .cc -Changed buildfiles to use the new files -Changed C code inclusion to properly match the changed file formats (removed and added extern "C" declarations). -Changed implicit void-> nonvoid casts that are illegal in C++ to be explicit. Step 2 (patch set 2): -Changed all the warnings reported when uploading the CL. -The warnings about formatting of the assembly optimized code were not addressed though. BUG=webrtc:5201 Review URL: https://codereview.webrtc.org/1713923002 Cr-Commit-Position: refs/heads/master@{#11727}
68 lines
1.7 KiB
C
68 lines
1.7 KiB
C
/*
|
|
* Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AEC_ECHO_CANCELLATION_INTERNAL_H_
|
|
#define WEBRTC_MODULES_AUDIO_PROCESSING_AEC_ECHO_CANCELLATION_INTERNAL_H_
|
|
|
|
extern "C" {
|
|
#include "webrtc/common_audio/ring_buffer.h"
|
|
}
|
|
#include "webrtc/modules/audio_processing/aec/aec_core.h"
|
|
|
|
typedef struct {
|
|
int delayCtr;
|
|
int sampFreq;
|
|
int splitSampFreq;
|
|
int scSampFreq;
|
|
float sampFactor; // scSampRate / sampFreq
|
|
short skewMode;
|
|
int bufSizeStart;
|
|
int knownDelay;
|
|
int rate_factor;
|
|
|
|
short initFlag; // indicates if AEC has been initialized
|
|
|
|
// Variables used for averaging far end buffer size
|
|
short counter;
|
|
int sum;
|
|
short firstVal;
|
|
short checkBufSizeCtr;
|
|
|
|
// Variables used for delay shifts
|
|
short msInSndCardBuf;
|
|
short filtDelay; // Filtered delay estimate.
|
|
int timeForDelayChange;
|
|
int startup_phase;
|
|
int checkBuffSize;
|
|
short lastDelayDiff;
|
|
|
|
#ifdef WEBRTC_AEC_DEBUG_DUMP
|
|
FILE* bufFile;
|
|
FILE* delayFile;
|
|
FILE* skewFile;
|
|
#endif
|
|
|
|
// Structures
|
|
void* resampler;
|
|
|
|
int skewFrCtr;
|
|
int resample; // if the skew is small enough we don't resample
|
|
int highSkewCtr;
|
|
float skew;
|
|
|
|
RingBuffer* far_pre_buf; // Time domain far-end pre-buffer.
|
|
|
|
int farend_started;
|
|
|
|
AecCore* aec;
|
|
} Aec;
|
|
|
|
#endif // WEBRTC_MODULES_AUDIO_PROCESSING_AEC_ECHO_CANCELLATION_INTERNAL_H_
|