Move getUserMedia finish to "when audio track configured".

content/renderer/media/user_media_client_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/media/user_media_client_impl.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <utility>
 
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/stringprintf.h"
 #include "base/task_runner.h"
 #include "base/task_runner_util.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "content/public/renderer/render_frame.h"
 #include "content/renderer/media/local_media_stream_audio_source.h"
 #include "content/renderer/media/media_stream.h"
+#include "content/renderer/media/media_stream_audio_track.h"
 #include "content/renderer/media/media_stream_constraints_util.h"
 #include "content/renderer/media/media_stream_constraints_util_video_content.h"
 #include "content/renderer/media/media_stream_constraints_util_video_device.h"
 #include "content/renderer/media/media_stream_dispatcher.h"
 #include "content/renderer/media/media_stream_video_capturer_source.h"
 #include "content/renderer/media/media_stream_video_track.h"
 #include "content/renderer/media/peer_connection_tracker.h"
 #include "content/renderer/media/webrtc/processed_local_audio_source.h"
 #include "content/renderer/media/webrtc_logging.h"
 #include "content/renderer/media/webrtc_uma_histograms.h"
 #include "content/renderer/render_thread_impl.h"
+#include "media/base/bind_to_current_loop.h"
 #include "media/capture/video_capture_types.h"
 #include "third_party/WebKit/public/platform/WebMediaConstraints.h"
 #include "third_party/WebKit/public/platform/WebMediaDeviceInfo.h"
 #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/web/WebDocument.h"
 #include "third_party/WebKit/public/web/WebLocalFrame.h"
 #include "third_party/WebKit/public/web/WebUserGestureIndicator.h"
 
 namespace content {
@@ skipping 660 matching lines @@
   for (auto it = pending_local_sources_.begin();
        it != pending_local_sources_.end(); ++it) {
     MediaStreamSource* const source_extra_data =
         static_cast<MediaStreamSource*>((*it).getExtraData());
     if (source_extra_data != source)
       continue;
     if (result == MEDIA_DEVICE_OK)
       local_sources_.push_back((*it));
     pending_local_sources_.erase(it);
 
-    NotifyCurrentRequestInfoOfAudioSourceStarted(source, result, result_name);
+    // The task of notifying the current request is moved.
+    // NotifyCurrentRequestInfoOfAudioSourceStarted(source, result,

[Guido Urdaneta, 2017/04/06 13:18:57]

Use a more descriptive comment. Something like:

// Do not notify the current request about audio started until ...

[hta - Chromium, 2017/04/06 13:57:51]

My bad. Deleting the commented-out code instead.

+    // result_name);
     return;
   }
   NOTREACHED();
 }
 
 void UserMediaClientImpl::NotifyCurrentRequestInfoOfAudioSourceStarted(
     MediaStreamSource* source,
     MediaStreamRequestResult result,
     const blink::WebString& result_name) {
   // The only request possibly being processed is |current_request_info_|.
@@ skipping 560 matching lines @@
     const blink::WebMediaStreamTrack& track,
     bool is_pending) {
   DCHECK(track.source().getType() == blink::WebMediaStreamSource::TypeAudio);
   MediaStreamAudioSource* native_source =
       MediaStreamAudioSource::From(track.source());
   // Add the source as pending since OnTrackStarted will expect it to be there.
   sources_waiting_for_callback_.push_back(native_source);
 
   sources_.push_back(track.source());
   bool connected = native_source->ConnectToTrack(track);
-  if (!is_pending) {
-    OnTrackStarted(
-        native_source,
-        connected ? MEDIA_DEVICE_OK : MEDIA_DEVICE_TRACK_START_FAILURE, "");
+  if (!is_pending && !connected) {

[Guido Urdaneta, 2017/04/06 13:18:57]

Should this be ||?
What happens if it is pending but ConnectToTrack failed?

[hta - Chromium, 2017/04/06 13:57:51]

the previous code was

if !pending & connected: call with MEDIA_DEVICE_OK
if !pending & !connected: call with MEDIA_DEVICE_TRACK_START_FAILURE
if pending: do nothing

the new code is

if pending & connected: set up callback that eventually does MEDIA_DEVICE_OK
if !pending & !connected: call with MEDIA_DEVICE_TRACK_FAILURE
if !pending: do nothing

This can be made more readable.

+    OnTrackStarted(native_source, MEDIA_DEVICE_TRACK_START_FAILURE, "");
+  } else {
+    MediaStreamAudioTrack::From(track)->SetFormatConfiguredCallback(
+        media::BindToCurrentLoop(base::Bind(
+            &UserMediaClientImpl::UserMediaRequestInfo::OnTrackStarted,
+            AsWeakPtr(), native_source, content::MEDIA_DEVICE_OK,
+            blink::WebString())));
   }
 }
 
 blink::WebMediaStreamTrack
 UserMediaClientImpl::UserMediaRequestInfo::CreateAndStartVideoTrack(
     const blink::WebMediaStreamSource& source,
     const blink::WebMediaConstraints& constraints) {
   DCHECK(source.getType() == blink::WebMediaStreamSource::TypeVideo);
   MediaStreamVideoSource* native_source =
       MediaStreamVideoSource::GetVideoSource(source);
@@ skipping 47 matching lines @@
 }
 
 void UserMediaClientImpl::UserMediaRequestInfo::OnAudioSourceStarted(
     MediaStreamSource* source,
     MediaStreamRequestResult result,
     const blink::WebString& result_name) {
   // Check if we're waiting to be notified of this source.  If not, then we'll
   // ignore the notification.
   auto found = std::find(sources_waiting_for_callback_.begin(),
                          sources_waiting_for_callback_.end(), source);
-  if (found != sources_waiting_for_callback_.end())
+  // If the start failed, inform the request here.

[Guido Urdaneta, 2017/04/06 13:18:57]

Extend the comment with "Otherwise, wait for ... to notify the request".
As is it now, it looks like the notification is ignored if the start is
successful.

+  if (found != sources_waiting_for_callback_.end() &&
+      result != content::MEDIA_DEVICE_OK)
     OnTrackStarted(source, result, result_name);
 }
 
 }  // namespace content