| OLD | NEW |
| 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 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 80 class Thread; | 80 class Thread; |
| 81 } | 81 } |
| 82 | 82 |
| 83 namespace cricket { | 83 namespace cricket { |
| 84 class WebRtcVideoDecoderFactory; | 84 class WebRtcVideoDecoderFactory; |
| 85 class WebRtcVideoEncoderFactory; | 85 class WebRtcVideoEncoderFactory; |
| 86 } | 86 } |
| 87 | 87 |
| 88 namespace webrtc { | 88 namespace webrtc { |
| 89 class AudioDeviceModule; | 89 class AudioDeviceModule; |
| 90 class AudioMixer; |
| 90 class MediaConstraintsInterface; | 91 class MediaConstraintsInterface; |
| 91 | 92 |
| 92 // MediaStream container interface. | 93 // MediaStream container interface. |
| 93 class StreamCollectionInterface : public rtc::RefCountInterface { | 94 class StreamCollectionInterface : public rtc::RefCountInterface { |
| 94 public: | 95 public: |
| 95 // TODO(ronghuawu): Update the function names to c++ style, e.g. find -> Find. | 96 // TODO(ronghuawu): Update the function names to c++ style, e.g. find -> Find. |
| 96 virtual size_t count() = 0; | 97 virtual size_t count() = 0; |
| 97 virtual MediaStreamInterface* at(size_t index) = 0; | 98 virtual MediaStreamInterface* at(size_t index) = 0; |
| 98 virtual MediaStreamInterface* find(const std::string& label) = 0; | 99 virtual MediaStreamInterface* find(const std::string& label) = 0; |
| 99 virtual MediaStreamTrackInterface* FindAudioTrack( | 100 virtual MediaStreamTrackInterface* FindAudioTrack( |
| (...skipping 696 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 796 // If non-null, ownership of |default_adm|, |encoder_factory| and | 797 // If non-null, ownership of |default_adm|, |encoder_factory| and |
| 797 // |decoder_factory| are transferred to the returned factory. | 798 // |decoder_factory| are transferred to the returned factory. |
| 798 rtc::scoped_refptr<PeerConnectionFactoryInterface> CreatePeerConnectionFactory( | 799 rtc::scoped_refptr<PeerConnectionFactoryInterface> CreatePeerConnectionFactory( |
| 799 rtc::Thread* network_thread, | 800 rtc::Thread* network_thread, |
| 800 rtc::Thread* worker_thread, | 801 rtc::Thread* worker_thread, |
| 801 rtc::Thread* signaling_thread, | 802 rtc::Thread* signaling_thread, |
| 802 AudioDeviceModule* default_adm, | 803 AudioDeviceModule* default_adm, |
| 803 cricket::WebRtcVideoEncoderFactory* encoder_factory, | 804 cricket::WebRtcVideoEncoderFactory* encoder_factory, |
| 804 cricket::WebRtcVideoDecoderFactory* decoder_factory); | 805 cricket::WebRtcVideoDecoderFactory* decoder_factory); |
| 805 | 806 |
| 807 // Create a new instance of PeerConnectionFactoryInterface with external audio |
| 808 // mixer. |
| 809 // |
| 810 // If |audio_mixer| is null, an internal audio mixer will be created and used. |
| 811 rtc::scoped_refptr<PeerConnectionFactoryInterface> |
| 812 CreatePeerConnectionFactoryWithAudioMixer( |
| 813 rtc::Thread* network_thread, |
| 814 rtc::Thread* worker_thread, |
| 815 rtc::Thread* signaling_thread, |
| 816 AudioDeviceModule* default_adm, |
| 817 cricket::WebRtcVideoEncoderFactory* encoder_factory, |
| 818 cricket::WebRtcVideoDecoderFactory* decoder_factory, |
| 819 rtc::scoped_refptr<AudioMixer> audio_mixer); |
| 820 |
| 806 // Create a new instance of PeerConnectionFactoryInterface. | 821 // Create a new instance of PeerConnectionFactoryInterface. |
| 807 // Same thread is used as worker and network thread. | 822 // Same thread is used as worker and network thread. |
| 808 inline rtc::scoped_refptr<PeerConnectionFactoryInterface> | 823 inline rtc::scoped_refptr<PeerConnectionFactoryInterface> |
| 809 CreatePeerConnectionFactory( | 824 CreatePeerConnectionFactory( |
| 810 rtc::Thread* worker_and_network_thread, | 825 rtc::Thread* worker_and_network_thread, |
| 811 rtc::Thread* signaling_thread, | 826 rtc::Thread* signaling_thread, |
| 812 AudioDeviceModule* default_adm, | 827 AudioDeviceModule* default_adm, |
| 813 cricket::WebRtcVideoEncoderFactory* encoder_factory, | 828 cricket::WebRtcVideoEncoderFactory* encoder_factory, |
| 814 cricket::WebRtcVideoDecoderFactory* decoder_factory) { | 829 cricket::WebRtcVideoDecoderFactory* decoder_factory) { |
| 815 return CreatePeerConnectionFactory( | 830 return CreatePeerConnectionFactory( |
| 816 worker_and_network_thread, worker_and_network_thread, signaling_thread, | 831 worker_and_network_thread, worker_and_network_thread, signaling_thread, |
| 817 default_adm, encoder_factory, decoder_factory); | 832 default_adm, encoder_factory, decoder_factory); |
| 818 } | 833 } |
| 819 | 834 |
| 820 } // namespace webrtc | 835 } // namespace webrtc |
| 821 | 836 |
| 822 #endif // WEBRTC_API_PEERCONNECTIONINTERFACE_H_ | 837 #endif // WEBRTC_API_PEERCONNECTIONINTERFACE_H_ |
| OLD | NEW |