diff options
| author | mflodman@webrtc.org <mflodman@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-06-07 13:57:57 +0000 |
|---|---|---|
| committer | mflodman@webrtc.org <mflodman@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-06-07 13:57:57 +0000 |
| commit | a18c6e5b2811221b60e3d7e72516aa20927e13dd (patch) | |
| tree | 639e3bdf5bed78dfdad76644259cd3126bcc739a /video_engine/vie_codec_impl.cc | |
| parent | 029c3f46731cd3a4746043833e912447ababf1a7 (diff) | |
| download | webrtc-a18c6e5b2811221b60e3d7e72516aa20927e13dd.tar.gz | |
Removing functionality for inserting pre-encoded frames instead of raw
video frames. The functionality hasn't been used for a long time and
should be done properly if used in the future.
This is a pre-step for implementing CPU overload control.
R=pbos@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/1630004
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@4194 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'video_engine/vie_codec_impl.cc')
| -rw-r--r-- | video_engine/vie_codec_impl.cc | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/video_engine/vie_codec_impl.cc b/video_engine/vie_codec_impl.cc index e2f405da..cd8babaf 100644 --- a/video_engine/vie_codec_impl.cc +++ b/video_engine/vie_codec_impl.cc @@ -193,28 +193,7 @@ int ViECodecImpl::SetSendCodec(const int video_channel, // Stop the media flow while reconfiguring. vie_encoder->Pause(); - // Check if we have a frame provider that is a camera and can provide this - // codec for us. - bool use_capture_device_as_encoder = false; - frame_provider = is.FrameProvider(vie_encoder); - if (frame_provider) { - if (frame_provider->Id() >= kViECaptureIdBase && - frame_provider->Id() <= kViECaptureIdMax) { - ViECapturer* vie_capture = static_cast<ViECapturer*>(frame_provider); - // Try to get preencoded. Nothing to do if it is not supported. - if (vie_capture && vie_capture->PreEncodeToViEEncoder( - video_codec_internal, - *vie_encoder, - video_channel) == 0) { - use_capture_device_as_encoder = true; - } - } - } - - // Update the encoder settings if we are not using a capture device capable - // of this codec. - if (!use_capture_device_as_encoder && - vie_encoder->SetEncoder(video_codec_internal) != 0) { + if (vie_encoder->SetEncoder(video_codec_internal) != 0) { WEBRTC_TRACE(kTraceError, kTraceVideo, ViEId(shared_data_->instance_id(), video_channel), "%s: Could not change encoder for channel %d", __FUNCTION__, |