ede5da4960
Bulk of the changes were produced using
git grep -l ' ASSERT(' | grep -v test | grep -v 'common\.h' |\
xargs -n1 sed -i 's/ ASSERT(/ RTC_DCHECK(/'
followed by additional includes of base/checks.h in affected files,
and git cl format.
Also had to do some tweaks to #if !defined(NDEBUG) logic in the
taskrunner code (webrtc/base/task.cc, webrtc/base/taskparent.cc,
webrtc/base/taskparent.h, webrtc/base/taskrunner.cc), replaced to
consistently use RTC_DCHECK_IS_ON, and some of the checks needed
additional #if protection.
Test code was excluded, because it should probably use RTC_CHECK
rather than RTC_DCHECK.
BUG=webrtc:6424
Review-Url: https://codereview.webrtc.org/2620303003
Cr-Commit-Position: refs/heads/master@{#16030}
97 lines
2.7 KiB
C++
97 lines
2.7 KiB
C++
/*
|
|
* 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
|