OLD | NEW |
---|---|
1 /* | 1 /* |
2 * libjingle | 2 * libjingle |
3 * Copyright 2013 Google Inc. | 3 * Copyright 2015 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, |
11 * this list of conditions and the following disclaimer in the documentation | 11 * this list of conditions and the following disclaimer in the documentation |
12 * and/or other materials provided with the distribution. | 12 * and/or other materials provided with the distribution. |
13 * 3. The name of the author may not be used to endorse or promote products | 13 * 3. The name of the author may not be used to endorse or promote products |
14 * derived from this software without specific prior written permission. | 14 * derived from this software without specific prior written permission. |
15 * | 15 * |
16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED | 16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED |
17 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF | 17 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF |
18 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO | 18 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO |
19 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | 19 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
20 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | 20 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, |
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_AUDIOTRACKRENDERER_H_ | 28 #ifndef TALK_APP_WEBRTC_MEDIACONTROLLER_H_ |
29 #define TALK_APP_WEBRTC_AUDIOTRACKRENDERER_H_ | 29 #define TALK_APP_WEBRTC_MEDIACONTROLLER_H_ |
30 | 30 |
31 #include "talk/media/base/audiorenderer.h" | 31 #include "webrtc/base/criticalsection.h" |
32 #include "webrtc/base/thread.h" | 32 #include "webrtc/base/thread.h" |
33 #include "webrtc/call.h" | |
34 | |
35 namespace cricket { | |
36 class VideoChannel; | |
37 } // namespace cricket | |
33 | 38 |
34 namespace webrtc { | 39 namespace webrtc { |
40 class VoiceEngine; | |
35 | 41 |
36 // Class used for AudioTrack to get the ID of WebRtc voice channel that | 42 // MediaController owns state shared between multiple concurrent media streams. |
pthatcher1
2015/09/04 04:52:31
What does "concurrent" mean?
And what does "medi
the sun
2015/09/04 10:18:47
"media stream" was referring to the actual stream
| |
37 // the AudioTrack is connecting to. | 43 class MediaController : public webrtc::LoadObserver { |
38 // Each AudioTrack owns a AudioTrackRenderer instance. | |
39 // AddChannel() will be called when an AudioTrack is added to a MediaStream. | |
40 // RemoveChannel will be called when the AudioTrack or WebRtc VoE channel is | |
41 // going away. | |
42 // This implementation only supports one channel, and it is only used by | |
43 // Chrome for remote audio tracks." | |
44 class AudioTrackRenderer : public cricket::AudioRenderer { | |
45 public: | 44 public: |
46 AudioTrackRenderer(); | 45 MediaController(rtc::Thread* worker_thread, |
47 ~AudioTrackRenderer(); | 46 webrtc::VoiceEngine* voice_engine); |
47 ~MediaController() override; | |
48 | 48 |
49 // Implements cricket::AudioRenderer. | 49 webrtc::Call* call() { return call_.get(); } |
pthatcher1
2015/09/04 04:52:31
This still needs clear thread safety.
the sun
2015/09/04 10:18:47
Let me first say that thread safety is a very big
pthatcher1
2015/09/04 22:58:32
That's exactly why we're refactoring ChannelManage
| |
50 void AddChannel(int channel_id) override; | 50 void set_video_channel(cricket::VideoChannel* video_channel); |
51 void RemoveChannel(int channel_id) override; | 51 |
52 // Implements webrtc::LoadObserver. | |
53 void OnLoadUpdate(Load load) override; | |
52 | 54 |
53 private: | 55 private: |
54 int channel_id_; | 56 void Construct_w(webrtc::VoiceEngine* voice_engine); |
57 void Destruct_w(); | |
58 | |
59 rtc::Thread* worker_thread_; | |
60 rtc::scoped_ptr<webrtc::Call> call_; | |
61 rtc::CriticalSection critical_section_; | |
62 cricket::VideoChannel* video_channel_ GUARDED_BY(critical_section_); | |
63 | |
64 DISALLOW_IMPLICIT_CONSTRUCTORS(MediaController); | |
55 }; | 65 }; |
56 | |
57 } // namespace webrtc | 66 } // namespace webrtc |
58 | 67 |
59 #endif // TALK_APP_WEBRTC_AUDIOTRACKRENDERER_H_ | 68 #endif // TALK_APP_WEBRTC_MEDIACONTROLLER_H_ |
OLD | NEW |