OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. |
3 * | 3 * |
4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
9 */ | 9 */ |
10 | 10 |
(...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
211 stream_codec.VP8()->tl_factory = &tl_factory_adapter; | 211 stream_codec.VP8()->tl_factory = &tl_factory_adapter; |
212 | 212 |
213 // TODO(ronghuawu): Remove once this is handled in VP8EncoderImpl. | 213 // TODO(ronghuawu): Remove once this is handled in VP8EncoderImpl. |
214 if (stream_codec.qpMax < kDefaultMinQp) { | 214 if (stream_codec.qpMax < kDefaultMinQp) { |
215 stream_codec.qpMax = kDefaultMaxQp; | 215 stream_codec.qpMax = kDefaultMaxQp; |
216 } | 216 } |
217 | 217 |
218 VideoEncoder* encoder = factory_->Create(); | 218 VideoEncoder* encoder = factory_->Create(); |
219 ret = encoder->InitEncode(&stream_codec, number_of_cores, max_payload_size); | 219 ret = encoder->InitEncode(&stream_codec, number_of_cores, max_payload_size); |
220 if (ret < 0) { | 220 if (ret < 0) { |
| 221 // Explicitly destroy the current encoder; because we haven't registered a |
| 222 // StreamInfo for it yet, Release won't do anything about it. |
| 223 factory_->Destroy(encoder); |
221 Release(); | 224 Release(); |
222 return ret; | 225 return ret; |
223 } | 226 } |
224 EncodedImageCallback* callback = new AdapterEncodedImageCallback(this, i); | 227 EncodedImageCallback* callback = new AdapterEncodedImageCallback(this, i); |
225 encoder->RegisterEncodeCompleteCallback(callback); | 228 encoder->RegisterEncodeCompleteCallback(callback); |
226 streaminfos_.push_back(StreamInfo(encoder, callback, stream_codec.width, | 229 streaminfos_.push_back(StreamInfo(encoder, callback, stream_codec.width, |
227 stream_codec.height, | 230 stream_codec.height, |
228 start_bitrate_kbps > 0)); | 231 start_bitrate_kbps > 0)); |
229 if (i != 0) | 232 if (i != 0) |
230 implementation_name += ", "; | 233 implementation_name += ", "; |
(...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
467 if (NumberOfStreams(codec_) != 1) | 470 if (NumberOfStreams(codec_) != 1) |
468 return VideoEncoder::ScalingSettings(false); | 471 return VideoEncoder::ScalingSettings(false); |
469 return streaminfos_[0].encoder->GetScalingSettings(); | 472 return streaminfos_[0].encoder->GetScalingSettings(); |
470 } | 473 } |
471 | 474 |
472 const char* SimulcastEncoderAdapter::ImplementationName() const { | 475 const char* SimulcastEncoderAdapter::ImplementationName() const { |
473 return implementation_name_.c_str(); | 476 return implementation_name_.c_str(); |
474 } | 477 } |
475 | 478 |
476 } // namespace webrtc | 479 } // namespace webrtc |
OLD | NEW |