| Index: media/audio/win/audio_low_latency_input_win.h
|
| diff --git a/media/audio/win/audio_low_latency_input_win.h b/media/audio/win/audio_low_latency_input_win.h
|
| index 955b42859d09b2bc9de945e4157e03d640b2d412..e933a4471303817b75ae38127cf7dd7db51eab39 100644
|
| --- a/media/audio/win/audio_low_latency_input_win.h
|
| +++ b/media/audio/win/audio_low_latency_input_win.h
|
| @@ -131,13 +131,6 @@
|
| WAVEFORMATEX** device_format,
|
| int* effects);
|
|
|
| - // Handles sharing of COM pointers between the audio and capture threads. The
|
| - // marshal method must be called on the audio manager thread, while unmarshal
|
| - // must be called on |capture_thread_|.
|
| - bool MarshalComPointers();
|
| - void UnmarshalComPointers(
|
| - base::win::ScopedComPtr<IAudioCaptureClient>* audio_capture_client);
|
| -
|
| // Our creator, the audio manager needs to be notified when we close.
|
| AudioManagerWin* manager_;
|
|
|
| @@ -186,17 +179,8 @@
|
| // Pointer to the object that will receive the recorded audio samples.
|
| AudioInputCallback* sink_;
|
|
|
| - // ------------------------------------------------------
|
| - // Warning: COM pointers must be marshaled from the audio thread to be used
|
| - // on any other thread. Do not use any of these interfaces on a thread other
|
| - // than the audio thread. See MarshalComPointers() and UnmarshalComPointers()
|
| - // for marshaling pointers to the capture thread.
|
| -
|
| - // Stream into which the COM pointers below are marshaled so that they can
|
| - // be used on another thread.
|
| - base::win::ScopedComPtr<IStream> com_stream_;
|
| -
|
| // Windows Multimedia Device (MMDevice) API interfaces.
|
| +
|
| // An IMMDevice interface which represents an audio endpoint device.
|
| base::win::ScopedComPtr<IMMDevice> endpoint_device_;
|
|
|
| @@ -214,17 +198,16 @@
|
| // details.
|
| base::win::ScopedComPtr<IAudioClient> audio_render_client_for_loopback_;
|
|
|
| + // The IAudioCaptureClient interface enables a client to read input data
|
| + // from a capture endpoint buffer.
|
| + base::win::ScopedComPtr<IAudioCaptureClient> audio_capture_client_;
|
| +
|
| // The ISimpleAudioVolume interface enables a client to control the
|
| // master volume level of an audio session.
|
| // The volume-level is a value in the range 0.0 to 1.0.
|
| // This interface does only work with shared-mode streams.
|
| base::win::ScopedComPtr<ISimpleAudioVolume> simple_audio_volume_;
|
|
|
| - // The IAudioCaptureClient interface enables a client to read input data
|
| - // from a capture endpoint buffer.
|
| - base::win::ScopedComPtr<IAudioCaptureClient> audio_capture_client_;
|
| - // ------------------------------------------------------
|
| -
|
| // The audio engine will signal this event each time a buffer has been
|
| // recorded.
|
| base::win::ScopedHandle audio_samples_ready_event_;
|
|
|