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

Unified Diff: media/audio/mac/audio_manager_mac.cc

Issue 4661001: Simplified AudioOutputStream interface. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: - Created 10 years, 1 month 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 | « media/audio/mac/audio_manager_mac.h ('k') | media/audio/mac/audio_output_mac.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/audio/mac/audio_manager_mac.cc
diff --git a/media/audio/mac/audio_manager_mac.cc b/media/audio/mac/audio_manager_mac.cc
index 1eb9398ccd7603e9c6105d05ca2f35ab2b500324..4565bba54e0abce1525c33804e550c268aff24d0 100644
--- a/media/audio/mac/audio_manager_mac.cc
+++ b/media/audio/mac/audio_manager_mac.cc
@@ -13,7 +13,6 @@
namespace {
const int kMaxInputChannels = 2;
-const int kMaxSamplesPerPacket = media::Limits::kMaxSampleRate;
bool HasAudioHardware(AudioObjectPropertySelector selector) {
AudioDeviceID output_device_id = kAudioObjectUnknown;
@@ -45,22 +44,21 @@ bool AudioManagerMac::HasAudioInputDevices() {
AudioOutputStream* AudioManagerMac::MakeAudioOutputStream(
AudioParameters params) {
if (params.format == AudioParameters::AUDIO_MOCK)
- return FakeAudioOutputStream::MakeFakeStream();
+ return FakeAudioOutputStream::MakeFakeStream(params);
else if (params.format != AudioParameters::AUDIO_PCM_LINEAR)
return NULL;
return new PCMQueueOutAudioOutputStream(this, params);
}
AudioInputStream* AudioManagerMac::MakeAudioInputStream(
- AudioParameters params, int samples_per_packet) {
- if (!params.IsValid() || (params.channels > kMaxInputChannels) ||
- (samples_per_packet > kMaxSamplesPerPacket) || (samples_per_packet < 0))
+ AudioParameters params) {
+ if (!params.IsValid() || (params.channels > kMaxInputChannels))
return NULL;
if (params.format == AudioParameters::AUDIO_MOCK) {
- return FakeAudioInputStream::MakeFakeStream(params, samples_per_packet);
+ return FakeAudioInputStream::MakeFakeStream(params);
} else if (params.format == AudioParameters::AUDIO_PCM_LINEAR) {
- return new PCMQueueInAudioInputStream(this, params, samples_per_packet);
+ return new PCMQueueInAudioInputStream(this, params);
}
return NULL;
}
« no previous file with comments | « media/audio/mac/audio_manager_mac.h ('k') | media/audio/mac/audio_output_mac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698