Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1113)

Unified Diff: media/cast/transport/transport_video_sender.cc

Issue 174183003: Cast:Transport: Dividing A/V Initialization pipeline (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixing errors and yet another rebase Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/cast/transport/transport_video_sender.h ('k') | media/cast/video_sender/video_sender_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cast/transport/transport_video_sender.cc
diff --git a/media/cast/transport/transport_video_sender.cc b/media/cast/transport/transport_video_sender.cc
index 060184ff6066124ff5eb3445f4dcc35c5e67831f..18624585f29f56877f1ff8a294a3644095745450 100644
--- a/media/cast/transport/transport_video_sender.cc
+++ b/media/cast/transport/transport_video_sender.cc
@@ -17,19 +17,17 @@ namespace cast {
namespace transport {
TransportVideoSender::TransportVideoSender(
- const CastTransportConfig& config,
+ const CastTransportVideoConfig& config,
base::TickClock* clock,
- const scoped_refptr<base::TaskRunner>& transport_task_runner,
+ const scoped_refptr<base::SingleThreadTaskRunner>& transport_task_runner,
PacedSender* const paced_packet_sender)
: rtp_max_delay_(base::TimeDelta::FromMilliseconds(
- config.video_rtp_config.max_delay_ms)),
+ config.base.rtp_config.max_delay_ms)),
encryptor_(),
- rtp_sender_(clock,
- config,
- false,
- transport_task_runner,
- paced_packet_sender) {
- initialized_ = encryptor_.Initialize(config.aes_key, config.aes_iv_mask);
+ rtp_sender_(clock, transport_task_runner, paced_packet_sender) {
+ rtp_sender_.InitializeVideo(config);
+ initialized_ =
+ encryptor_.Initialize(config.base.aes_key, config.base.aes_iv_mask);
}
TransportVideoSender::~TransportVideoSender() {}
@@ -57,7 +55,7 @@ bool TransportVideoSender::EncryptVideoFrame(
const EncodedVideoFrame& video_frame,
EncodedVideoFrame* encrypted_frame) {
if (!encryptor_.Encrypt(
- video_frame.frame_id, video_frame.data, &(encrypted_frame->data)))
+ video_frame.frame_id, video_frame.data, &(encrypted_frame->data)))
return false;
encrypted_frame->codec = video_frame.codec;
« no previous file with comments | « media/cast/transport/transport_video_sender.h ('k') | media/cast/video_sender/video_sender_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698