content/renderer/media/mock_media_stream_dispatcher.h - Issue 312773002: Support for audio output devices for getMediaDevices.

Unified Diff: content/renderer/media/mock_media_stream_dispatcher.h

Issue 312773002: Support for audio output devices for getMediaDevices. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Added test case for group ID in unit test. Created 6 years, 7 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 | « content/renderer/media/media_stream_impl_unittest.cc ('k') | content/renderer/media/mock_media_stream_dispatcher.cc » ('j') | content/renderer/media/mock_media_stream_dispatcher.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/media/mock_media_stream_dispatcher.h

diff --git a/content/renderer/media/mock_media_stream_dispatcher.h b/content/renderer/media/mock_media_stream_dispatcher.h

index c6242636ac481850d4e08b4059b6f64d6ec89492..db8791309640dbaa20b954faba54d733e96a96d6 100644

--- a/content/renderer/media/mock_media_stream_dispatcher.h

+++ b/content/renderer/media/mock_media_stream_dispatcher.h

@@ -37,7 +37,8 @@ class MockMediaStreamDispatcher : public MediaStreamDispatcher {

virtual int video_session_id(const std::string& label, int index) OVERRIDE;

virtual int audio_session_id(const std::string& label, int index) OVERRIDE;

- int audio_request_id() const { return audio_request_id_; }

+ int audio_input_request_id() const { return audio_input_request_id_; }

+ int audio_output_request_id() const { return audio_output_request_id_; }

int video_request_id() const { return video_request_id_; }

int request_stream_counter() const { return request_stream_counter_; }

void IncrementSessionId() { ++session_id_; }

@@ -46,14 +47,19 @@ class MockMediaStreamDispatcher : public MediaStreamDispatcher {

int stop_video_device_counter() const { return stop_video_device_counter_; }

const std::string& stream_label() const { return stream_label_;}

- StreamDeviceInfoArray audio_array() const { return audio_array_; }

+ StreamDeviceInfoArray audio_input_array() const { return audio_input_array_; }

tommi (sloooow) - chröme 2014/06/03 16:42:42 return by const&? (is it necessary to create a cop

tommi (sloooow) - chröme 2014/06/03 16:42:42 return by const&?

Henrik Grunell 2014/06/03 16:58:10 No, not necessary. Changed for all three functions

Henrik Grunell 2014/06/03 16:58:10 Done.

+ StreamDeviceInfoArray audio_output_array() const {

+ return audio_output_array_;

+ }

StreamDeviceInfoArray video_array() const { return video_array_; }

private:

- void AddAudioDeviceToArray();

+ void AddAudioInputDeviceToArray(bool matched_output);

+ void AddAudioOutputDeviceToArray();

void AddVideoDeviceToArray();

- int audio_request_id_;

+ int audio_input_request_id_;

+ int audio_output_request_id_; // Only used for EnumerateDevices.

int video_request_id_; // Only used for EnumerateDevices.

base::WeakPtr<MediaStreamDispatcherEventHandler> event_handler_;

int request_stream_counter_;

@@ -62,7 +68,8 @@ class MockMediaStreamDispatcher : public MediaStreamDispatcher {

std::string stream_label_;

int session_id_;

- StreamDeviceInfoArray audio_array_;

+ StreamDeviceInfoArray audio_input_array_;

+ StreamDeviceInfoArray audio_output_array_;

StreamDeviceInfoArray video_array_;

DISALLOW_COPY_AND_ASSIGN(MockMediaStreamDispatcher);