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

Side by Side Diff: trunk/src/media/audio/virtual_audio_input_stream_unittest.cc

Issue 487543002: Revert 290359 "Remove AudioBuffersState class." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 4 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <list> 5 #include <list>
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/rand_util.h" 9 #include "base/rand_util.h"
10 #include "base/synchronization/waitable_event.h" 10 #include "base/synchronization/waitable_event.h"
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 class TestAudioSource : public SineWaveAudioSource { 60 class TestAudioSource : public SineWaveAudioSource {
61 public: 61 public:
62 TestAudioSource() 62 TestAudioSource()
63 : SineWaveAudioSource( 63 : SineWaveAudioSource(
64 kParams.channel_layout(), 200.0, kParams.sample_rate()), 64 kParams.channel_layout(), 200.0, kParams.sample_rate()),
65 data_pulled_(false, false) {} 65 data_pulled_(false, false) {}
66 66
67 virtual ~TestAudioSource() {} 67 virtual ~TestAudioSource() {}
68 68
69 virtual int OnMoreData(AudioBus* audio_bus, 69 virtual int OnMoreData(AudioBus* audio_bus,
70 int total_bytes_delay) OVERRIDE { 70 AudioBuffersState audio_buffers) OVERRIDE {
71 const int ret = SineWaveAudioSource::OnMoreData(audio_bus, 71 const int ret = SineWaveAudioSource::OnMoreData(audio_bus, audio_buffers);
72 total_bytes_delay);
73 data_pulled_.Signal(); 72 data_pulled_.Signal();
74 return ret; 73 return ret;
75 } 74 }
76 75
77 void WaitForDataPulls() { 76 void WaitForDataPulls() {
78 for (int i = 0; i < 3; ++i) { 77 for (int i = 0; i < 3; ++i) {
79 data_pulled_.Wait(); 78 data_pulled_.Wait();
80 } 79 }
81 } 80 }
82 81
(...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after
338 } 337 }
339 RUN_ON_AUDIO_THREAD(Close); 338 RUN_ON_AUDIO_THREAD(Close);
340 WaitUntilClosed(); 339 WaitUntilClosed();
341 } 340 }
342 341
343 INSTANTIATE_TEST_CASE_P(SingleVersusMultithreaded, 342 INSTANTIATE_TEST_CASE_P(SingleVersusMultithreaded,
344 VirtualAudioInputStreamTest, 343 VirtualAudioInputStreamTest,
345 ::testing::Values(false, true)); 344 ::testing::Values(false, true));
346 345
347 } // namespace media 346 } // namespace media
OLDNEW
« no previous file with comments | « trunk/src/media/audio/sounds/audio_stream_handler.cc ('k') | trunk/src/media/audio/virtual_audio_output_stream.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698