Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(106)

Unified Diff: webrtc/modules/audio_processing/utility/ring_buffer_unittest.cc

Issue 1846903004: Moved ring-buffer related files from common_audio to audio_processing (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Corrected order of includes Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webrtc/modules/audio_processing/utility/ring_buffer_unittest.cc
diff --git a/webrtc/common_audio/ring_buffer_unittest.cc b/webrtc/modules/audio_processing/utility/ring_buffer_unittest.cc
similarity index 74%
rename from webrtc/common_audio/ring_buffer_unittest.cc
rename to webrtc/modules/audio_processing/utility/ring_buffer_unittest.cc
index 92c470a02d707ba27f14e57c489b4e0596243e60..e10ea407c6bbb23b2de6292140a4630485ee14fc 100644
--- a/webrtc/common_audio/ring_buffer_unittest.cc
+++ b/webrtc/modules/audio_processing/utility/ring_buffer_unittest.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/common_audio/ring_buffer.h"
+#include "webrtc/modules/audio_processing/utility/ring_buffer.h"
#include <stdlib.h>
#include <time.h>
@@ -21,9 +21,7 @@
namespace webrtc {
struct FreeBufferDeleter {
- inline void operator()(void* ptr) const {
- WebRtc_FreeBuffer(ptr);
- }
+ inline void operator()(void* ptr) const { WebRtc_FreeBuffer(ptr); }
};
typedef std::unique_ptr<RingBuffer, FreeBufferDeleter> scoped_ring_buffer;
@@ -31,7 +29,8 @@ static void AssertElementEq(int expected, int actual) {
ASSERT_EQ(expected, actual);
}
-static int SetIncrementingData(int* data, int num_elements,
+static int SetIncrementingData(int* data,
+ int num_elements,
int starting_value) {
for (int i = 0; i < num_elements; i++) {
data[i] = starting_value++;
@@ -39,7 +38,8 @@ static int SetIncrementingData(int* data, int num_elements,
return starting_value;
}
-static int CheckIncrementingData(int* data, int num_elements,
+static int CheckIncrementingData(int* data,
+ int num_elements,
int starting_value) {
for (int i = 0; i < num_elements; i++) {
AssertElementEq(starting_value++, data[i]);
@@ -76,28 +76,26 @@ static void RandomStressTest(int** data_ptr) {
WebRtc_available_write(buffer.get()));
const int expected_elements = std::min(num_elements, buffer_available);
write_element = SetIncrementingData(write_data.get(), expected_elements,
- write_element);
- ASSERT_EQ(static_cast<size_t>(expected_elements),
- WebRtc_WriteBuffer(buffer.get(), write_data.get(),
- num_elements));
- buffer_consumed = std::min(buffer_consumed + expected_elements,
- buffer_size);
+ write_element);
+ ASSERT_EQ(
+ static_cast<size_t>(expected_elements),
+ WebRtc_WriteBuffer(buffer.get(), write_data.get(), num_elements));
+ buffer_consumed =
+ std::min(buffer_consumed + expected_elements, buffer_size);
} else {
- const int expected_elements = std::min(num_elements,
- buffer_consumed);
+ const int expected_elements = std::min(num_elements, buffer_consumed);
ASSERT_EQ(static_cast<size_t>(buffer_consumed),
WebRtc_available_read(buffer.get()));
- ASSERT_EQ(static_cast<size_t>(expected_elements),
- WebRtc_ReadBuffer(buffer.get(),
- reinterpret_cast<void**>(data_ptr),
- read_data.get(),
- num_elements));
+ ASSERT_EQ(
+ static_cast<size_t>(expected_elements),
+ WebRtc_ReadBuffer(buffer.get(), reinterpret_cast<void**>(data_ptr),
+ read_data.get(), num_elements));
int* check_ptr = read_data.get();
if (data_ptr) {
check_ptr = *data_ptr;
}
- read_element = CheckIncrementingData(check_ptr, expected_elements,
- read_element);
+ read_element =
+ CheckIncrementingData(check_ptr, expected_elements, read_element);
buffer_consumed = std::max(buffer_consumed - expected_elements, 0);
}
}
@@ -126,15 +124,16 @@ TEST(RingBufferTest, PassingNulltoReadBufferForcesMemcpy) {
SetIncrementingData(write_data, kDataSize, 0);
EXPECT_EQ(kDataSize, WebRtc_WriteBuffer(buffer.get(), write_data, kDataSize));
SetIncrementingData(read_data, kDataSize, kDataSize);
- EXPECT_EQ(kDataSize, WebRtc_ReadBuffer(buffer.get(),
- reinterpret_cast<void**>(&data_ptr), read_data, kDataSize));
+ EXPECT_EQ(kDataSize,
+ WebRtc_ReadBuffer(buffer.get(), reinterpret_cast<void**>(&data_ptr),
+ read_data, kDataSize));
// Copying was not necessary, so |read_data| has not been updated.
CheckIncrementingData(data_ptr, kDataSize, 0);
CheckIncrementingData(read_data, kDataSize, kDataSize);
EXPECT_EQ(kDataSize, WebRtc_WriteBuffer(buffer.get(), write_data, kDataSize));
- EXPECT_EQ(kDataSize, WebRtc_ReadBuffer(buffer.get(), NULL, read_data,
- kDataSize));
+ EXPECT_EQ(kDataSize,
+ WebRtc_ReadBuffer(buffer.get(), NULL, read_data, kDataSize));
// Passing NULL forces a memcpy, so |read_data| is now updated.
CheckIncrementingData(read_data, kDataSize, 0);
}

Powered by Google App Engine
This is Rietveld 408576698