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

Replace VideoDecoder with VideoDecoderFactory in VideoReceiveStream config.

Browse Source 
Preparation for deleting EnableFrameRecordning, and also a step
towards landing of the new VideoStreamDecoder.

Bug: webrtc:9106
Change-Id: I50964ee458b08a702ec69b82a62e4995c57cee82
Reviewed-on: https://webrtc-review.googlesource.com/97660
Commit-Queue: Niels Moller <nisse@webrtc.org>
Reviewed-by: Rasmus Brandt <brandtr@webrtc.org>
Reviewed-by: Anders Carlsson <andersc@webrtc.org>
Reviewed-by: Sebastian Jansson <srte@webrtc.org>
Reviewed-by: Erik Språng <sprang@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#24861}
This commit is contained in:
Niels Möller
2018-09-27 12:43:52 +02:00
committed by Commit Bot
parent 6fbeeeb872
commit 529d0d9795
27 changed files with 327 additions and 234 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/call_test.cc
View File

@ -52,6 +52,7 @@ CallTest::CallTest()
fake_encoder->SetMaxBitrate(fake_encoder_max_bitrate_);
return fake_encoder;
}),
fake_decoder_factory_([]() { return absl::make_unique<FakeDecoder>(); }),
num_video_streams_(1),
num_audio_streams_(0),
num_flexfec_streams_(0),
@ -366,11 +367,10 @@ void CallTest::AddMatchingVideoReceiveConfigs(
if (!decode_sub_stream || i == *decode_sub_stream) {
decoder = test::CreateMatchingDecoder(video_send_config);
} else {
decoder.decoder = new test::FakeDecoder();
decoder.payload_type = video_send_config.rtp.payload_type;
decoder.video_format = SdpVideoFormat(video_send_config.rtp.payload_name);
}
allocated_decoders_.emplace_back(decoder.decoder);
decoder.decoder_factory = &fake_decoder_factory_;
video_recv_config.decoders.push_back(decoder);
receive_configs->emplace_back(std::move(video_recv_config));
}
@ -433,7 +433,6 @@ void CallTest::CreateMatchingFecConfig(
void CallTest::CreateMatchingReceiveConfigs(Transport* rtcp_send_transport) {
video_receive_configs_.clear();
allocated_decoders_.clear();
for (VideoSendStream::Config& video_send_config : video_send_configs_) {
CreateMatchingVideoReceiveConfigs(video_send_config, rtcp_send_transport);
}
@ -635,7 +634,6 @@ void CallTest::DestroyStreams() {
receiver_call_->DestroyFlexfecReceiveStream(flexfec_recv_stream);
video_receive_streams_.clear();
allocated_decoders_.clear();
}
void CallTest::DestroyVideoSendStreams() {