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

Unified Diff: webrtc/api/mediastream.cc

Issue 2514883002: Create //webrtc/api:libjingle_peerconnection_api + refactorings. (Closed)
Patch Set: Rebase Created 3 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
« no previous file with comments | « webrtc/api/mediastream.h ('k') | webrtc/api/mediastream_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/api/mediastream.cc
diff --git a/webrtc/api/mediastream.cc b/webrtc/api/mediastream.cc
deleted file mode 100644
index bef04ae8bdd2bc90d35f1e40a490d128f3ad8714..0000000000000000000000000000000000000000
--- a/webrtc/api/mediastream.cc
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright 2011 The WebRTC project authors. All Rights Reserved.
- *
- * Use of this source code is governed by a BSD-style license
- * that can be found in the LICENSE file in the root of the source
- * tree. An additional intellectual property rights grant can be found
- * in the file PATENTS. All contributing project authors may
- * be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "webrtc/api/mediastream.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
-
-namespace webrtc {
-
-template <class V>
-static typename V::iterator FindTrack(V* vector,
- const std::string& track_id) {
- typename V::iterator it = vector->begin();
- for (; it != vector->end(); ++it) {
- if ((*it)->id() == track_id) {
- break;
- }
- }
- return it;
-};
-
-rtc::scoped_refptr<MediaStream> MediaStream::Create(
- const std::string& label) {
- rtc::RefCountedObject<MediaStream>* stream =
- new rtc::RefCountedObject<MediaStream>(label);
- return stream;
-}
-
-MediaStream::MediaStream(const std::string& label)
- : label_(label) {
-}
-
-bool MediaStream::AddTrack(AudioTrackInterface* track) {
- return AddTrack<AudioTrackVector, AudioTrackInterface>(&audio_tracks_, track);
-}
-
-bool MediaStream::AddTrack(VideoTrackInterface* track) {
- return AddTrack<VideoTrackVector, VideoTrackInterface>(&video_tracks_, track);
-}
-
-bool MediaStream::RemoveTrack(AudioTrackInterface* track) {
- return RemoveTrack<AudioTrackVector>(&audio_tracks_, track);
-}
-
-bool MediaStream::RemoveTrack(VideoTrackInterface* track) {
- return RemoveTrack<VideoTrackVector>(&video_tracks_, track);
-}
-
-rtc::scoped_refptr<AudioTrackInterface>
-MediaStream::FindAudioTrack(const std::string& track_id) {
- AudioTrackVector::iterator it = FindTrack(&audio_tracks_, track_id);
- if (it == audio_tracks_.end())
- return NULL;
- return *it;
-}
-
-rtc::scoped_refptr<VideoTrackInterface>
-MediaStream::FindVideoTrack(const std::string& track_id) {
- VideoTrackVector::iterator it = FindTrack(&video_tracks_, track_id);
- if (it == video_tracks_.end())
- return NULL;
- return *it;
-}
-
-template <typename TrackVector, typename Track>
-bool MediaStream::AddTrack(TrackVector* tracks, Track* track) {
- typename TrackVector::iterator it = FindTrack(tracks, track->id());
- if (it != tracks->end())
- return false;
- tracks->push_back(track);
- FireOnChanged();
- return true;
-}
-
-template <typename TrackVector>
-bool MediaStream::RemoveTrack(TrackVector* tracks,
- MediaStreamTrackInterface* track) {
- RTC_DCHECK(tracks != NULL);
- if (!track)
- return false;
- typename TrackVector::iterator it = FindTrack(tracks, track->id());
- if (it == tracks->end())
- return false;
- tracks->erase(it);
- FireOnChanged();
- return true;
-}
-
-} // namespace webrtc
« no previous file with comments | « webrtc/api/mediastream.h ('k') | webrtc/api/mediastream_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698