Index: Source/modules/mediastream/MediaStream.cpp |
diff --git a/Source/modules/mediastream/MediaStream.cpp b/Source/modules/mediastream/MediaStream.cpp |
index 1d666eaa3a7acf76ea0c1839329adf060ce2b7de..6f697ed51bc841a2f3a0af2063f5d08752c2ba2b 100644 |
--- a/Source/modules/mediastream/MediaStream.cpp |
+++ b/Source/modules/mediastream/MediaStream.cpp |
@@ -30,7 +30,6 @@ |
#include "core/dom/Event.h" |
#include "core/dom/ExceptionCode.h" |
-#include "core/platform/UUID.h" |
#include "core/platform/mediastream/MediaStreamCenter.h" |
#include "core/platform/mediastream/MediaStreamSource.h" |
#include "modules/mediastream/MediaStreamTrackEvent.h" |
@@ -58,7 +57,7 @@ static void processTrack(MediaStreamTrack* track, MediaStreamSourceVector& sourc |
static PassRefPtr<MediaStream> createFromSourceVectors(ScriptExecutionContext* context, const MediaStreamSourceVector& audioSources, const MediaStreamSourceVector& videoSources) |
{ |
- RefPtr<MediaStreamDescriptor> descriptor = MediaStreamDescriptor::create(createCanonicalUUIDString(), audioSources, videoSources); |
+ RefPtr<MediaStreamDescriptor> descriptor = MediaStreamDescriptor::create(audioSources, videoSources); |
MediaStreamCenter::instance().didCreateMediaStream(descriptor.get()); |
return MediaStream::create(context, descriptor.release()); |
@@ -221,6 +220,16 @@ MediaStreamTrack* MediaStream::getTrackById(String id) |
return 0; |
} |
+void MediaStream::stop() |
+{ |
+ if (ended()) |
+ return; |
+ |
+ MediaStreamCenter::instance().didStopLocalMediaStream(descriptor()); |
+ |
+ streamEnded(); |
+} |
+ |
void MediaStream::trackEnded() |
{ |
for (size_t i = 0; i < m_audioTracks.size(); ++i) |