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

Unified Diff: content/renderer/media/media_stream_source_extra_data.h

Issue 14346002: Connect webrtc MediaSourceInterface ready states with webkit WebMediaStreamSource (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 7 years, 8 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
Index: content/renderer/media/media_stream_source_extra_data.h
diff --git a/content/renderer/media/media_stream_source_extra_data.h b/content/renderer/media/media_stream_source_extra_data.h
index a5fb9ad2d53e6a72ad697e0820faf97e1eaa1b44..b854e4edcb07bb288751b0dc6b67496b2121a389 100644
--- a/content/renderer/media/media_stream_source_extra_data.h
+++ b/content/renderer/media/media_stream_source_extra_data.h
@@ -8,6 +8,7 @@
#include "base/compiler_specific.h"
#include "content/common/content_export.h"
#include "content/common/media/media_stream_options.h"
+#include "content/renderer/media/media_stream_source_observer.h"
#include "media/base/audio_capturer_source.h"
#include "third_party/libjingle/source/talk/app/webrtc/videosourceinterface.h"
#include "third_party/WebKit/Source/Platform/chromium/public/WebMediaStreamSource.h"
@@ -37,6 +38,10 @@ class CONTENT_EXPORT MediaStreamSourceExtraData
local_audio_source_ = source;
}
+ void SetSourceObserver(MediaStreamSourceObserver* observer) {
+ source_observer_.reset(observer);
tommi (sloooow) - chröme 2013/04/23 09:50:55 If the observer interface is implemented by an own
+ }
+
webrtc::VideoSourceInterface* video_source() { return video_source_; }
media::AudioCapturerSource* audio_source() { return audio_source_; }
webrtc::AudioSourceInterface* local_audio_source() {
@@ -53,6 +58,7 @@ class CONTENT_EXPORT MediaStreamSourceExtraData
// TODO(hclam): This should be merged with |audio_source_| such that it
// carries audio options.
scoped_refptr<webrtc::AudioSourceInterface> local_audio_source_;
+ scoped_ptr<MediaStreamSourceObserver> source_observer_;
DISALLOW_COPY_AND_ASSIGN(MediaStreamSourceExtraData);
};

Powered by Google App Engine
This is Rietveld 408576698