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

Unified Diff: talk/app/webrtc/test/fakeaudiocapturemodule_unittest.cc

Issue 1224093003: Update audio code to use size_t more correctly, talk/ portion. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: Created 5 years, 5 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
« no previous file with comments | « talk/app/webrtc/test/fakeaudiocapturemodule.cc ('k') | talk/media/base/audiorenderer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: talk/app/webrtc/test/fakeaudiocapturemodule_unittest.cc
diff --git a/talk/app/webrtc/test/fakeaudiocapturemodule_unittest.cc b/talk/app/webrtc/test/fakeaudiocapturemodule_unittest.cc
index 56f1d070eddfdebc1b1d29bbfe976c219d45f402..9aac44602da2363a6d4c8aaa2a7b3402a9d4251f 100644
--- a/talk/app/webrtc/test/fakeaudiocapturemodule_unittest.cc
+++ b/talk/app/webrtc/test/fakeaudiocapturemodule_unittest.cc
@@ -56,8 +56,8 @@ class FakeAdmTest : public testing::Test,
// Callbacks inherited from webrtc::AudioTransport.
// ADM is pushing data.
int32_t RecordedDataIsAvailable(const void* audioSamples,
- const uint32_t nSamples,
- const uint8_t nBytesPerSample,
+ const size_t nSamples,
+ const size_t nBytesPerSample,
const uint8_t nChannels,
const uint32_t samplesPerSec,
const uint32_t totalDelayMS,
@@ -79,17 +79,17 @@ class FakeAdmTest : public testing::Test,
}
// ADM is pulling data.
- int32_t NeedMorePlayData(const uint32_t nSamples,
- const uint8_t nBytesPerSample,
+ int32_t NeedMorePlayData(const size_t nSamples,
+ const size_t nBytesPerSample,
const uint8_t nChannels,
const uint32_t samplesPerSec,
void* audioSamples,
- uint32_t& nSamplesOut,
+ size_t& nSamplesOut,
int64_t* elapsed_time_ms,
int64_t* ntp_time_ms) override {
++pull_iterations_;
- const uint32_t audio_buffer_size = nSamples * nBytesPerSample;
- const uint32_t bytes_out = RecordedDataReceived() ?
+ const size_t audio_buffer_size = nSamples * nBytesPerSample;
+ const size_t bytes_out = RecordedDataReceived() ?
CopyFromRecBuffer(audioSamples, audio_buffer_size):
GenerateZeroBuffer(audioSamples, audio_buffer_size);
nSamplesOut = bytes_out / nBytesPerSample;
@@ -107,13 +107,13 @@ class FakeAdmTest : public testing::Test,
bool RecordedDataReceived() const {
return rec_buffer_bytes_ != 0;
}
- int32_t GenerateZeroBuffer(void* audio_buffer, uint32_t audio_buffer_size) {
+ size_t GenerateZeroBuffer(void* audio_buffer, size_t audio_buffer_size) {
memset(audio_buffer, 0, audio_buffer_size);
return audio_buffer_size;
}
- int32_t CopyFromRecBuffer(void* audio_buffer, uint32_t audio_buffer_size) {
+ size_t CopyFromRecBuffer(void* audio_buffer, size_t audio_buffer_size) {
EXPECT_EQ(audio_buffer_size, rec_buffer_bytes_);
- const uint32_t min_buffer_size = min(audio_buffer_size, rec_buffer_bytes_);
+ const size_t min_buffer_size = min(audio_buffer_size, rec_buffer_bytes_);
memcpy(audio_buffer, rec_buffer_, min_buffer_size);
return min_buffer_size;
}
@@ -123,7 +123,7 @@ class FakeAdmTest : public testing::Test,
char rec_buffer_[FakeAudioCaptureModule::kNumberSamples *
FakeAudioCaptureModule::kNumberBytesPerSample];
- uint32_t rec_buffer_bytes_;
+ size_t rec_buffer_bytes_;
};
TEST_F(FakeAdmTest, TestProccess) {
« no previous file with comments | « talk/app/webrtc/test/fakeaudiocapturemodule.cc ('k') | talk/media/base/audiorenderer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698