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

Unified Diff: content/renderer/media/media_stream_source_observer.cc

Issue 131763002: Adds MediaStreamSource, MediaStreamAudioSource and MediaStreamVideoCaptureDeviceSource (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 6 years, 11 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_observer.cc
diff --git a/content/renderer/media/media_stream_source_observer.cc b/content/renderer/media/media_stream_source_observer.cc
deleted file mode 100644
index 319327fa72d865575c1087e19d0a3ca5d0faabc1..0000000000000000000000000000000000000000
--- a/content/renderer/media/media_stream_source_observer.cc
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright (c) 2013 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/media_stream_source_observer.h"
-
-#include "base/logging.h"
-#include "content/renderer/media/media_stream_source_extra_data.h"
-
-namespace content {
-
-MediaStreamSourceObserver::MediaStreamSourceObserver(
- webrtc::MediaSourceInterface* webrtc_source,
- MediaStreamSourceExtraData* extra_data)
- : state_(webrtc_source->state()),
- webrtc_source_(webrtc_source),
- extra_data_(extra_data) {
- webrtc_source_->RegisterObserver(this);
-}
-
-MediaStreamSourceObserver::~MediaStreamSourceObserver() {
- DCHECK(CalledOnValidThread());
- if (webrtc_source_.get())
- webrtc_source_->UnregisterObserver(this);
-}
-
-void MediaStreamSourceObserver::OnChanged() {
- DCHECK(CalledOnValidThread());
- // There should be no more notification after kEnded.
- DCHECK(webrtc_source_.get() != NULL);
-
- webrtc::MediaSourceInterface::SourceState state = webrtc_source_->state();
- if (state == state_)
- return;
- state_ = state;
- blink::WebMediaStreamSource webkit_source(extra_data_->owner());
-
- switch (state) {
- case webrtc::MediaSourceInterface::kInitializing:
- // Ignore the kInitializing state since there is no match in
- // WebMediaStreamSource::ReadyState.
- break;
- case webrtc::MediaSourceInterface::kLive:
- webkit_source.setReadyState(
- blink::WebMediaStreamSource::ReadyStateLive);
- break;
- case webrtc::MediaSourceInterface::kMuted:
- webkit_source.setReadyState(
- blink::WebMediaStreamSource::ReadyStateMuted);
- break;
- case webrtc::MediaSourceInterface::kEnded:
- webkit_source.setReadyState(
- blink::WebMediaStreamSource::ReadyStateEnded);
- webrtc_source_->UnregisterObserver(this);
- webrtc_source_ = NULL;
- break;
- default:
- NOTREACHED();
- break;
- }
-}
-
-} // namespace content
« no previous file with comments | « content/renderer/media/media_stream_source_observer.h ('k') | content/renderer/media/media_stream_video_capturer_source.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698