mollyim/webrtc
1
0
Fork 0
mirror of https://github.com/mollyim/webrtc.git synced 2025-05-13 05:40:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add |protected_by_flexfec| flag to VideoReceiveStream::Config.

Browse source 
Use of FlexFEC is known when streams are created in
WebRtcVideoChannel2, so this replaces the code in Call to infer
FlexFEC config of video streams from the configuration of the FlexFEC
stream(s). This also allows us to switch to a more logical creation
order, where media streams are created before the FlexFEC stream.

This is done in preparation for a larger refactoring of the RTP
demuxing done in Call.

BUG=None

Review-Url: https://codereview.webrtc.org/2712683002
Cr-Commit-Position: refs/heads/master@{#17143}
This commit is contained in:
nisse 2017-03-09 06:13:20 -08:00 committed by Commit bot
parent 94f4d9effc
commit c69385de8b
6 changed files with 16 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
webrtc/call/call.cc
View file

@ -682,17 +682,9 @@ webrtc::VideoReceiveStream* Call::CreateVideoReceiveStream(
TRACE_EVENT0("webrtc", "Call::CreateVideoReceiveStream");
RTC_DCHECK(configuration_thread_checker_.CalledOnValidThread());
bool protected_by_flexfec = false;
{
ReadLockScoped read_lock(*receive_crit_);
protected_by_flexfec =
flexfec_receive_ssrcs_media_.find(configuration.rtp.remote_ssrc) !=
flexfec_receive_ssrcs_media_.end();
}
VideoReceiveStream* receive_stream = new VideoReceiveStream(
num_cpu_cores_, protected_by_flexfec,
&packet_router_, std::move(configuration), module_process_thread_.get(),
call_stats_.get(), &remb_);
num_cpu_cores_, &packet_router_, std::move(configuration),
module_process_thread_.get(), call_stats_.get(), &remb_);
const webrtc::VideoReceiveStream::Config& config = receive_stream->config();
ReceiveRtpConfig receive_config(config.rtp.extensions,

12
webrtc/media/engine/webrtcvideoengine2.cc
View file

@ -2310,12 +2310,18 @@ void WebRtcVideoChannel2::WebRtcVideoReceiveStream::RecreateWebRtcStream() {
call_->DestroyFlexfecReceiveStream(flexfec_stream_);
flexfec_stream_ = nullptr;
}
if (flexfec_config_.IsCompleteAndEnabled()) {
const bool use_flexfec = flexfec_config_.IsCompleteAndEnabled();
// TODO(nisse): There are way too many copies here. And why isn't
// the argument to CreateVideoReceiveStream a const ref?
webrtc::VideoReceiveStream::Config config = config_.Copy();
config.rtp.protected_by_flexfec = use_flexfec;
stream_ = call_->CreateVideoReceiveStream(config.Copy());
stream_->Start();
if (use_flexfec) {
flexfec_stream_ = call_->CreateFlexfecReceiveStream(flexfec_config_);
flexfec_stream_->Start();
}
stream_ = call_->CreateVideoReceiveStream(config_.Copy());
stream_->Start();
}
void WebRtcVideoChannel2::WebRtcVideoReceiveStream::ClearDecoders(

6
webrtc/video/video_receive_stream.cc
View file

@ -176,7 +176,6 @@ namespace internal {
VideoReceiveStream::VideoReceiveStream(
int num_cpu_cores,
bool protected_by_flexfec,
PacketRouter* packet_router,
VideoReceiveStream::Config config,
ProcessThread* process_thread,
@ -185,7 +184,6 @@ VideoReceiveStream::VideoReceiveStream(
: transport_adapter_(config.rtcp_send_transport),
config_(std::move(config)),
num_cpu_cores_(num_cpu_cores),
protected_by_flexfec_(protected_by_flexfec),
process_thread_(process_thread),
clock_(Clock::GetRealTimeClock()),
decode_thread_(DecodeThreadFunction, this, "DecodingThread"),
@ -271,8 +269,8 @@ void VideoReceiveStream::Start() {
if (decode_thread_.IsRunning())
return;
bool protected_by_fec =
protected_by_flexfec_ || rtp_stream_receiver_.IsUlpfecEnabled();
bool protected_by_fec = config_.rtp.protected_by_flexfec ||
rtp_stream_receiver_.IsUlpfecEnabled();
frame_buffer_->Start();
call_stats_->RegisterStatsObserver(&rtp_stream_receiver_);

2
webrtc/video/video_receive_stream.h
View file

@ -50,7 +50,6 @@ class VideoReceiveStream : public webrtc::VideoReceiveStream,
public Syncable {
public:
VideoReceiveStream(int num_cpu_cores,
bool protected_by_flexfec,
PacketRouter* packet_router,
VideoReceiveStream::Config config,
ProcessThread* process_thread,
@ -119,7 +118,6 @@ class VideoReceiveStream : public webrtc::VideoReceiveStream,
TransportAdapter transport_adapter_;
const VideoReceiveStream::Config config_;
const int num_cpu_cores_;
const bool protected_by_flexfec_;
ProcessThread* const process_thread_;
Clock* const clock_;

1
webrtc/video/video_receive_stream_unittest.cc
View file

@ -93,7 +93,6 @@ class VideoReceiveStreamTest : public testing::Test {
video_receive_stream_.reset(new webrtc::internal::VideoReceiveStream(
kDefaultNumCpuCores,
false, // flex_fec
&packet_router_, config_.Copy(), process_thread_.get(), &call_stats_,
nullptr)); // remb
}

3
webrtc/video_receive_stream.h
View file

@ -147,6 +147,9 @@ class VideoReceiveStream {
// SSRC for retransmissions.
uint32_t rtx_ssrc = 0;
// Set if the stream is protected using FlexFEC.
bool protected_by_flexfec = false;
// Map from video payload type (apt) -> RTX payload type (pt).
// For RTX to be enabled, both an SSRC and this mapping are needed.
std::map<int, int> rtx_payload_types;