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

Destroy encoders that fail to InitEncode.

Browse Source 
SimulcastEncoderAdapter calls Release() on a failed sub-encoder init,
but Release only knows how to clean up encoders that have registered
stream info. Since failed ones don't register, they aren't currently
cleaned up.

BUG=None

Review-Url: https://codereview.webrtc.org/2544003005
Cr-Commit-Position: refs/heads/master@{#15553}
This commit is contained in:
noahric
2016-12-12 13:08:27 -08:00
committed by Commit bot
parent cb44343006
commit e5ba75a658
2 changed files with 27 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter.cc
View File

@ -218,6 +218,9 @@ int SimulcastEncoderAdapter::InitEncode(const VideoCodec* inst,
VideoEncoder* encoder = factory_->Create(); VideoEncoder* encoder = factory_->Create();
ret = encoder->InitEncode(&stream_codec, number_of_cores, max_payload_size); ret = encoder->InitEncode(&stream_codec, number_of_cores, max_payload_size);
if (ret < 0) { if (ret < 0) {
// Explicitly destroy the current encoder; because we haven't registered a
// StreamInfo for it yet, Release won't do anything about it.
factory_->Destroy(encoder);
Release(); Release();
return ret; return ret;
} }

25
webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter_unittest.cc
View File

@ -109,7 +109,7 @@ class MockVideoEncoder : public VideoEncoder {
int32_t numberOfCores, int32_t numberOfCores,
size_t maxPayloadSize) /* override */ { size_t maxPayloadSize) /* override */ {
codec_ = *codecSettings; codec_ = *codecSettings;
return 0; return init_encode_return_value_;
} }
MOCK_METHOD3( MOCK_METHOD3(
@ -155,12 +155,18 @@ class MockVideoEncoder : public VideoEncoder {
void set_supports_native_handle(bool enabled) { void set_supports_native_handle(bool enabled) {
supports_native_handle_ = enabled; supports_native_handle_ = enabled;
} }
void set_init_encode_return_value(int32_t value) {
init_encode_return_value_ = value;
}
BitrateAllocation last_set_bitrate() const { return last_set_bitrate_; } BitrateAllocation last_set_bitrate() const { return last_set_bitrate_; }
MOCK_CONST_METHOD0(ImplementationName, const char*()); MOCK_CONST_METHOD0(ImplementationName, const char*());
private: private:
bool supports_native_handle_ = false; bool supports_native_handle_ = false;
int32_t init_encode_return_value_ = 0;
BitrateAllocation last_set_bitrate_; BitrateAllocation last_set_bitrate_;
VideoCodec codec_; VideoCodec codec_;
@ -172,6 +178,7 @@ class MockVideoEncoderFactory : public VideoEncoderFactory {
VideoEncoder* Create() override { VideoEncoder* Create() override {
MockVideoEncoder* encoder = new MockVideoEncoder* encoder = new
::testing::NiceMock<MockVideoEncoder>(); ::testing::NiceMock<MockVideoEncoder>();
encoder->set_init_encode_return_value(init_encode_return_value_);
const char* encoder_name = encoder_names_.empty() const char* encoder_name = encoder_names_.empty()
? "codec_implementation_name" ? "codec_implementation_name"
: encoder_names_[encoders_.size()]; : encoder_names_[encoders_.size()];
@ -196,8 +203,12 @@ class MockVideoEncoderFactory : public VideoEncoderFactory {
void SetEncoderNames(const std::vector<const char*>& encoder_names) { void SetEncoderNames(const std::vector<const char*>& encoder_names) {
encoder_names_ = encoder_names; encoder_names_ = encoder_names;
} }
void set_init_encode_return_value(int32_t value) {
init_encode_return_value_ = value;
}
private: private:
int32_t init_encode_return_value_ = 0;
std::vector<MockVideoEncoder*> encoders_; std::vector<MockVideoEncoder*> encoders_;
std::vector<const char*> encoder_names_; std::vector<const char*> encoder_names_;
}; };
@ -550,5 +561,17 @@ TEST_F(TestSimulcastEncoderAdapterFake, TestFailureReturnCodesFromEncodeCalls) {
adapter_->Encode(input_frame, nullptr, &frame_types)); adapter_->Encode(input_frame, nullptr, &frame_types));
} }
TEST_F(TestSimulcastEncoderAdapterFake, TestInitFailureCleansUpEncoders) {
TestVp8Simulcast::DefaultSettings(
&codec_, static_cast<const int*>(kTestTemporalLayerProfile));
codec_.VP8()->tl_factory = &tl_factory_;
codec_.numberOfSimulcastStreams = 3;
helper_->factory()->set_init_encode_return_value(
WEBRTC_VIDEO_CODEC_FALLBACK_SOFTWARE);
EXPECT_EQ(WEBRTC_VIDEO_CODEC_FALLBACK_SOFTWARE,
adapter_->InitEncode(&codec_, 1, 1200));
EXPECT_TRUE(helper_->factory()->encoders().empty());
}
} // namespace testing } // namespace testing
} // namespace webrtc } // namespace webrtc