14665ff7d4
Clang version changed 223108:230914
Details: e144d30..6fdb142/tools/clang/scripts/update.sh
Removes the OVERRIDE macro defined in:
* webrtc/base/common.h
* webrtc/typedefs.h
The majority of the source changes were done by running this in src/:
perl -0pi -e "s/virtual\s([^({;]*(\([^({;]*\)[^({;]*))(OVERRIDE|override)/\1override/sg" `find {talk,webrtc} -name "*.h" -o -name "*.cc*" -o -name "*.mm*"`
which converted all:
virtual Foo() OVERRIDE
functions to:
Foo() override
Then I manually edited:
* talk/media/webrtc/fakewebrtccommon.h
* webrtc/test/fake_common.h
Remaining uses of OVERRIDE was fixed by search+replace.
Manual edits were done to fix virtual destructors that were
overriding inherited ones.
Finally a build error related to the pure virtual definitions of
Read, Write and Rewind in common_types.h required a bit of
refactoring in:
* webrtc/common_types.cc
* webrtc/common_types.h
* webrtc/system_wrappers/interface/file_wrapper.h
* webrtc/system_wrappers/source/file_impl.cc
This roll should make it possible for us to finally re-enable deadlock
detection for TSan on the buildbots.
BUG=4106
R=pbos@webrtc.org, tommi@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/41069004
Cr-Commit-Position: refs/heads/master@{#8596}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8596 4adac7df-926f-26a2-2b94-8c16560cd09d
76 lines
2.9 KiB
C++
76 lines
2.9 KiB
C++
/*
|
|
* libjingle
|
|
* Copyright 2011 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.
|
|
*/
|
|
|
|
// This file contains the implementation of MediaStreamInterface interface.
|
|
|
|
#ifndef TALK_APP_WEBRTC_MEDIASTREAM_H_
|
|
#define TALK_APP_WEBRTC_MEDIASTREAM_H_
|
|
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
#include "talk/app/webrtc/mediastreaminterface.h"
|
|
#include "talk/app/webrtc/notifier.h"
|
|
|
|
namespace webrtc {
|
|
|
|
class MediaStream : public Notifier<MediaStreamInterface> {
|
|
public:
|
|
static rtc::scoped_refptr<MediaStream> Create(const std::string& label);
|
|
|
|
std::string label() const override { return label_; }
|
|
|
|
bool AddTrack(AudioTrackInterface* track) override;
|
|
bool AddTrack(VideoTrackInterface* track) override;
|
|
bool RemoveTrack(AudioTrackInterface* track) override;
|
|
bool RemoveTrack(VideoTrackInterface* track) override;
|
|
virtual rtc::scoped_refptr<AudioTrackInterface>
|
|
FindAudioTrack(const std::string& track_id);
|
|
virtual rtc::scoped_refptr<VideoTrackInterface>
|
|
FindVideoTrack(const std::string& track_id);
|
|
|
|
AudioTrackVector GetAudioTracks() override { return audio_tracks_; }
|
|
VideoTrackVector GetVideoTracks() override { return video_tracks_; }
|
|
|
|
protected:
|
|
explicit MediaStream(const std::string& label);
|
|
|
|
private:
|
|
template <typename TrackVector, typename Track>
|
|
bool AddTrack(TrackVector* Tracks, Track* track);
|
|
template <typename TrackVector>
|
|
bool RemoveTrack(TrackVector* Tracks, MediaStreamTrackInterface* track);
|
|
|
|
std::string label_;
|
|
AudioTrackVector audio_tracks_;
|
|
VideoTrackVector video_tracks_;
|
|
};
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // TALK_APP_WEBRTC_MEDIASTREAM_H_
|