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

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

Issue 1770003002: Renamed VideoSourceInterface to VideoTrackSourceInterface. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebased Created 4 years, 9 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 545 matching lines...) Expand 10 before | Expand all | Expand 10 after
556 CreateLocalMediaStream(const std::string& label) = 0; 556 CreateLocalMediaStream(const std::string& label) = 0;
557 557
558 // Creates a AudioSourceInterface. 558 // Creates a AudioSourceInterface.
559 // |constraints| decides audio processing settings but can be NULL. 559 // |constraints| decides audio processing settings but can be NULL.
560 virtual rtc::scoped_refptr<AudioSourceInterface> CreateAudioSource( 560 virtual rtc::scoped_refptr<AudioSourceInterface> CreateAudioSource(
561 const cricket::AudioOptions& options) = 0; 561 const cricket::AudioOptions& options) = 0;
562 // Deprecated - use version above. 562 // Deprecated - use version above.
563 virtual rtc::scoped_refptr<AudioSourceInterface> CreateAudioSource( 563 virtual rtc::scoped_refptr<AudioSourceInterface> CreateAudioSource(
564 const MediaConstraintsInterface* constraints) = 0; 564 const MediaConstraintsInterface* constraints) = 0;
565 565
566 // Creates a VideoSourceInterface. The new source take ownership of 566 // Creates a VideoTrackSourceInterface. The new source take ownership of
567 // |capturer|. 567 // |capturer|.
568 virtual rtc::scoped_refptr<VideoSourceInterface> CreateVideoSource( 568 virtual rtc::scoped_refptr<VideoTrackSourceInterface> CreateVideoSource(
569 cricket::VideoCapturer* capturer) = 0; 569 cricket::VideoCapturer* capturer) = 0;
570 // A video source creator that allows selection of resolution and frame rate. 570 // A video source creator that allows selection of resolution and frame rate.
571 // |constraints| decides video resolution and frame rate but can 571 // |constraints| decides video resolution and frame rate but can
572 // be NULL. 572 // be NULL.
573 // In the NULL case, use the version above. 573 // In the NULL case, use the version above.
574 virtual rtc::scoped_refptr<VideoSourceInterface> CreateVideoSource( 574 virtual rtc::scoped_refptr<VideoTrackSourceInterface> CreateVideoSource(
575 cricket::VideoCapturer* capturer, 575 cricket::VideoCapturer* capturer,
576 const MediaConstraintsInterface* constraints) = 0; 576 const MediaConstraintsInterface* constraints) = 0;
577 577
578 // Creates a new local VideoTrack. The same |source| can be used in several 578 // Creates a new local VideoTrack. The same |source| can be used in several
579 // tracks. 579 // tracks.
580 virtual rtc::scoped_refptr<VideoTrackInterface> 580 virtual rtc::scoped_refptr<VideoTrackInterface> CreateVideoTrack(
581 CreateVideoTrack(const std::string& label, 581 const std::string& label,
582 VideoSourceInterface* source) = 0; 582 VideoTrackSourceInterface* source) = 0;
583 583
584 // Creates an new AudioTrack. At the moment |source| can be NULL. 584 // Creates an new AudioTrack. At the moment |source| can be NULL.
585 virtual rtc::scoped_refptr<AudioTrackInterface> 585 virtual rtc::scoped_refptr<AudioTrackInterface>
586 CreateAudioTrack(const std::string& label, 586 CreateAudioTrack(const std::string& label,
587 AudioSourceInterface* source) = 0; 587 AudioSourceInterface* source) = 0;
588 588
589 // Starts AEC dump using existing file. Takes ownership of |file| and passes 589 // Starts AEC dump using existing file. Takes ownership of |file| and passes
590 // it on to VoiceEngine (via other objects) immediately, which will take 590 // it on to VoiceEngine (via other objects) immediately, which will take
591 // the ownerhip. If the operation fails, the file will be closed. 591 // the ownerhip. If the operation fails, the file will be closed.
592 // A maximum file size in bytes can be specified. When the file size limit is 592 // A maximum file size in bytes can be specified. When the file size limit is
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
632 CreatePeerConnectionFactory( 632 CreatePeerConnectionFactory(
633 rtc::Thread* worker_thread, 633 rtc::Thread* worker_thread,
634 rtc::Thread* signaling_thread, 634 rtc::Thread* signaling_thread,
635 AudioDeviceModule* default_adm, 635 AudioDeviceModule* default_adm,
636 cricket::WebRtcVideoEncoderFactory* encoder_factory, 636 cricket::WebRtcVideoEncoderFactory* encoder_factory,
637 cricket::WebRtcVideoDecoderFactory* decoder_factory); 637 cricket::WebRtcVideoDecoderFactory* decoder_factory);
638 638
639 } // namespace webrtc 639 } // namespace webrtc
640 640
641 #endif // WEBRTC_API_PEERCONNECTIONINTERFACE_H_ 641 #endif // WEBRTC_API_PEERCONNECTIONINTERFACE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698