| Index: media/cast/transport/rtp_sender/rtp_sender.cc
|
| diff --git a/media/cast/transport/rtp_sender/rtp_sender.cc b/media/cast/transport/rtp_sender/rtp_sender.cc
|
| index cbb9a4ef5e673b199a497f5182723b82ff33b1b4..f06d6e1a3685e1b10a71435b0e18c6c67336e375 100644
|
| --- a/media/cast/transport/rtp_sender/rtp_sender.cc
|
| +++ b/media/cast/transport/rtp_sender/rtp_sender.cc
|
| @@ -6,7 +6,6 @@
|
|
|
| #include "base/logging.h"
|
| #include "base/rand_util.h"
|
| -#include "media/cast/rtcp/rtcp_defines.h"
|
| #include "media/cast/transport/cast_transport_defines.h"
|
| #include "media/cast/transport/pacing/paced_sender.h"
|
| #include "net/base/big_endian.h"
|
| @@ -15,26 +14,23 @@ namespace media {
|
| namespace cast {
|
| namespace transport {
|
|
|
| -RtpSender::RtpSender(scoped_refptr<CastEnvironment> cast_environment,
|
| +RtpSender::RtpSender(base::TickClock* clock,
|
| const AudioSenderConfig* audio_config,
|
| const VideoSenderConfig* video_config,
|
| PacedPacketSender* transport)
|
| - : cast_environment_(cast_environment),
|
| - config_(),
|
| + : config_(),
|
| transport_(transport) {
|
| // Store generic cast config and create packetizer config.
|
| DCHECK(audio_config || video_config) << "Invalid argument";
|
| if (audio_config) {
|
| - storage_.reset(new PacketStorage(cast_environment->Clock(),
|
| - audio_config->rtp_history_ms));
|
| + storage_.reset(new PacketStorage(clock, audio_config->rtp_history_ms));
|
| config_.audio = true;
|
| config_.ssrc = audio_config->sender_ssrc;
|
| config_.payload_type = audio_config->rtp_payload_type;
|
| config_.frequency = audio_config->frequency;
|
| config_.audio_codec = audio_config->codec;
|
| } else {
|
| - storage_.reset(new PacketStorage(cast_environment->Clock(),
|
| - video_config->rtp_history_ms));
|
| + storage_.reset(new PacketStorage(clock, video_config->rtp_history_ms));
|
| config_.audio = false;
|
| config_.ssrc = video_config->sender_ssrc;
|
| config_.payload_type = video_config->rtp_payload_type;
|
|
|