| Index: webrtc/api/videosource.h
|
| diff --git a/webrtc/api/videosource.h b/webrtc/api/videosource.h
|
| index eb4646336db4c8fa94e8cb2a9e3c0c2f0398d196..08e5422aae7bf4d67f7f8e83d280eb141f74342b 100644
|
| --- a/webrtc/api/videosource.h
|
| +++ b/webrtc/api/videosource.h
|
| @@ -8,93 +8,4 @@
|
| * be found in the AUTHORS file in the root of the source tree.
|
| */
|
|
|
| -#ifndef WEBRTC_API_VIDEOSOURCE_H_
|
| -#define WEBRTC_API_VIDEOSOURCE_H_
|
| -
|
| -#include <list>
|
| -
|
| -#include "webrtc/api/mediastreaminterface.h"
|
| -#include "webrtc/api/notifier.h"
|
| -#include "webrtc/api/videosourceinterface.h"
|
| -#include "webrtc/api/videotrackrenderers.h"
|
| -#include "webrtc/base/asyncinvoker.h"
|
| -#include "webrtc/base/scoped_ptr.h"
|
| -#include "webrtc/base/sigslot.h"
|
| -#include "webrtc/media/base/videosinkinterface.h"
|
| -#include "webrtc/media/base/videocapturer.h"
|
| -#include "webrtc/media/base/videocommon.h"
|
| -
|
| -// VideoSource implements VideoSourceInterface. It owns a
|
| -// cricket::VideoCapturer and make sure the camera is started at a resolution
|
| -// that honors the constraints.
|
| -// The state is set depending on the result of starting the capturer.
|
| -// If the constraint can't be met or the capturer fails to start, the state
|
| -// transition to kEnded, otherwise it transitions to kLive.
|
| -namespace webrtc {
|
| -
|
| -class MediaConstraintsInterface;
|
| -
|
| -class VideoSource : public Notifier<VideoSourceInterface>,
|
| - public sigslot::has_slots<> {
|
| - public:
|
| - // Creates an instance of VideoSource.
|
| - // VideoSource take ownership of |capturer|.
|
| - // |constraints| can be NULL and in that case the camera is opened using a
|
| - // default resolution.
|
| - static rtc::scoped_refptr<VideoSource> Create(
|
| - rtc::Thread* worker_thread,
|
| - cricket::VideoCapturer* capturer,
|
| - const webrtc::MediaConstraintsInterface* constraints,
|
| - bool remote);
|
| -
|
| - // Note that the non-constraints version does not have the ability to
|
| - // select configuration based on width, height, aspect ratio or frame rate.
|
| - static rtc::scoped_refptr<VideoSource> Create(
|
| - rtc::Thread* worker_thread,
|
| - cricket::VideoCapturer* capturer,
|
| - bool remote);
|
| -
|
| - SourceState state() const override { return state_; }
|
| - bool remote() const override { return remote_; }
|
| -
|
| - virtual const cricket::VideoOptions* options() const { return &options_; }
|
| -
|
| - virtual cricket::VideoCapturer* GetVideoCapturer() {
|
| - return video_capturer_.get();
|
| - }
|
| -
|
| - void Stop() override;
|
| - void Restart() override;
|
| -
|
| - void AddOrUpdateSink(rtc::VideoSinkInterface<cricket::VideoFrame>* sink,
|
| - const rtc::VideoSinkWants& wants) override;
|
| - void RemoveSink(rtc::VideoSinkInterface<cricket::VideoFrame>* sink) override;
|
| -
|
| - protected:
|
| - VideoSource(rtc::Thread* worker_thread,
|
| - cricket::VideoCapturer* capturer,
|
| - bool remote);
|
| - virtual ~VideoSource();
|
| - void Initialize(const webrtc::MediaConstraintsInterface* constraints);
|
| -
|
| - private:
|
| - void OnStateChange(cricket::VideoCapturer* capturer,
|
| - cricket::CaptureState capture_state);
|
| - void SetState(SourceState new_state);
|
| -
|
| - rtc::Thread* signaling_thread_;
|
| - rtc::Thread* worker_thread_;
|
| - rtc::AsyncInvoker invoker_;
|
| - rtc::scoped_ptr<cricket::VideoCapturer> video_capturer_;
|
| - bool started_;
|
| - rtc::scoped_ptr<cricket::VideoRenderer> frame_input_;
|
| -
|
| - cricket::VideoFormat format_;
|
| - cricket::VideoOptions options_;
|
| - SourceState state_;
|
| - const bool remote_;
|
| -};
|
| -
|
| -} // namespace webrtc
|
| -
|
| -#endif // WEBRTC_API_VIDEOSOURCE_H_
|
| +// TODO(perkj): Remove this file once Chrome build files doesn't depend on it.
|
|
|