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

Side by Side Diff: talk/app/webrtc/audiotrack.h

Issue 1522903002: Add a 'remote' property to MediaSourceInterface. Also adding an implementation to the relevant sour… (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Address comments Created 5 years 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 unified diff | Download patch
« no previous file with comments | « no previous file | talk/app/webrtc/audiotrack.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * libjingle 2 * libjingle
3 * Copyright 2011 Google Inc. 3 * Copyright 2011 Google Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright notice, 8 * 1. Redistributions of source code must retain the above copyright notice,
9 * this list of conditions and the following disclaimer. 9 * this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright notice, 10 * 2. Redistributions in binary form must reproduce the above copyright notice,
(...skipping 10 matching lines...) Expand all
21 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; 21 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
22 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 22 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
23 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR 23 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
24 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF 24 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28 #ifndef TALK_APP_WEBRTC_AUDIOTRACK_H_ 28 #ifndef TALK_APP_WEBRTC_AUDIOTRACK_H_
29 #define TALK_APP_WEBRTC_AUDIOTRACK_H_ 29 #define TALK_APP_WEBRTC_AUDIOTRACK_H_
30 30
31 #include <string>
32
31 #include "talk/app/webrtc/mediastreaminterface.h" 33 #include "talk/app/webrtc/mediastreaminterface.h"
32 #include "talk/app/webrtc/mediastreamtrack.h" 34 #include "talk/app/webrtc/mediastreamtrack.h"
33 #include "talk/app/webrtc/notifier.h" 35 #include "talk/app/webrtc/notifier.h"
34 #include "webrtc/base/scoped_ptr.h" 36 #include "webrtc/base/scoped_ptr.h"
35 #include "webrtc/base/scoped_ref_ptr.h" 37 #include "webrtc/base/scoped_ref_ptr.h"
38 #include "webrtc/base/thread_checker.h"
36 39
37 namespace webrtc { 40 namespace webrtc {
38 41
39 class AudioTrack : public MediaStreamTrack<AudioTrackInterface> { 42 class AudioTrack : public MediaStreamTrack<AudioTrackInterface>,
43 public ObserverInterface {
44 protected:
45 // Protected ctor to force use of factory method.
46 AudioTrack(const std::string& label,
47 const rtc::scoped_refptr<AudioSourceInterface>& source);
48 ~AudioTrack() override;
49
40 public: 50 public:
41 static rtc::scoped_refptr<AudioTrack> Create( 51 static rtc::scoped_refptr<AudioTrack> Create(
42 const std::string& id, AudioSourceInterface* source); 52 const std::string& id,
53 const rtc::scoped_refptr<AudioSourceInterface>& source);
43 54
44 // AudioTrackInterface implementation. 55 private:
45 AudioSourceInterface* GetSource() const override {
46 return audio_source_.get();
47 }
48 // TODO(xians): Implement these methods.
49 void AddSink(AudioTrackSinkInterface* sink) override {}
50 void RemoveSink(AudioTrackSinkInterface* sink) override {}
51 bool GetSignalLevel(int* level) override { return false; }
52 rtc::scoped_refptr<AudioProcessorInterface> GetAudioProcessor() override {
53 return NULL;
54 }
55 cricket::AudioRenderer* GetRenderer() override { return NULL; }
56
57 // MediaStreamTrack implementation. 56 // MediaStreamTrack implementation.
58 std::string kind() const override; 57 std::string kind() const override;
59 58
60 protected: 59 // AudioTrackInterface implementation.
61 AudioTrack(const std::string& label, AudioSourceInterface* audio_source); 60 AudioSourceInterface* GetSource() const override;
61
62 void AddSink(AudioTrackSinkInterface* sink) override;
63 void RemoveSink(AudioTrackSinkInterface* sink) override;
64
65 // ObserverInterface implementation.
66 void OnChanged() override;
62 67
63 private: 68 private:
64 rtc::scoped_refptr<AudioSourceInterface> audio_source_; 69 const rtc::scoped_refptr<AudioSourceInterface> audio_source_;
70 rtc::ThreadChecker thread_checker_;
71 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(AudioTrack);
65 }; 72 };
66 73
67 } // namespace webrtc 74 } // namespace webrtc
68 75
69 #endif // TALK_APP_WEBRTC_AUDIOTRACK_H_ 76 #endif // TALK_APP_WEBRTC_AUDIOTRACK_H_
OLDNEW
« no previous file with comments | « no previous file | talk/app/webrtc/audiotrack.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698