MediaStream API: Remove LocalMediaStream

Source/modules/webaudio/AudioContext.cpp

 /*
  * Copyright (C) 2010, Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1.  Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 380 matching lines @@
         ec = INVALID_STATE_ERR;
         return 0;
     }
 
     ASSERT(isMainThread());
     lazyInitialize();
 
     AudioSourceProvider* provider = 0;
 
     MediaStreamTrackVector audioTracks = mediaStream->getAudioTracks();
-    if (mediaStream->isLocal() && audioTracks.size()) {
-        // Enable input for the specific local audio device specified in the MediaStreamSource.
-        RefPtr<MediaStreamTrack> localAudio = audioTracks[0];
+
+    // FIXME: get a provider for non-local MediaStreams (like from a remote peer).

[Chris Rogers, 2013/04/19 18:20:28]

We can't just stop checking for isLocal() since we need to distinguish the case
between a locally derived stream (from getUserMedia()) versus a MediaStream from
a remote peer or a MediaStream that has just been created which is non-related
to getUserMedia().

We're gaining access to the hardware here, so need to be careful it's a
"getUserMedia()" approved stream.

[Tommy Widenflycht, 2013/04/22 07:45:23]

The MediaStream is loosing in importance for every release of the spec and can
now be considered to be just a container; especially after the introduction of a
copy constructor. For example one can clone a LocalMediaStream so that it has
the same local tracks but fails the old test. MediaStreamTracks are the new
hotness.

Only local tracks are assigned a deviceId and as long as that is true my new
version of this function actually is more accurate by iterating over all the
tracks and using the first local one. Adding the isLocal() to a MST might be
better though.

On 2013/04/19 18:20:28, Chris Rogers wrote:

+    for (size_t i = 0; i < audioTracks.size(); ++i) {
+        RefPtr<MediaStreamTrack> localAudio = audioTracks[i];
         MediaStreamSource* source = localAudio->component()->source();
-        destination()->enableInput(source->deviceId());
-        provider = destination()->localAudioInputProvider();
-    } else {
-        // FIXME: get a provider for non-local MediaStreams (like from a remote peer).
-        provider = 0;
+        if (!source->deviceId().isEmpty()) {
+            destination()->enableInput(source->deviceId());
+            provider = destination()->localAudioInputProvider();

[Chris Rogers, 2013/04/22 17:38:24]

Tommi, thanks for clarifying - seems fine then except I think we should "break"
here after finding the 1st one

[Tommy Widenflycht, 2013/04/23 11:38:53]

Doh, thanks. break added.
On 2013/04/22 17:38:24, Chris Rogers wrote:

+        }
     }
 
     RefPtr<MediaStreamAudioSourceNode> node = MediaStreamAudioSourceNode::create(this, mediaStream, provider);
 
     // FIXME: Only stereo streams are supported right now. We should be able to accept multi-channel streams.
     node->setFormat(2, sampleRate());
 
     refNode(node.get()); // context keeps reference until node is disconnected
     return node;
 }
@@ skipping 578 matching lines @@
     info.addMember(m_deferredFinishDerefList, "deferredFinishDerefList");
     info.addMember(m_hrtfDatabaseLoader, "hrtfDatabaseLoader");
     info.addMember(m_eventTargetData, "eventTargetData");
     info.addMember(m_renderTarget, "renderTarget");
     info.addMember(m_audioDecoder, "audioDecoder");
 }
 
 } // namespace WebCore
 
 #endif // ENABLE(WEB_AUDIO)