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_capture_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_capture_impl.cc')
| -rw-r--r-- | video_engine/vie_capture_impl.cc | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/video_engine/vie_capture_impl.cc b/video_engine/vie_capture_impl.cc index d6ee0157..28b4d19e 100644 --- a/video_engine/vie_capture_impl.cc +++ b/video_engine/vie_capture_impl.cc @@ -197,19 +197,7 @@ int ViECaptureImpl::ConnectCaptureDevice(const int capture_id, shared_data_->SetLastError(kViECaptureDeviceAlreadyConnected); return -1; } - VideoCodec codec; - bool use_hardware_encoder = false; - if (vie_encoder->GetEncoder(&codec) == 0) { - // Try to provide the encoder with pre-encoded frames if possible. - if (vie_capture->PreEncodeToViEEncoder(codec, *vie_encoder, - video_channel) == 0) { - use_hardware_encoder = true; - } - } - // If we don't use the camera as hardware encoder, we register the vie_encoder - // for callbacks. - if (!use_hardware_encoder && - vie_capture->RegisterFrameCallback(video_channel, vie_encoder) != 0) { + if (vie_capture->RegisterFrameCallback(video_channel, vie_encoder) != 0) { shared_data_->SetLastError(kViECaptureDeviceUnknownError); return -1; } |