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

Side by Side Diff: media/cast/sender/audio_sender.cc

Issue 562653004: Cast: First stab at implementing adaptive latency (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: refine formula, add comments Created 6 years, 3 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "media/cast/sender/audio_sender.h" 5 #include "media/cast/sender/audio_sender.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/message_loop/message_loop.h" 9 #include "base/message_loop/message_loop.h"
10 #include "media/cast/cast_defines.h" 10 #include "media/cast/cast_defines.h"
(...skipping 15 matching lines...) Expand all
26 const AudioSenderConfig& audio_config, 26 const AudioSenderConfig& audio_config,
27 CastTransportSender* const transport_sender) 27 CastTransportSender* const transport_sender)
28 : FrameSender( 28 : FrameSender(
29 cast_environment, 29 cast_environment,
30 true, 30 true,
31 transport_sender, 31 transport_sender,
32 base::TimeDelta::FromMilliseconds(audio_config.rtcp_interval), 32 base::TimeDelta::FromMilliseconds(audio_config.rtcp_interval),
33 audio_config.frequency, 33 audio_config.frequency,
34 audio_config.ssrc, 34 audio_config.ssrc,
35 kAudioFrameRate * 2.0, // We lie to increase max outstanding frames. 35 kAudioFrameRate * 2.0, // We lie to increase max outstanding frames.
36 audio_config.target_playout_delay, 36 audio_config.min_playout_delay,
37 audio_config.max_playout_delay,
37 NewFixedCongestionControl(audio_config.bitrate)), 38 NewFixedCongestionControl(audio_config.bitrate)),
38 samples_in_encoder_(0), 39 samples_in_encoder_(0),
39 weak_factory_(this) { 40 weak_factory_(this) {
40 cast_initialization_status_ = STATUS_AUDIO_UNINITIALIZED; 41 cast_initialization_status_ = STATUS_AUDIO_UNINITIALIZED;
41 VLOG(1) << "max_unacked_frames " << max_unacked_frames_; 42 VLOG(1) << "max_unacked_frames " << max_unacked_frames_;
42 DCHECK_GT(max_unacked_frames_, 0); 43 DCHECK_GT(max_unacked_frames_, 0);
43 44
44 if (!audio_config.use_external_encoder) { 45 if (!audio_config.use_external_encoder) {
45 audio_encoder_.reset( 46 audio_encoder_.reset(
46 new AudioEncoder(cast_environment, 47 new AudioEncoder(cast_environment,
47 audio_config.channels, 48 audio_config.channels,
48 audio_config.frequency, 49 audio_config.frequency,
49 audio_config.bitrate, 50 audio_config.bitrate,
50 audio_config.codec, 51 audio_config.codec,
51 base::Bind(&AudioSender::OnEncodedAudioFrame, 52 base::Bind(&AudioSender::OnEncodedAudioFrame,
52 weak_factory_.GetWeakPtr(), 53 weak_factory_.GetWeakPtr(),
53 audio_config.bitrate))); 54 audio_config.bitrate)));
54 cast_initialization_status_ = audio_encoder_->InitializationResult(); 55 cast_initialization_status_ = audio_encoder_->InitializationResult();
55 } else { 56 } else {
56 NOTREACHED(); // No support for external audio encoding. 57 NOTREACHED(); // No support for external audio encoding.
57 cast_initialization_status_ = STATUS_AUDIO_UNINITIALIZED; 58 cast_initialization_status_ = STATUS_AUDIO_UNINITIALIZED;
58 } 59 }
59 60
60 media::cast::CastTransportRtpConfig transport_config; 61 media::cast::CastTransportRtpConfig transport_config;
61 transport_config.ssrc = audio_config.ssrc; 62 transport_config.ssrc = audio_config.ssrc;
62 transport_config.feedback_ssrc = audio_config.incoming_feedback_ssrc; 63 transport_config.feedback_ssrc = audio_config.incoming_feedback_ssrc;
63 transport_config.rtp_payload_type = audio_config.rtp_payload_type; 64 transport_config.rtp_payload_type = audio_config.rtp_payload_type;
64 // TODO(miu): AudioSender needs to be like VideoSender in providing an upper 65 transport_config.stored_frames =
65 // limit on the number of in-flight frames. 66 std::min(kMaxUnackedFrames,
66 transport_config.stored_frames = max_unacked_frames_; 67 1 + static_cast<int>(max_playout_delay_ *
68 max_frame_rate_ /
69 base::TimeDelta::FromSeconds(1)));
67 transport_config.aes_key = audio_config.aes_key; 70 transport_config.aes_key = audio_config.aes_key;
68 transport_config.aes_iv_mask = audio_config.aes_iv_mask; 71 transport_config.aes_iv_mask = audio_config.aes_iv_mask;
69 72
70 transport_sender->InitializeAudio( 73 transport_sender->InitializeAudio(
71 transport_config, 74 transport_config,
72 base::Bind(&AudioSender::OnReceivedCastFeedback, 75 base::Bind(&AudioSender::OnReceivedCastFeedback,
73 weak_factory_.GetWeakPtr()), 76 weak_factory_.GetWeakPtr()),
74 base::Bind(&AudioSender::OnMeasuredRoundTripTime, 77 base::Bind(&AudioSender::OnMeasuredRoundTripTime,
75 weak_factory_.GetWeakPtr())); 78 weak_factory_.GetWeakPtr()));
76 } 79 }
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 DCHECK(cast_environment_->CurrentlyOn(CastEnvironment::MAIN)); 118 DCHECK(cast_environment_->CurrentlyOn(CastEnvironment::MAIN));
116 119
117 samples_in_encoder_ -= audio_encoder_->GetSamplesPerFrame() + samples_skipped; 120 samples_in_encoder_ -= audio_encoder_->GetSamplesPerFrame() + samples_skipped;
118 DCHECK_GE(samples_in_encoder_, 0); 121 DCHECK_GE(samples_in_encoder_, 0);
119 122
120 SendEncodedFrame(encoder_bitrate, encoded_frame.Pass()); 123 SendEncodedFrame(encoder_bitrate, encoded_frame.Pass());
121 } 124 }
122 125
123 } // namespace cast 126 } // namespace cast
124 } // namespace media 127 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698