Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2486)

Unified Diff: Source/modules/webaudio/MediaStreamAudioDestinationNode.cpp

Issue 16753003: Revert "Remove MediaStreamDescriptor and call/use WebMediaStream directly" (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/modules/mediastream/UserMediaRequest.cpp ('k') | public/platform/WebMediaStream.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/modules/webaudio/MediaStreamAudioDestinationNode.cpp
diff --git a/Source/modules/webaudio/MediaStreamAudioDestinationNode.cpp b/Source/modules/webaudio/MediaStreamAudioDestinationNode.cpp
index fc7cfc934c6e85f7f91b260495e7e7984054cd95..f8f07cf6c05be9541ba6099be3ba909d4f5d2a76 100644
--- a/Source/modules/webaudio/MediaStreamAudioDestinationNode.cpp
+++ b/Source/modules/webaudio/MediaStreamAudioDestinationNode.cpp
@@ -34,9 +34,6 @@
#include "modules/mediastream/MediaStream.h"
#include "modules/webaudio/AudioContext.h"
#include "modules/webaudio/AudioNodeInput.h"
-#include "public/platform/WebMediaStream.h"
-#include "public/platform/WebMediaStreamSource.h"
-#include "public/platform/WebMediaStreamTrack.h"
#include "wtf/Locker.h"
namespace WebCore {
@@ -57,9 +54,8 @@ MediaStreamAudioDestinationNode::MediaStreamAudioDestinationNode(AudioContext* c
MediaStreamSourceVector audioSources;
audioSources.append(m_source);
MediaStreamSourceVector videoSources;
- WebKit::WebMediaStream webStream = WebKit::WebMediaStream(createCanonicalUUIDString(), audioSources, videoSources);
- m_stream = MediaStream::create(context->scriptExecutionContext(), webStream);
- MediaStreamCenter::instance().didCreateMediaStream(m_stream->webStream());
+ m_stream = MediaStream::create(context->scriptExecutionContext(), MediaStreamDescriptor::create(audioSources, videoSources));
+ MediaStreamCenter::instance().didCreateMediaStream(m_stream->descriptor());
m_source->setAudioFormat(numberOfChannels, context->sampleRate());
« no previous file with comments | « Source/modules/mediastream/UserMediaRequest.cpp ('k') | public/platform/WebMediaStream.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698