| Index: webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter.cc
|
| diff --git a/webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter.cc b/webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter.cc
|
| index d4f4b80a10c6d0d5bc576b9d0c6c0131f20b5ccc..55a4402cbe4e0d7b1f4cee5b12b1bfbdfeaf4654 100644
|
| --- a/webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter.cc
|
| +++ b/webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter.cc
|
| @@ -182,7 +182,7 @@ int SimulcastEncoderAdapter::InitEncode(const VideoCodec* inst,
|
| }
|
|
|
| int number_of_streams = NumberOfStreams(*inst);
|
| - bool doing_simulcast = (number_of_streams > 1);
|
| + const bool doing_simulcast = (number_of_streams > 1);
|
|
|
| if (doing_simulcast && !ValidSimulcastResolutions(*inst, number_of_streams)) {
|
| return WEBRTC_VIDEO_CODEC_ERR_PARAMETER;
|
| @@ -230,8 +230,12 @@ int SimulcastEncoderAdapter::InitEncode(const VideoCodec* inst,
|
| implementation_name += ", ";
|
| implementation_name += streaminfos_[i].encoder->ImplementationName();
|
| }
|
| - implementation_name_ =
|
| - "SimulcastEncoderAdapter (" + implementation_name + ")";
|
| + if (doing_simulcast) {
|
| + implementation_name_ =
|
| + "SimulcastEncoderAdapter (" + implementation_name + ")";
|
| + } else {
|
| + implementation_name_ = implementation_name;
|
| + }
|
| return WEBRTC_VIDEO_CODEC_OK;
|
| }
|
|
|
|
|