Properly set loopback device ID for system audio capture.

Make sure the MediaStreamDevice has the correct loopback device ID for system
audio capture in MediaCaptureDevicesDispatcher::ProcessScreenCaptureAccessRequest.
Remove the hack in audio_input_renderer_host to override the loopback device ID.

BUG=269626
TBR=dalecurtis@chromium.org, xians@chromium.org
TEST=passes trybots, local testing on Chrome OS confirms device ID is passed to WebRtcLocalAudioTrack ctor.

Review URL: https://codereview.chromium.org/22408006

git-svn-id: http://src.chromium.org/svn/trunk/src/build@216271 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
This commit is contained in:
hshi@chromium.org 2013-08-07 21:02:31 +00:00
Родитель 266cfb727a
Коммит fd1839197c
1 изменённых файлов: 10 добавлений и 0 удалений

Просмотреть файл

@ -27,6 +27,9 @@
# Whether or not we are building the Ash shell.
'use_ash%': 0,
# Whether or not we are using CRAS, the ChromeOS Audio Server.
'use_cras%': 0,
# Use a raw surface abstraction.
'use_ozone%': 0,
},
@ -34,6 +37,7 @@
'chromeos%': '<(chromeos)',
'use_aura%': '<(use_aura)',
'use_ash%': '<(use_ash)',
'use_cras%': '<(use_cras)',
'use_ozone%': '<(use_ozone)',
# Whether we are using Views Toolkit
@ -98,6 +102,7 @@
'chromeos%': '<(chromeos)',
'use_aura%': '<(use_aura)',
'use_ash%': '<(use_ash)',
'use_cras%': '<(use_cras)',
'use_ozone%': '<(use_ozone)',
'use_openssl%': '<(use_openssl)',
'enable_viewport%': '<(enable_viewport)',
@ -179,6 +184,7 @@
'toolkit_uses_gtk%': '<(toolkit_uses_gtk)',
'use_aura%': '<(use_aura)',
'use_ash%': '<(use_ash)',
'use_cras%': '<(use_cras)',
'use_ozone%': '<(use_ozone)',
'use_openssl%': '<(use_openssl)',
'enable_viewport%': '<(enable_viewport)',
@ -755,6 +761,7 @@
'ui_compositor_image_transport%': '<(ui_compositor_image_transport)',
'use_aura%': '<(use_aura)',
'use_ash%': '<(use_ash)',
'use_cras%': '<(use_cras)',
'use_openssl%': '<(use_openssl)',
'use_nss%': '<(use_nss)',
'os_bsd%': '<(os_bsd)',
@ -1928,6 +1935,9 @@
['use_ash==1', {
'defines': ['USE_ASH=1'],
}],
['use_cras==1', {
'defines': ['USE_CRAS=1'],
}],
['use_ozone==1', {
'defines': ['USE_OZONE=1'],
}],