fixup! tizen audio capturer for browser

enable tizen system audio capturer to support getDisplayMedia
|DISPLAY_AUDIO_CAPTURE| case

Change-Id: I81a5fceeeb1e9672b58013a12c3e51d78adf40cf
Signed-off-by: hongyanting <yanting.hong@samsung.com>

diff --git a/third_party/blink/renderer/modules/mediastream/user_media_processor.cc b/third_party/blink/renderer/modules/mediastream/user_media_processor.cc
index b2ab02bb5121fa0e5b373843d50f9f284257efb8..4f8e6d38be3c095155e94cf424d7f78b9d69b662 100644 (file)
--- a/third_party/blink/renderer/modules/mediastream/user_media_processor.cc
+++ b/third_party/blink/renderer/modules/mediastream/user_media_processor.cc
@@ -625,6 +625,11 @@ void UserMediaProcessor::SetupAudioInput() {
           : request->AudioMediaStreamType();
 
   if (audio_controls.stream_type == MediaStreamType::DISPLAY_AUDIO_CAPTURE) {
+#if BUILDFLAG(IS_TIZEN_TV)
+    // Trigger audio input device enumeration, as system audio on Tizen is
+    // captured by forwarding device.
+    GetMediaDevicesDispatcher()->GetAudioInputCapabilities(base::DoNothing());
+#endif
     SelectAudioSettings(request, {blink::AudioDeviceCaptureCapability()});
     return;
   }

diff --git a/tizen_src/chromium_impl/media/audio/tizen/capi_usb_audio_input_stream.cc b/tizen_src/chromium_impl/media/audio/tizen/capi_usb_audio_input_stream.cc
index 77836a9c318dec95e75c7b9614f4c13188d7c13c..1d3f23154e68bc7a051eafc7b45d9958c6ad5def 100644 (file)
--- a/tizen_src/chromium_impl/media/audio/tizen/capi_usb_audio_input_stream.cc
+++ b/tizen_src/chromium_impl/media/audio/tizen/capi_usb_audio_input_stream.cc
@@ -106,8 +106,7 @@ bool CapiUsbAudioInputStream::OpenMic() {
     return false;
   }
 
-  if (device_type != SOUND_DEVICE_BUILTIN_MIC &&
-      device_type != SOUND_DEVICE_FORWARDING) {
+  if (device_type != SOUND_DEVICE_BUILTIN_MIC) {
     ret = sound_manager_add_device_for_stream_routing(stream_info_,
                                                       sound_device_);
     if (ret != SOUND_MANAGER_ERROR_NONE) {