Cast: Removed unnecessary ref counters.

media/cast/audio_receiver/audio_receiver.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/cast/audio_receiver/audio_receiver.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "crypto/encryptor.h"
@@ skipping 79 matching lines @@
       base::TimeDelta::FromMilliseconds(audio_config.rtp_max_delay_ms);
   incoming_payload_callback_.reset(new LocalRtpAudioData(this));
   incoming_payload_feedback_.reset(new LocalRtpAudioFeedback(this));
   if (audio_config.use_external_decoder) {
     audio_buffer_.reset(new Framer(cast_environment->Clock(),
                                    incoming_payload_feedback_.get(),
                                    audio_config.incoming_ssrc,
                                    true,
                                    0));
   } else {
-    audio_decoder_ = new AudioDecoder(audio_config);
+    audio_decoder_.reset(new AudioDecoder(audio_config));
   }
   if (audio_config.aes_iv_mask.size() == kAesKeySize &&
       audio_config.aes_key.size() == kAesKeySize) {
     iv_mask_ = audio_config.aes_iv_mask;
     crypto::SymmetricKey* key = crypto::SymmetricKey::Import(
         crypto::SymmetricKey::AES, audio_config.aes_key);
     decryptor_.reset(new crypto::Encryptor());
     decryptor_->Init(key, crypto::Encryptor::CTR, std::string());
   } else if (audio_config.aes_iv_mask.size() != 0 ||
              audio_config.aes_key.size() != 0) {
@@ skipping 77 matching lines @@
   cast_environment_->PostTask(CastEnvironment::MAIN, FROM_HERE,
       base::Bind(&AudioReceiver::GetEncodedAudioFrame,
           weak_factory_.GetWeakPtr(), callback));
 }
 
 void AudioReceiver::GetRawAudioFrame(int number_of_10ms_blocks,
       int desired_frequency, const AudioFrameDecodedCallback& callback) {
   DCHECK(cast_environment_->CurrentlyOn(CastEnvironment::MAIN));
   DCHECK(audio_decoder_) << "Invalid function call in this configuration";
 
+  // TODO(pwestin): we can skip this function by posting direct to the decoder.
   cast_environment_->PostTask(CastEnvironment::AUDIO_DECODER, FROM_HERE,
       base::Bind(&AudioReceiver::DecodeAudioFrameThread,
                  base::Unretained(this),
                  number_of_10ms_blocks,
                  desired_frequency,
                  callback));
 }
 
 void AudioReceiver::DecodeAudioFrameThread(
     int number_of_10ms_blocks,
     int desired_frequency,
     const AudioFrameDecodedCallback callback) {
   DCHECK(cast_environment_->CurrentlyOn(CastEnvironment::AUDIO_DECODER));
   // TODO(mikhal): Allow the application to allocate this memory.
   scoped_ptr<PcmAudioFrame> audio_frame(new PcmAudioFrame());
 
   uint32 rtp_timestamp = 0;
   if (!audio_decoder_->GetRawAudioFrame(number_of_10ms_blocks,
                                         desired_frequency,
                                         audio_frame.get(),
                                         &rtp_timestamp)) {
+    // TODO(pwestin): This looks wrong, we would loose the pending call to
+    // the application provided callback.
     return;
   }
   base::TimeTicks now = cast_environment_->Clock()->NowTicks();
   base::TimeTicks playout_time;
   playout_time = GetPlayoutTime(now, rtp_timestamp);
   base::TimeDelta diff = playout_time - now;
 
   cast_environment_->Logging()->InsertFrameEvent(kAudioPlayoutDelay,
       rtp_timestamp, diff.InMilliseconds());
 
@@ skipping 205 matching lines @@
 
 void AudioReceiver::SendNextCastMessage() {
   DCHECK(cast_environment_->CurrentlyOn(CastEnvironment::MAIN));
   DCHECK(audio_buffer_) << "Invalid function call in this configuration";
   audio_buffer_->SendCastMessage();  // Will only send a message if it is time.
   ScheduleNextCastMessage();
 }
 
 }  // namespace cast
 }  // namespace media