From 4070b1db5355913bb15e379ac4864c1dec3f4fb1 Mon Sep 17 00:00:00 2001 From: "stefan@webrtc.org" Date: Wed, 16 Jul 2014 11:20:40 +0000 Subject: [PATCH] Print an info log instead of return an error if an external encoder is de-registered, but no corresponding internal encoder can be registered automatically. This is not an error case if for instance an external h.264 encoder is registered, but no internal implementation exists. R=pbos@webrtc.org Review URL: https://webrtc-codereview.appspot.com/13009004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@6704 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/video_engine/vie_encoder.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/webrtc/video_engine/vie_encoder.cc b/webrtc/video_engine/vie_encoder.cc index a628188a13..ba7862a81d 100644 --- a/webrtc/video_engine/vie_encoder.cc +++ b/webrtc/video_engine/vie_encoder.cc @@ -322,7 +322,10 @@ int32_t ViEEncoder::DeRegisterExternalEncoder(uint8_t pl_type) { current_send_codec.extra_options = NULL; if (vcm_.RegisterSendCodec(¤t_send_codec, number_of_cores_, max_data_payload_length) != VCM_OK) { - return -1; + LOG(LS_INFO) << "De-registered the currently used external encoder (" + << static_cast(pl_type) << ") and therefore tried to " + << "register the corresponding internal encoder, but none " + << "was supported."; } } return 0;