summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorjhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-22 22:01:51 +0000
committerjhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-22 22:01:51 +0000
commit6a91ba4895a3d45be9cdf92b82dc2de7fb4f45f7 (patch)
treee5fbb337aa187ae107767f886eedba9fcdab28ee /media
parent6328a5b2c36c0067b365a702946a4fbd60577f5d (diff)
downloadchromium_src-6a91ba4895a3d45be9cdf92b82dc2de7fb4f45f7.zip
chromium_src-6a91ba4895a3d45be9cdf92b82dc2de7fb4f45f7.tar.gz
chromium_src-6a91ba4895a3d45be9cdf92b82dc2de7fb4f45f7.tar.bz2
Coverity: Pass parameters by reference.
CID=13686,13687,13688,13709,13710,13711,13712,13713,13714,13718,13715,13716, 13717,13796,13797,13798,13811,13812,13813,14708,16329 BUG=none TEST=none R=vandebo@chromium.org Review URL: http://codereview.chromium.org/7218031 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@90112 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
-rw-r--r--media/audio/audio_input_controller.cc6
-rw-r--r--media/audio/audio_input_controller.h6
-rw-r--r--media/audio/audio_manager.h6
-rw-r--r--media/audio/audio_output_controller.cc6
-rw-r--r--media/audio/audio_output_controller.h6
-rw-r--r--media/audio/audio_output_proxy_unittest.cc4
-rw-r--r--media/audio/fake_audio_input_stream.cc5
-rw-r--r--media/audio/fake_audio_input_stream.h4
-rw-r--r--media/audio/fake_audio_output_stream.cc4
-rw-r--r--media/audio/fake_audio_output_stream.h4
-rw-r--r--media/audio/linux/alsa_output.cc2
-rw-r--r--media/audio/linux/alsa_output.h2
-rw-r--r--media/audio/linux/audio_manager_linux.cc4
-rw-r--r--media/audio/linux/audio_manager_linux.h5
-rw-r--r--media/audio/mac/audio_input_mac.cc2
-rw-r--r--media/audio/mac/audio_input_mac.h2
-rw-r--r--media/audio/mac/audio_low_latency_output_mac.cc2
-rw-r--r--media/audio/mac/audio_low_latency_output_mac.h2
-rw-r--r--media/audio/mac/audio_manager_mac.cc4
-rw-r--r--media/audio/mac/audio_manager_mac.h6
-rw-r--r--media/audio/mac/audio_output_mac.cc2
-rw-r--r--media/audio/mac/audio_output_mac.h2
-rw-r--r--media/audio/openbsd/audio_manager_openbsd.cc4
-rw-r--r--media/audio/openbsd/audio_manager_openbsd.h6
-rw-r--r--media/audio/win/audio_manager_win.cc4
-rw-r--r--media/audio/win/audio_manager_win.h6
-rw-r--r--media/audio/win/wavein_input_win.cc2
-rw-r--r--media/audio/win/wavein_input_win.h6
-rw-r--r--media/audio/win/waveout_output_win.cc2
-rw-r--r--media/audio/win/waveout_output_win.h6
30 files changed, 68 insertions, 54 deletions
diff --git a/media/audio/audio_input_controller.cc b/media/audio/audio_input_controller.cc
index a8209f5..da957e6 100644
--- a/media/audio/audio_input_controller.cc
+++ b/media/audio/audio_input_controller.cc
@@ -37,7 +37,7 @@ AudioInputController::~AudioInputController() {
// static
scoped_refptr<AudioInputController> AudioInputController::Create(
EventHandler* event_handler,
- AudioParameters params) {
+ const AudioParameters& params) {
if (!params.IsValid() || (params.channels > kMaxInputChannels))
return NULL;
@@ -60,7 +60,7 @@ scoped_refptr<AudioInputController> AudioInputController::Create(
// static
scoped_refptr<AudioInputController> AudioInputController::CreateLowLatency(
EventHandler* event_handler,
- AudioParameters params,
+ const AudioParameters& params,
SyncWriter* sync_writer) {
DCHECK(sync_writer);
@@ -113,7 +113,7 @@ void AudioInputController::Close() {
thread_.Stop();
}
-void AudioInputController::DoCreate(AudioParameters params) {
+void AudioInputController::DoCreate(const AudioParameters& params) {
stream_ = AudioManager::GetAudioManager()->MakeAudioInputStream(params);
if (!stream_) {
diff --git a/media/audio/audio_input_controller.h b/media/audio/audio_input_controller.h
index b8789e0..164b09f 100644
--- a/media/audio/audio_input_controller.h
+++ b/media/audio/audio_input_controller.h
@@ -87,12 +87,12 @@ class AudioInputController
// handler will receive a OnCreated() call.
static scoped_refptr<AudioInputController> Create(
EventHandler* event_handler,
- AudioParameters params);
+ const AudioParameters& params);
// Factory method for creating a low latency audio stream.
static scoped_refptr<AudioInputController> CreateLowLatency(
EventHandler* event_handler,
- AudioParameters params,
+ const AudioParameters& params,
// External synchronous reader for audio controller.
SyncWriter* sync_writer);
@@ -136,7 +136,7 @@ class AudioInputController
AudioInputController(EventHandler* handler, SyncWriter* sync_writer);
// The following methods are executed on the audio controller thread.
- void DoCreate(AudioParameters params);
+ void DoCreate(const AudioParameters& params);
void DoRecord();
void DoClose();
void DoReportError(int code);
diff --git a/media/audio/audio_manager.h b/media/audio/audio_manager.h
index 4e9c6b3..29cc23d 100644
--- a/media/audio/audio_manager.h
+++ b/media/audio/audio_manager.h
@@ -70,7 +70,8 @@ class AudioManager {
// available.
//
// Do not free the returned AudioOutputStream. It is owned by AudioManager.
- virtual AudioOutputStream* MakeAudioOutputStream(AudioParameters params) = 0;
+ virtual AudioOutputStream* MakeAudioOutputStream(
+ const AudioParameters& params) = 0;
// Creates new audio output proxy. A proxy implements
// AudioOutputStream interface, but unlike regular output stream
@@ -91,7 +92,8 @@ class AudioManager {
//
// Do not free the returned AudioInputStream. It is owned by AudioManager.
// When you are done with it, call |Stop()| and |Close()| to release it.
- virtual AudioInputStream* MakeAudioInputStream(AudioParameters params) = 0;
+ virtual AudioInputStream* MakeAudioInputStream(
+ const AudioParameters& params) = 0;
// Muting continues playback but effectively the volume is set to zero.
// Un-muting returns the volume to the previous level.
diff --git a/media/audio/audio_output_controller.cc b/media/audio/audio_output_controller.cc
index af00d0c..08b4fdb 100644
--- a/media/audio/audio_output_controller.cc
+++ b/media/audio/audio_output_controller.cc
@@ -31,7 +31,7 @@ AudioOutputController::~AudioOutputController() {
// static
scoped_refptr<AudioOutputController> AudioOutputController::Create(
EventHandler* event_handler,
- AudioParameters params,
+ const AudioParameters& params,
uint32 buffer_capacity) {
if (!params.IsValid())
@@ -56,7 +56,7 @@ scoped_refptr<AudioOutputController> AudioOutputController::Create(
// static
scoped_refptr<AudioOutputController> AudioOutputController::CreateLowLatency(
EventHandler* event_handler,
- AudioParameters params,
+ const AudioParameters& params,
SyncReader* sync_reader) {
DCHECK(sync_reader);
@@ -129,7 +129,7 @@ void AudioOutputController::EnqueueData(const uint8* data, uint32 size) {
}
}
-void AudioOutputController::DoCreate(AudioParameters params) {
+void AudioOutputController::DoCreate(const AudioParameters& params) {
DCHECK_EQ(message_loop_, MessageLoop::current());
// Close() can be called before DoCreate() is executed.
diff --git a/media/audio/audio_output_controller.h b/media/audio/audio_output_controller.h
index 86c677f..e5248a6 100644
--- a/media/audio/audio_output_controller.h
+++ b/media/audio/audio_output_controller.h
@@ -107,7 +107,7 @@ class AudioOutputController
// event handler will receive a OnCreated() call.
static scoped_refptr<AudioOutputController> Create(
EventHandler* event_handler,
- AudioParameters params,
+ const AudioParameters& params,
// Soft limit for buffer capacity in this controller. This parameter
// is used only in regular latency mode.
uint32 buffer_capacity);
@@ -115,7 +115,7 @@ class AudioOutputController
// Factory method for creating a low latency audio stream.
static scoped_refptr<AudioOutputController> CreateLowLatency(
EventHandler* event_handler,
- AudioParameters params,
+ const AudioParameters& params,
// External synchronous reader for audio controller.
SyncReader* sync_reader);
@@ -161,7 +161,7 @@ class AudioOutputController
uint32 capacity, SyncReader* sync_reader);
// The following methods are executed on the audio controller thread.
- void DoCreate(AudioParameters params);
+ void DoCreate(const AudioParameters& params);
void DoPlay();
void DoPause();
void DoFlush();
diff --git a/media/audio/audio_output_proxy_unittest.cc b/media/audio/audio_output_proxy_unittest.cc
index 1de3149..895cb1b 100644
--- a/media/audio/audio_output_proxy_unittest.cc
+++ b/media/audio/audio_output_proxy_unittest.cc
@@ -41,11 +41,11 @@ class MockAudioManager : public AudioManager {
MOCK_METHOD0(HasAudioInputDevices, bool());
MOCK_METHOD0(GetAudioInputDeviceModel, string16());
MOCK_METHOD1(MakeAudioOutputStream, AudioOutputStream*(
- AudioParameters params));
+ const AudioParameters& params));
MOCK_METHOD1(MakeAudioOutputStreamProxy, AudioOutputStream*(
const AudioParameters& params));
MOCK_METHOD1(MakeAudioInputStream, AudioInputStream*(
- AudioParameters params));
+ const AudioParameters& params));
MOCK_METHOD0(MuteAll, void());
MOCK_METHOD0(UnMuteAll, void());
MOCK_METHOD0(CanShowAudioInputSettings, bool());
diff --git a/media/audio/fake_audio_input_stream.cc b/media/audio/fake_audio_input_stream.cc
index dacea2f..26ac880 100644
--- a/media/audio/fake_audio_input_stream.cc
+++ b/media/audio/fake_audio_input_stream.cc
@@ -7,11 +7,12 @@
using base::Time;
using base::TimeDelta;
-AudioInputStream* FakeAudioInputStream::MakeFakeStream(AudioParameters params) {
+AudioInputStream* FakeAudioInputStream::MakeFakeStream(
+ const AudioParameters& params) {
return new FakeAudioInputStream(params);
}
-FakeAudioInputStream::FakeAudioInputStream(AudioParameters params)
+FakeAudioInputStream::FakeAudioInputStream(const AudioParameters& params)
: callback_(NULL),
buffer_size_((params.channels * params.bits_per_sample *
params.samples_per_packet) / 8),
diff --git a/media/audio/fake_audio_input_stream.h b/media/audio/fake_audio_input_stream.h
index 8fa15c2..4ace4877 100644
--- a/media/audio/fake_audio_input_stream.h
+++ b/media/audio/fake_audio_input_stream.h
@@ -20,7 +20,7 @@ class FakeAudioInputStream :
public AudioInputStream,
public base::RefCountedThreadSafe<FakeAudioInputStream> {
public:
- static AudioInputStream* MakeFakeStream(AudioParameters params);
+ static AudioInputStream* MakeFakeStream(const AudioParameters& params);
virtual bool Open();
virtual void Start(AudioInputCallback* callback);
@@ -31,7 +31,7 @@ class FakeAudioInputStream :
// Give RefCountedThreadSafe access our destructor.
friend class base::RefCountedThreadSafe<FakeAudioInputStream>;
- FakeAudioInputStream(AudioParameters params);
+ FakeAudioInputStream(const AudioParameters& params);
virtual ~FakeAudioInputStream();
void DoCallback();
diff --git a/media/audio/fake_audio_output_stream.cc b/media/audio/fake_audio_output_stream.cc
index 1530227..fe0d857 100644
--- a/media/audio/fake_audio_output_stream.cc
+++ b/media/audio/fake_audio_output_stream.cc
@@ -12,7 +12,7 @@ FakeAudioOutputStream* FakeAudioOutputStream::last_fake_stream_ = NULL;
// static
AudioOutputStream* FakeAudioOutputStream::MakeFakeStream(
- AudioParameters params) {
+ const AudioParameters& params) {
if (!has_created_fake_stream_)
base::AtExitManager::RegisterCallback(&DestroyLastFakeStream, NULL);
has_created_fake_stream_ = true;
@@ -63,7 +63,7 @@ void FakeAudioOutputStream::Close() {
closed_ = true;
}
-FakeAudioOutputStream::FakeAudioOutputStream(AudioParameters params)
+FakeAudioOutputStream::FakeAudioOutputStream(const AudioParameters& params)
: volume_(0),
callback_(NULL),
packet_size_(params.GetPacketSize()),
diff --git a/media/audio/fake_audio_output_stream.h b/media/audio/fake_audio_output_stream.h
index e94aae3..82453ef 100644
--- a/media/audio/fake_audio_output_stream.h
+++ b/media/audio/fake_audio_output_stream.h
@@ -17,7 +17,7 @@
class FakeAudioOutputStream : public AudioOutputStream {
public:
- static AudioOutputStream* MakeFakeStream(AudioParameters params);
+ static AudioOutputStream* MakeFakeStream(const AudioParameters& params);
static FakeAudioOutputStream* GetLastFakeStream();
virtual bool Open();
@@ -31,7 +31,7 @@ class FakeAudioOutputStream : public AudioOutputStream {
double volume() { return volume_; }
private:
- explicit FakeAudioOutputStream(AudioParameters params);
+ explicit FakeAudioOutputStream(const AudioParameters& params);
virtual ~FakeAudioOutputStream();
static void DestroyLastFakeStream(void* param);
diff --git a/media/audio/linux/alsa_output.cc b/media/audio/linux/alsa_output.cc
index 3802462..4dcfe77 100644
--- a/media/audio/linux/alsa_output.cc
+++ b/media/audio/linux/alsa_output.cc
@@ -178,7 +178,7 @@ const uint32 AlsaPcmOutputStream::kMinLatencyMicros =
kSleepErrorMilliseconds * 2 * 1000;
AlsaPcmOutputStream::AlsaPcmOutputStream(const std::string& device_name,
- AudioParameters params,
+ const AudioParameters& params,
AlsaWrapper* wrapper,
AudioManagerLinux* manager,
MessageLoop* message_loop)
diff --git a/media/audio/linux/alsa_output.h b/media/audio/linux/alsa_output.h
index 48482b1..4f6e8da 100644
--- a/media/audio/linux/alsa_output.h
+++ b/media/audio/linux/alsa_output.h
@@ -70,7 +70,7 @@ class AlsaPcmOutputStream : public AudioOutputStream {
//
// If unsure of what to use for |device_name|, use |kAutoSelectDevice|.
AlsaPcmOutputStream(const std::string& device_name,
- AudioParameters params,
+ const AudioParameters& params,
AlsaWrapper* wrapper,
AudioManagerLinux* manager,
MessageLoop* message_loop);
diff --git a/media/audio/linux/audio_manager_linux.cc b/media/audio/linux/audio_manager_linux.cc
index c21d050..f2b5d66 100644
--- a/media/audio/linux/audio_manager_linux.cc
+++ b/media/audio/linux/audio_manager_linux.cc
@@ -83,7 +83,7 @@ bool AudioManagerLinux::HasAudioInputDevices() {
}
AudioOutputStream* AudioManagerLinux::MakeAudioOutputStream(
- AudioParameters params) {
+ const AudioParameters& params) {
// Early return for testing hook. Do this before checking for
// |initialized_|.
if (params.format == AudioParameters::AUDIO_MOCK) {
@@ -113,7 +113,7 @@ AudioOutputStream* AudioManagerLinux::MakeAudioOutputStream(
}
AudioInputStream* AudioManagerLinux::MakeAudioInputStream(
- AudioParameters params) {
+ const AudioParameters& params) {
if (!params.IsValid() || params.channels > kMaxInputChannels)
return NULL;
diff --git a/media/audio/linux/audio_manager_linux.h b/media/audio/linux/audio_manager_linux.h
index 52d2940..6e06091 100644
--- a/media/audio/linux/audio_manager_linux.h
+++ b/media/audio/linux/audio_manager_linux.h
@@ -24,8 +24,9 @@ class AudioManagerLinux : public AudioManagerBase {
// Implementation of AudioManager.
virtual bool HasAudioOutputDevices();
virtual bool HasAudioInputDevices();
- virtual AudioOutputStream* MakeAudioOutputStream(AudioParameters params);
- virtual AudioInputStream* MakeAudioInputStream(AudioParameters params);
+ virtual AudioOutputStream* MakeAudioOutputStream(
+ const AudioParameters& params);
+ virtual AudioInputStream* MakeAudioInputStream(const AudioParameters& params);
virtual bool CanShowAudioInputSettings();
virtual void ShowAudioInputSettings();
virtual void GetAudioInputDeviceNames(media::AudioDeviceNames* device_names);
diff --git a/media/audio/mac/audio_input_mac.cc b/media/audio/mac/audio_input_mac.cc
index 3e6a721..3efe86c 100644
--- a/media/audio/mac/audio_input_mac.cc
+++ b/media/audio/mac/audio_input_mac.cc
@@ -17,7 +17,7 @@ enum {
#endif
PCMQueueInAudioInputStream::PCMQueueInAudioInputStream(
- AudioManagerMac* manager, AudioParameters params)
+ AudioManagerMac* manager, const AudioParameters& params)
: manager_(manager),
callback_(NULL),
audio_queue_(NULL),
diff --git a/media/audio/mac/audio_input_mac.h b/media/audio/mac/audio_input_mac.h
index 078d4da..1796d82 100644
--- a/media/audio/mac/audio_input_mac.h
+++ b/media/audio/mac/audio_input_mac.h
@@ -19,7 +19,7 @@ class PCMQueueInAudioInputStream : public AudioInputStream {
public:
// Parameters as per AudioManager::MakeAudioInputStream.
PCMQueueInAudioInputStream(AudioManagerMac* manager,
- AudioParameters params);
+ const AudioParameters& params);
virtual ~PCMQueueInAudioInputStream();
// Implementation of AudioInputStream.
diff --git a/media/audio/mac/audio_low_latency_output_mac.cc b/media/audio/mac/audio_low_latency_output_mac.cc
index 2c736a9..e634776 100644
--- a/media/audio/mac/audio_low_latency_output_mac.cc
+++ b/media/audio/mac/audio_low_latency_output_mac.cc
@@ -28,7 +28,7 @@ using media::SwizzleCoreAudioLayout5_1;
// and notify the audio manager, which likely will destroy this object.
AUAudioOutputStream::AUAudioOutputStream(
- AudioManagerMac* manager, AudioParameters params)
+ AudioManagerMac* manager, const AudioParameters& params)
: manager_(manager),
source_(NULL),
output_unit_(0),
diff --git a/media/audio/mac/audio_low_latency_output_mac.h b/media/audio/mac/audio_low_latency_output_mac.h
index 446edaa..724d60b 100644
--- a/media/audio/mac/audio_low_latency_output_mac.h
+++ b/media/audio/mac/audio_low_latency_output_mac.h
@@ -20,7 +20,7 @@ class AUAudioOutputStream : public AudioOutputStream {
// The ctor takes all the usual parameters, plus |manager| which is the
// the audio manager who is creating this object.
AUAudioOutputStream(AudioManagerMac* manager,
- AudioParameters params);
+ const AudioParameters& params);
// The dtor is typically called by the AudioManager only and it is usually
// triggered by calling AudioOutputStream::Close().
virtual ~AUAudioOutputStream();
diff --git a/media/audio/mac/audio_manager_mac.cc b/media/audio/mac/audio_manager_mac.cc
index 2679cac..ab2e18c 100644
--- a/media/audio/mac/audio_manager_mac.cc
+++ b/media/audio/mac/audio_manager_mac.cc
@@ -94,7 +94,7 @@ void AudioManagerMac::GetAudioInputDeviceNames(
}
AudioOutputStream* AudioManagerMac::MakeAudioOutputStream(
- AudioParameters params) {
+ const AudioParameters& params) {
if (!params.IsValid())
return NULL;
@@ -119,7 +119,7 @@ AudioOutputStream* AudioManagerMac::MakeAudioOutputStream(
}
AudioInputStream* AudioManagerMac::MakeAudioInputStream(
- AudioParameters params) {
+ const AudioParameters& params) {
if (!params.IsValid() || (params.channels > kMaxInputChannels))
return NULL;
diff --git a/media/audio/mac/audio_manager_mac.h b/media/audio/mac/audio_manager_mac.h
index 2556aec..b4ad7c6 100644
--- a/media/audio/mac/audio_manager_mac.h
+++ b/media/audio/mac/audio_manager_mac.h
@@ -22,8 +22,10 @@ class AudioManagerMac : public AudioManagerBase {
virtual bool HasAudioOutputDevices();
virtual bool HasAudioInputDevices();
virtual void GetAudioInputDeviceNames(media::AudioDeviceNames* device_names);
- virtual AudioOutputStream* MakeAudioOutputStream(AudioParameters params);
- virtual AudioInputStream* MakeAudioInputStream(AudioParameters params);
+ virtual AudioOutputStream* MakeAudioOutputStream(
+ const AudioParameters& params);
+ virtual AudioInputStream* MakeAudioInputStream(
+ const AudioParameters& params);
virtual void MuteAll();
virtual void UnMuteAll();
diff --git a/media/audio/mac/audio_output_mac.cc b/media/audio/mac/audio_output_mac.cc
index a4c1c9e..9adbb51 100644
--- a/media/audio/mac/audio_output_mac.cc
+++ b/media/audio/mac/audio_output_mac.cc
@@ -41,7 +41,7 @@ enum {
#endif
PCMQueueOutAudioOutputStream::PCMQueueOutAudioOutputStream(
- AudioManagerMac* manager, AudioParameters params)
+ AudioManagerMac* manager, const AudioParameters& params)
: audio_queue_(NULL),
source_(NULL),
manager_(manager),
diff --git a/media/audio/mac/audio_output_mac.h b/media/audio/mac/audio_output_mac.h
index 1129667..031dc3f 100644
--- a/media/audio/mac/audio_output_mac.h
+++ b/media/audio/mac/audio_output_mac.h
@@ -22,7 +22,7 @@ class PCMQueueOutAudioOutputStream : public AudioOutputStream {
// The ctor takes all the usual parameters, plus |manager| which is the
// the audio manager who is creating this object.
PCMQueueOutAudioOutputStream(AudioManagerMac* manager,
- AudioParameters params);
+ const AudioParameters& params);
// The dtor is typically called by the AudioManager only and it is usually
// triggered by calling AudioOutputStream::Close().
virtual ~PCMQueueOutAudioOutputStream();
diff --git a/media/audio/openbsd/audio_manager_openbsd.cc b/media/audio/openbsd/audio_manager_openbsd.cc
index c8b0568..c9fc9e8 100644
--- a/media/audio/openbsd/audio_manager_openbsd.cc
+++ b/media/audio/openbsd/audio_manager_openbsd.cc
@@ -20,13 +20,13 @@ bool AudioManagerOpenBSD::HasAudioInputDevices() {
}
AudioOutputStream* AudioManagerOpenBSD::MakeAudioOutputStream(
- AudioParameters params) {
+ const AudioParameters& params) {
NOTIMPLEMENTED();
return NULL;
}
AudioInputStream* AudioManagerOpenBSD::MakeAudioInputStream(
- AudioParameters params) {
+ const AudioParameters& params) {
NOTIMPLEMENTED();
return NULL;
}
diff --git a/media/audio/openbsd/audio_manager_openbsd.h b/media/audio/openbsd/audio_manager_openbsd.h
index 281ac79..455c38e 100644
--- a/media/audio/openbsd/audio_manager_openbsd.h
+++ b/media/audio/openbsd/audio_manager_openbsd.h
@@ -17,8 +17,10 @@ class AudioManagerOpenBSD : public AudioManagerBase {
// Implementation of AudioManager.
virtual bool HasAudioOutputDevices();
virtual bool HasAudioInputDevices();
- virtual AudioOutputStream* MakeAudioOutputStream(AudioParameters params);
- virtual AudioInputStream* MakeAudioInputStream(AudioParameters params);
+ virtual AudioOutputStream* MakeAudioOutputStream(
+ const AudioParameters& params);
+ virtual AudioInputStream* MakeAudioInputStream(
+ const AudioParameters& params);
virtual void MuteAll();
virtual void UnMuteAll();
diff --git a/media/audio/win/audio_manager_win.cc b/media/audio/win/audio_manager_win.cc
index aade91e..6406b21 100644
--- a/media/audio/win/audio_manager_win.cc
+++ b/media/audio/win/audio_manager_win.cc
@@ -115,7 +115,7 @@ bool AudioManagerWin::HasAudioInputDevices() {
// - PCMWaveOutAudioOutputStream: Based on the waveOutWrite API (in progress)
// - PCMDXSoundAudioOutputStream: Based on DirectSound or XAudio (future work).
AudioOutputStream* AudioManagerWin::MakeAudioOutputStream(
- AudioParameters params) {
+ const AudioParameters& params) {
if (!params.IsValid() || (params.channels > kWinMaxChannels))
return NULL;
@@ -139,7 +139,7 @@ AudioOutputStream* AudioManagerWin::MakeAudioOutputStream(
// Factory for the implementations of AudioInputStream.
AudioInputStream* AudioManagerWin::MakeAudioInputStream(
- AudioParameters params) {
+ const AudioParameters& params) {
if (!params.IsValid() || (params.channels > kWinMaxInputChannels))
return NULL;
diff --git a/media/audio/win/audio_manager_win.h b/media/audio/win/audio_manager_win.h
index a6e9874..198e5e9 100644
--- a/media/audio/win/audio_manager_win.h
+++ b/media/audio/win/audio_manager_win.h
@@ -22,8 +22,10 @@ class AudioManagerWin : public AudioManagerBase {
// Implementation of AudioManager.
virtual bool HasAudioOutputDevices();
virtual bool HasAudioInputDevices();
- virtual AudioOutputStream* MakeAudioOutputStream(AudioParameters params);
- virtual AudioInputStream* MakeAudioInputStream(AudioParameters params);
+ virtual AudioOutputStream* MakeAudioOutputStream(
+ const AudioParameters& params);
+ virtual AudioInputStream* MakeAudioInputStream(
+ const AudioParameters& params);
virtual void MuteAll();
virtual void UnMuteAll();
virtual string16 GetAudioInputDeviceModel();
diff --git a/media/audio/win/wavein_input_win.cc b/media/audio/win/wavein_input_win.cc
index fcffe7a..a1f6a83 100644
--- a/media/audio/win/wavein_input_win.cc
+++ b/media/audio/win/wavein_input_win.cc
@@ -24,7 +24,7 @@ static WAVEHDR* GetNextBuffer(WAVEHDR* current) {
}
PCMWaveInAudioInputStream::PCMWaveInAudioInputStream(
- AudioManagerWin* manager, AudioParameters params, int num_buffers,
+ AudioManagerWin* manager, const AudioParameters& params, int num_buffers,
UINT device_id)
: state_(kStateEmpty),
manager_(manager),
diff --git a/media/audio/win/wavein_input_win.h b/media/audio/win/wavein_input_win.h
index 5cc8913..f549f34 100644
--- a/media/audio/win/wavein_input_win.h
+++ b/media/audio/win/wavein_input_win.h
@@ -20,8 +20,10 @@ class PCMWaveInAudioInputStream : public AudioInputStream {
// The ctor takes all the usual parameters, plus |manager| which is the
// the audio manager who is creating this object and |device_id| which
// is provided by the operating system.
- PCMWaveInAudioInputStream(AudioManagerWin* manager, AudioParameters params,
- int num_buffers, UINT device_id);
+ PCMWaveInAudioInputStream(AudioManagerWin* manager,
+ const AudioParameters& params,
+ int num_buffers,
+ UINT device_id);
virtual ~PCMWaveInAudioInputStream();
// Implementation of AudioInputStream.
diff --git a/media/audio/win/waveout_output_win.cc b/media/audio/win/waveout_output_win.cc
index 5a08635..94c1d4d 100644
--- a/media/audio/win/waveout_output_win.cc
+++ b/media/audio/win/waveout_output_win.cc
@@ -75,7 +75,7 @@ static const unsigned int kChannelsToMask[kMaxChannelsToMask + 1] = {
};
PCMWaveOutAudioOutputStream::PCMWaveOutAudioOutputStream(
- AudioManagerWin* manager, AudioParameters params, int num_buffers,
+ AudioManagerWin* manager, const AudioParameters& params, int num_buffers,
UINT device_id)
: state_(PCMA_BRAND_NEW),
manager_(manager),
diff --git a/media/audio/win/waveout_output_win.h b/media/audio/win/waveout_output_win.h
index 74717a0..5b7aef9 100644
--- a/media/audio/win/waveout_output_win.h
+++ b/media/audio/win/waveout_output_win.h
@@ -31,8 +31,10 @@ class PCMWaveOutAudioOutputStream : public AudioOutputStream {
// The ctor takes all the usual parameters, plus |manager| which is the
// the audio manager who is creating this object and |device_id| which
// is provided by the operating system.
- PCMWaveOutAudioOutputStream(AudioManagerWin* manager, AudioParameters params,
- int num_buffers, UINT device_id);
+ PCMWaveOutAudioOutputStream(AudioManagerWin* manager,
+ const AudioParameters& params,
+ int num_buffers,
+ UINT device_id);
virtual ~PCMWaveOutAudioOutputStream();
// Implementation of AudioOutputStream.