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

Unified Diff: media/cast/audio_sender/audio_sender.cc

Issue 149253008: Cast:Refactoring AudioSender to Clang format (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 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
Index: media/cast/audio_sender/audio_sender.cc
diff --git a/media/cast/audio_sender/audio_sender.cc b/media/cast/audio_sender/audio_sender.cc
index eaa6cf39d5435d45d96ed53cf1a4f3167d6f98d8..6b67295f848cb12036dc14e930e8a42667fe6c42 100644
--- a/media/cast/audio_sender/audio_sender.cc
+++ b/media/cast/audio_sender/audio_sender.cc
@@ -18,11 +18,10 @@ const int64 kMinSchedulingDelayMs = 1;
class LocalRtcpAudioSenderFeedback : public RtcpSenderFeedback {
public:
explicit LocalRtcpAudioSenderFeedback(AudioSender* audio_sender)
- : audio_sender_(audio_sender) {
- }
+ : audio_sender_(audio_sender) {}
- virtual void OnReceivedCastFeedback(
- const RtcpCastMessage& cast_feedback) OVERRIDE {
+ virtual void OnReceivedCastFeedback(const RtcpCastMessage& cast_feedback)
+ OVERRIDE {
if (!cast_feedback.missing_frames_and_packets_.empty()) {
audio_sender_->ResendPackets(cast_feedback.missing_frames_and_packets_);
}
@@ -38,8 +37,7 @@ class LocalRtpSenderStatistics : public RtpSenderStatistics {
public:
explicit LocalRtpSenderStatistics(
transport::CastTransportSender* const transport_sender)
- : transport_sender_(transport_sender) {
- }
+ : transport_sender_(transport_sender) {}
virtual void GetStatistics(const base::TimeTicks& now,
transport::RtcpSenderInfo* sender_info) OVERRIDE {
@@ -53,34 +51,34 @@ class LocalRtpSenderStatistics : public RtpSenderStatistics {
};
// TODO(mikhal): Reduce heap allocation when not needed.
-AudioSender::AudioSender(
- scoped_refptr<CastEnvironment> cast_environment,
- const AudioSenderConfig& audio_config,
- transport::CastTransportSender* const transport_sender)
- : cast_environment_(cast_environment),
- transport_sender_(transport_sender),
- rtcp_feedback_(new LocalRtcpAudioSenderFeedback(this)),
- rtp_audio_sender_statistics_(
- new LocalRtpSenderStatistics(transport_sender_)),
- rtcp_(cast_environment,
- rtcp_feedback_.get(),
- transport_sender_,
- NULL, // paced sender.
- rtp_audio_sender_statistics_.get(),
- NULL,
- audio_config.rtcp_mode,
- base::TimeDelta::FromMilliseconds(audio_config.rtcp_interval),
- audio_config.sender_ssrc,
- audio_config.incoming_feedback_ssrc,
- audio_config.rtcp_c_name),
- timers_initialized_(false),
- initialization_status_(STATUS_INITIALIZED),
- weak_factory_(this) {
+AudioSender::AudioSender(scoped_refptr<CastEnvironment> cast_environment,
+ const AudioSenderConfig& audio_config,
+ transport::CastTransportSender* const transport_sender)
+ : cast_environment_(cast_environment),
+ transport_sender_(transport_sender),
+ rtcp_feedback_(new LocalRtcpAudioSenderFeedback(this)),
+ rtp_audio_sender_statistics_(
+ new LocalRtpSenderStatistics(transport_sender_)),
+ rtcp_(cast_environment,
+ rtcp_feedback_.get(),
+ transport_sender_,
+ NULL, // paced sender.
+ rtp_audio_sender_statistics_.get(),
+ NULL,
+ audio_config.rtcp_mode,
+ base::TimeDelta::FromMilliseconds(audio_config.rtcp_interval),
+ audio_config.sender_ssrc,
+ audio_config.incoming_feedback_ssrc,
+ audio_config.rtcp_c_name),
+ timers_initialized_(false),
+ initialization_status_(STATUS_INITIALIZED),
+ weak_factory_(this) {
if (!audio_config.use_external_encoder) {
- audio_encoder_ = new AudioEncoder(
- cast_environment, audio_config,
- base::Bind(&AudioSender::SendEncodedAudioFrame,
- weak_factory_.GetWeakPtr()));
+ audio_encoder_ =
+ new AudioEncoder(cast_environment,
+ audio_config,
+ base::Bind(&AudioSender::SendEncodedAudioFrame,
+ weak_factory_.GetWeakPtr()));
initialization_status_ = audio_encoder_->InitializationResult();
}
}
@@ -103,8 +101,11 @@ void AudioSender::InsertAudio(const AudioBus* audio_bus,
// TODO(mikhal): Resolve calculation of the audio rtp_timestamp for logging.
// This is a tmp solution to allow the code to build.
base::TimeTicks now = cast_environment_->Clock()->NowTicks();
- cast_environment_->Logging()->InsertFrameEvent(now, kAudioFrameReceived,
- GetVideoRtpTimestamp(recorded_time), kFrameIdUnknown);
+ cast_environment_->Logging()->InsertFrameEvent(
+ now,
+ kAudioFrameReceived,
+ GetVideoRtpTimestamp(recorded_time),
+ kFrameIdUnknown);
audio_encoder_->InsertAudio(audio_bus, recorded_time, done_callback);
}
@@ -114,9 +115,11 @@ void AudioSender::SendEncodedAudioFrame(
DCHECK(cast_environment_->CurrentlyOn(CastEnvironment::MAIN));
InitializeTimers();
cast_environment_->PostTask(
- CastEnvironment::TRANSPORT, FROM_HERE,
+ CastEnvironment::TRANSPORT,
+ FROM_HERE,
base::Bind(&AudioSender::SendEncodedAudioFrameToTransport,
- base::Unretained(this), base::Passed(&audio_frame),
+ base::Unretained(this),
+ base::Passed(&audio_frame),
recorded_time));
}
@@ -131,9 +134,11 @@ void AudioSender::ResendPackets(
const MissingFramesAndPacketsMap& missing_frames_and_packets) {
DCHECK(cast_environment_->CurrentlyOn(CastEnvironment::MAIN));
cast_environment_->PostTask(
- CastEnvironment::TRANSPORT, FROM_HERE,
+ CastEnvironment::TRANSPORT,
+ FROM_HERE,
base::Bind(&AudioSender::ResendPacketsOnTransportThread,
- base::Unretained(this), missing_frames_and_packets));
+ base::Unretained(this),
+ missing_frames_and_packets));
}
void AudioSender::IncomingRtcpPacket(scoped_ptr<Packet> packet) {
@@ -146,13 +151,14 @@ void AudioSender::ScheduleNextRtcpReport() {
base::TimeDelta time_to_next =
rtcp_.TimeToSendNextRtcpReport() - cast_environment_->Clock()->NowTicks();
- time_to_next = std::max(time_to_next,
- base::TimeDelta::FromMilliseconds(kMinSchedulingDelayMs));
+ time_to_next = std::max(
+ time_to_next, base::TimeDelta::FromMilliseconds(kMinSchedulingDelayMs));
cast_environment_->PostDelayedTask(
- CastEnvironment::MAIN, FROM_HERE,
+ CastEnvironment::MAIN,
+ FROM_HERE,
base::Bind(&AudioSender::SendRtcpReport, weak_factory_.GetWeakPtr()),
- time_to_next);
+ time_to_next);
}
void AudioSender::SendRtcpReport() {

Powered by Google App Engine
This is Rietveld 408576698