zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removing functionality for inserting pre-encoded frames instead of raw

Browse Source 
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@4194 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
mflodman@webrtc.org
2013-06-07 13:57:57 +00:00
parent b69cc15467
commit 3ba883f0fc
9 changed files with 12 additions and 434 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
webrtc/video_engine/vie_codec_impl.cc
View File

@ -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__,