| Index: talk/app/webrtc/videosource.cc
|
| diff --git a/talk/app/webrtc/videosource.cc b/talk/app/webrtc/videosource.cc
|
| index 8006c583b6f7f00fac9b6b39d18401f33f06ef57..bc1196de0a46f830d0b259801fc2c35fd543a9e3 100644
|
| --- a/talk/app/webrtc/videosource.cc
|
| +++ b/talk/app/webrtc/videosource.cc
|
| @@ -294,34 +294,6 @@ bool ExtractVideoOptions(const MediaConstraintsInterface* all_constraints,
|
| return all_valid;
|
| }
|
|
|
| -class FrameInputWrapper : public cricket::VideoRenderer {
|
| - public:
|
| - explicit FrameInputWrapper(cricket::VideoCapturer* capturer)
|
| - : capturer_(capturer) {
|
| - ASSERT(capturer_ != NULL);
|
| - }
|
| -
|
| - virtual ~FrameInputWrapper() {}
|
| -
|
| - // VideoRenderer implementation.
|
| - bool RenderFrame(const cricket::VideoFrame* frame) override {
|
| - if (!capturer_->IsRunning()) {
|
| - return true;
|
| - }
|
| -
|
| - // This signal will be made on media engine render thread. The clients
|
| - // of this signal should have no assumptions on what thread this signal
|
| - // come from.
|
| - capturer_->SignalVideoFrame(capturer_, frame);
|
| - return true;
|
| - }
|
| -
|
| - private:
|
| - cricket::VideoCapturer* capturer_;
|
| -
|
| - RTC_DISALLOW_COPY_AND_ASSIGN(FrameInputWrapper);
|
| -};
|
| -
|
| } // anonymous namespace
|
|
|
| namespace webrtc {
|
| @@ -418,15 +390,6 @@ void VideoSource::Initialize(
|
| // Initialize hasn't succeeded until a successful state change has occurred.
|
| }
|
|
|
| -cricket::VideoRenderer* VideoSource::FrameInput() {
|
| - // Defer creation of frame_input_ until it's needed, e.g. the local video
|
| - // sources will never need it.
|
| - if (!frame_input_) {
|
| - frame_input_.reset(new FrameInputWrapper(video_capturer_.get()));
|
| - }
|
| - return frame_input_.get();
|
| -}
|
| -
|
| void VideoSource::Stop() {
|
| channel_manager_->StopVideoCapture(video_capturer_.get(), format_);
|
| }
|
|
|