admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Properly wire up the event log to the VideoSendStream.

Browse Source 
Also set the Configuration parameters in CreateRtpRtcpModules in the same order as the members are declared.

BUG=webrtc:5917

Review-Url: https://codereview.webrtc.org/2011433002
Cr-Commit-Position: refs/heads/master@{#12905}
This commit is contained in:
terelius 2016-05-26 01:58:40 -07:00 committed by Commit bot
parent bf81d68a42
commit adafe0b70a
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
webrtc/call/call.cc
View File

@ -413,7 +413,7 @@ webrtc::VideoSendStream* Call::CreateVideoSendStream(
VideoSendStream* send_stream = new VideoSendStream(
num_cpu_cores_, module_process_thread_.get(), call_stats_.get(),
congestion_controller_.get(), bitrate_allocator_.get(),
video_send_delay_stats_.get(), &remb_, config, encoder_config,
video_send_delay_stats_.get(), &remb_, event_log_, config, encoder_config,
suspended_video_send_ssrcs_);
{
WriteLockScoped write_lock(*send_crit_);

8
webrtc/video/video_send_stream.cc
View File

@ -49,6 +49,7 @@ std::vector<RtpRtcp*> CreateRtpRtcpModules(
TransportSequenceNumberAllocator* transport_sequence_number_allocator,
SendStatisticsProxy* stats_proxy,
SendDelayStats* send_delay_stats,
RtcEventLog* event_log,
size_t num_modules) {
RTC_DCHECK_GT(num_modules, 0u);
RtpRtcp::Configuration configuration;
@ -58,6 +59,8 @@ std::vector<RtpRtcp*> CreateRtpRtcpModules(
configuration.receive_statistics = null_receive_statistics;
configuration.outgoing_transport = outgoing_transport;
configuration.intra_frame_callback = intra_frame_callback;
configuration.bandwidth_callback = bandwidth_callback;
configuration.transport_feedback_callback = transport_feedback_callback;
configuration.rtt_stats = rtt_stats;
configuration.rtcp_packet_type_counter_observer = stats_proxy;
configuration.paced_sender = paced_sender;
@ -67,8 +70,7 @@ std::vector<RtpRtcp*> CreateRtpRtcpModules(
configuration.send_frame_count_observer = stats_proxy;
configuration.send_side_delay_observer = stats_proxy;
configuration.send_packet_observer = send_delay_stats;
configuration.bandwidth_callback = bandwidth_callback;
configuration.transport_feedback_callback = transport_feedback_callback;
configuration.event_log = event_log;
std::vector<RtpRtcp*> modules;
for (size_t i = 0; i < num_modules; ++i) {
@ -353,6 +355,7 @@ VideoSendStream::VideoSendStream(
BitrateAllocator* bitrate_allocator,
SendDelayStats* send_delay_stats,
VieRemb* remb,
RtcEventLog* event_log,
const VideoSendStream::Config& config,
const VideoEncoderConfig& encoder_config,
const std::map<uint32_t, RtpState>& suspended_ssrcs)
@ -397,6 +400,7 @@ VideoSendStream::VideoSendStream(
congestion_controller_->packet_router(),
&stats_proxy_,
send_delay_stats,
event_log,
config_.rtp.ssrcs.size())),
payload_router_(rtp_rtcp_modules_, config.encoder_settings.payload_type),
input_(&encoder_wakeup_event_,

2
webrtc/video/video_send_stream.h
View File

@ -39,6 +39,7 @@ class ProcessThread;
class RtpRtcp;
class ViEEncoder;
class VieRemb;
class RtcEventLog;
namespace vcm {
class VideoSender;
@ -59,6 +60,7 @@ class VideoSendStream : public webrtc::VideoSendStream,
BitrateAllocator* bitrate_allocator,
SendDelayStats* send_delay_stats,
VieRemb* remb,
RtcEventLog* event_log,
const VideoSendStream::Config& config,
const VideoEncoderConfig& encoder_config,
const std::map<uint32_t, RtpState>& suspended_ssrcs);