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

Side by Side Diff: webrtc/api/peerconnectioninterface.h

Issue 1968393002: Propogate network-worker thread split to api (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 7 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 * Copyright 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2012 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 #ifndef WEBRTC_API_PEERCONNECTIONINTERFACE_H_ 51 #ifndef WEBRTC_API_PEERCONNECTIONINTERFACE_H_
52 #define WEBRTC_API_PEERCONNECTIONINTERFACE_H_ 52 #define WEBRTC_API_PEERCONNECTIONINTERFACE_H_
53 53
54 #include <memory> 54 #include <memory>
55 #include <string> 55 #include <string>
56 #include <utility> 56 #include <utility>
57 #include <vector> 57 #include <vector>
58 58
59 #include "webrtc/api/datachannelinterface.h" 59 #include "webrtc/api/datachannelinterface.h"
60 #include "webrtc/api/dtlsidentitystore.h" 60 #include "webrtc/api/dtlsidentitystore.h"
61 #include "webrtc/api/dtlsidentitystore.h"
62 #include "webrtc/api/dtmfsenderinterface.h" 61 #include "webrtc/api/dtmfsenderinterface.h"
63 #include "webrtc/api/jsep.h" 62 #include "webrtc/api/jsep.h"
64 #include "webrtc/api/mediastreaminterface.h" 63 #include "webrtc/api/mediastreaminterface.h"
65 #include "webrtc/api/rtpreceiverinterface.h" 64 #include "webrtc/api/rtpreceiverinterface.h"
66 #include "webrtc/api/rtpsenderinterface.h" 65 #include "webrtc/api/rtpsenderinterface.h"
67 #include "webrtc/api/statstypes.h" 66 #include "webrtc/api/statstypes.h"
68 #include "webrtc/api/umametrics.h" 67 #include "webrtc/api/umametrics.h"
68 #include "webrtc/base/deprecation.h"
69 #include "webrtc/base/fileutils.h" 69 #include "webrtc/base/fileutils.h"
70 #include "webrtc/base/network.h" 70 #include "webrtc/base/network.h"
71 #include "webrtc/base/rtccertificate.h" 71 #include "webrtc/base/rtccertificate.h"
72 #include "webrtc/base/socketaddress.h" 72 #include "webrtc/base/socketaddress.h"
73 #include "webrtc/base/sslstreamadapter.h" 73 #include "webrtc/base/sslstreamadapter.h"
74 #include "webrtc/media/base/mediachannel.h" 74 #include "webrtc/media/base/mediachannel.h"
75 #include "webrtc/p2p/base/portallocator.h" 75 #include "webrtc/p2p/base/portallocator.h"
76 76
77 namespace rtc { 77 namespace rtc {
78 class SSLIdentity; 78 class SSLIdentity;
(...skipping 600 matching lines...) Expand 10 before | Expand all | Expand 10 after
679 // As such, if the current thread is not already running an rtc::Thread message 679 // As such, if the current thread is not already running an rtc::Thread message
680 // loop, an application using this method must eventually either call 680 // loop, an application using this method must eventually either call
681 // rtc::Thread::Current()->Run(), or call 681 // rtc::Thread::Current()->Run(), or call
682 // rtc::Thread::Current()->ProcessMessages() within the application's own 682 // rtc::Thread::Current()->ProcessMessages() within the application's own
683 // message loop. 683 // message loop.
684 rtc::scoped_refptr<PeerConnectionFactoryInterface> 684 rtc::scoped_refptr<PeerConnectionFactoryInterface>
685 CreatePeerConnectionFactory(); 685 CreatePeerConnectionFactory();
686 686
687 // Create a new instance of PeerConnectionFactoryInterface. 687 // Create a new instance of PeerConnectionFactoryInterface.
688 // 688 //
689 // |worker_thread| and |signaling_thread| are the only mandatory 689 // |network_thread|, |worker_thread| and |signaling_thread| are
690 // parameters. 690 // the only mandatory parameters.
691 // 691 //
692 // If non-null, ownership of |default_adm|, |encoder_factory| and 692 // If non-null, ownership of |default_adm|, |encoder_factory| and
693 // |decoder_factory| are transferred to the returned factory. 693 // |decoder_factory| are transferred to the returned factory.
694 rtc::scoped_refptr<PeerConnectionFactoryInterface> 694 rtc::scoped_refptr<PeerConnectionFactoryInterface> CreatePeerConnectionFactory(
695 CreatePeerConnectionFactory( 695 rtc::Thread* network_thread,
696 rtc::Thread* worker_thread, 696 rtc::Thread* worker_thread,
697 rtc::Thread* signaling_thread, 697 rtc::Thread* signaling_thread,
698 AudioDeviceModule* default_adm, 698 AudioDeviceModule* default_adm,
699 cricket::WebRtcVideoEncoderFactory* encoder_factory, 699 cricket::WebRtcVideoEncoderFactory* encoder_factory,
700 cricket::WebRtcVideoDecoderFactory* decoder_factory); 700 cricket::WebRtcVideoDecoderFactory* decoder_factory);
701 701
702 // Create a new instance of PeerConnectionFactoryInterface.
703 // Same thread is used as worker and network thread.
704 RTC_DEPRECATED
705 inline rtc::scoped_refptr<PeerConnectionFactoryInterface>
706 CreatePeerConnectionFactory(
707 rtc::Thread* worker_and_network_thread,
708 rtc::Thread* signaling_thread,
709 AudioDeviceModule* default_adm,
710 cricket::WebRtcVideoEncoderFactory* encoder_factory,
711 cricket::WebRtcVideoDecoderFactory* decoder_factory) {
712 return CreatePeerConnectionFactory(
713 worker_and_network_thread, worker_and_network_thread, signaling_thread,
714 default_adm, encoder_factory, decoder_factory);
715 }
716
702 } // namespace webrtc 717 } // namespace webrtc
703 718
704 #endif // WEBRTC_API_PEERCONNECTIONINTERFACE_H_ 719 #endif // WEBRTC_API_PEERCONNECTIONINTERFACE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698