Move one CircularBuffer to webrtc::test namespace.
There are currently two webrtc::CircularBuffers defined:
- modules/audio_coding/test/utility.{h,cc}
- modules/audio_processing/echo_detector/circular_buffer.{h,cc}
This CL moves the former definition to the webrtc::test namespace,
to avoid link errors in a future build target.
BUG=None
Review-Url: https://codereview.webrtc.org/2667383008
Cr-Commit-Position: refs/heads/master@{#16553}
diff --git a/webrtc/modules/audio_coding/test/APITest.cc b/webrtc/modules/audio_coding/test/APITest.cc
index 1b99813..a4fc986 100644
--- a/webrtc/modules/audio_coding/test/APITest.cc
+++ b/webrtc/modules/audio_coding/test/APITest.cc
@@ -678,7 +678,7 @@
double averageEstimDelay = 0;
double averageDelay = 0;
- CircularBuffer estimDelayCB(100);
+ test::CircularBuffer estimDelayCB(100);
estimDelayCB.SetArithMean(true);
if (side == 'A') {
diff --git a/webrtc/modules/audio_coding/test/utility.cc b/webrtc/modules/audio_coding/test/utility.cc
index 5c1fc3f..30bafd4 100644
--- a/webrtc/modules/audio_coding/test/utility.cc
+++ b/webrtc/modules/audio_coding/test/utility.cc
@@ -136,6 +136,8 @@
}
+namespace test {
+
CircularBuffer::CircularBuffer(uint32_t len)
: _buff(NULL),
_idx(0),
@@ -265,6 +267,8 @@
}
}
+} // namespace test
+
bool FixedPayloadTypeCodec(const char* payloadName) {
char fixPayloadTypeCodecs[NUM_CODECS_WITH_FIXED_PAYLOAD_TYPE][32] = { "PCMU",
"PCMA", "GSM", "G723", "DVI4", "LPC", "PCMA", "G722", "QCELP", "CN",
diff --git a/webrtc/modules/audio_coding/test/utility.h b/webrtc/modules/audio_coding/test/utility.h
index 1a3e06d..8af3675 100644
--- a/webrtc/modules/audio_coding/test/utility.h
+++ b/webrtc/modules/audio_coding/test/utility.h
@@ -83,6 +83,9 @@
unsigned long _hour;
};
+// To avoid clashes with CircularBuffer in APM.
+namespace test {
+
class CircularBuffer {
public:
CircularBuffer(uint32_t len);
@@ -109,6 +112,8 @@
double _sumSqr;
};
+} // namespace test
+
int16_t ChooseCodec(CodecInst& codecInst);
void PrintCodecs();