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

Unified Diff: talk/app/webrtc/mediastreamobserver.cc

Issue 1610243002: Move talk/app/webrtc to webrtc/api (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Removed processing of api.gyp for Chromium builds Created 4 years, 10 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 | « talk/app/webrtc/mediastreamobserver.h ('k') | talk/app/webrtc/mediastreamprovider.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: talk/app/webrtc/mediastreamobserver.cc
diff --git a/talk/app/webrtc/mediastreamobserver.cc b/talk/app/webrtc/mediastreamobserver.cc
deleted file mode 100644
index 2650b9a6f79e3825bc1c7f68b341d346d0f9f416..0000000000000000000000000000000000000000
--- a/talk/app/webrtc/mediastreamobserver.cc
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * libjingle
- * Copyright 2015 Google Inc.
- *
- * 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 documentation
- * and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
- * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "talk/app/webrtc/mediastreamobserver.h"
-
-#include <algorithm>
-
-namespace webrtc {
-
-MediaStreamObserver::MediaStreamObserver(MediaStreamInterface* stream)
- : stream_(stream),
- cached_audio_tracks_(stream->GetAudioTracks()),
- cached_video_tracks_(stream->GetVideoTracks()) {
- stream_->RegisterObserver(this);
-}
-
-MediaStreamObserver::~MediaStreamObserver() {
- stream_->UnregisterObserver(this);
-}
-
-void MediaStreamObserver::OnChanged() {
- AudioTrackVector new_audio_tracks = stream_->GetAudioTracks();
- VideoTrackVector new_video_tracks = stream_->GetVideoTracks();
-
- // Find removed audio tracks.
- for (const auto& cached_track : cached_audio_tracks_) {
- auto it = std::find_if(
- new_audio_tracks.begin(), new_audio_tracks.end(),
- [cached_track](const AudioTrackVector::value_type& new_track) {
- return new_track->id().compare(cached_track->id()) == 0;
- });
- if (it == new_audio_tracks.end()) {
- SignalAudioTrackRemoved(cached_track.get(), stream_);
- }
- }
-
- // Find added audio tracks.
- for (const auto& new_track : new_audio_tracks) {
- auto it = std::find_if(
- cached_audio_tracks_.begin(), cached_audio_tracks_.end(),
- [new_track](const AudioTrackVector::value_type& cached_track) {
- return new_track->id().compare(cached_track->id()) == 0;
- });
- if (it == cached_audio_tracks_.end()) {
- SignalAudioTrackAdded(new_track.get(), stream_);
- }
- }
-
- // Find removed video tracks.
- for (const auto& cached_track : cached_video_tracks_) {
- auto it = std::find_if(
- new_video_tracks.begin(), new_video_tracks.end(),
- [cached_track](const VideoTrackVector::value_type& new_track) {
- return new_track->id().compare(cached_track->id()) == 0;
- });
- if (it == new_video_tracks.end()) {
- SignalVideoTrackRemoved(cached_track.get(), stream_);
- }
- }
-
- // Find added video tracks.
- for (const auto& new_track : new_video_tracks) {
- auto it = std::find_if(
- cached_video_tracks_.begin(), cached_video_tracks_.end(),
- [new_track](const VideoTrackVector::value_type& cached_track) {
- return new_track->id().compare(cached_track->id()) == 0;
- });
- if (it == cached_video_tracks_.end()) {
- SignalVideoTrackAdded(new_track.get(), stream_);
- }
- }
-
- cached_audio_tracks_ = new_audio_tracks;
- cached_video_tracks_ = new_video_tracks;
-}
-
-} // namespace webrtc
« no previous file with comments | « talk/app/webrtc/mediastreamobserver.h ('k') | talk/app/webrtc/mediastreamprovider.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698