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

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

Issue 1363573002: Wire up transport sequence number / send time callbacks to webrtc via libjingle. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Add missing updated_options Created 5 years, 2 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * libjingle 2 * libjingle
3 * Copyright 2015 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,
(...skipping 12 matching lines...) Expand all
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_MEDIACONTROLLER_H_ 28 #ifndef TALK_APP_WEBRTC_MEDIACONTROLLER_H_
29 #define TALK_APP_WEBRTC_MEDIACONTROLLER_H_ 29 #define TALK_APP_WEBRTC_MEDIACONTROLLER_H_
30 30
31 #include "webrtc/base/thread.h" 31 #include "webrtc/base/thread.h"
32 32
33 namespace cricket {
34 class ChannelManager;
35 } // namespace cricket
36
33 namespace webrtc { 37 namespace webrtc {
34 class Call; 38 class Call;
35 class VoiceEngine; 39 class VoiceEngine;
36 40
37 // The MediaController currently owns shared state between media channels, but 41 // The MediaController currently owns shared state between media channels, but
38 // in the future will create and own RtpSenders and RtpReceivers. 42 // in the future will create and own RtpSenders and RtpReceivers.
39 class MediaControllerInterface { 43 class MediaControllerInterface {
40 public: 44 public:
41 static MediaControllerInterface* Create(rtc::Thread* worker_thread, 45 static MediaControllerInterface* Create(
42 webrtc::VoiceEngine* voice_engine); 46 rtc::Thread* worker_thread,
47 cricket::ChannelManager* channel_manager);
43 48
44 virtual ~MediaControllerInterface() {} 49 virtual ~MediaControllerInterface() {}
45 virtual webrtc::Call* call_w() = 0; 50 virtual webrtc::Call* call_w() = 0;
51 virtual cricket::ChannelManager* channel_manager() const = 0;
46 }; 52 };
47 } // namespace webrtc 53 } // namespace webrtc
48 54
49 #endif // TALK_APP_WEBRTC_MEDIACONTROLLER_H_ 55 #endif // TALK_APP_WEBRTC_MEDIACONTROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698