[Cast] Remove AudioDecoder's dependency on WebRTC, and refactor/clean-up AudioReceiver.

media/cast/test/utility/in_process_receiver.cc

 // Copyright 2014 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/test/utility/in_process_receiver.h"
 
 #include "base/bind_helpers.h"
 #include "base/time/time.h"
 #include "media/base/video_frame.h"
 #include "media/cast/cast_config.h"
@@ skipping 59 matching lines @@
   cast_receiver_ = CastReceiver::Create(
       cast_environment_, audio_config_, video_config_, transport_.get());
 
   // TODO(hubbe): Make the cast receiver do this automatically.
   transport_->StartReceiving(cast_receiver_->packet_receiver());
 
   PullNextAudioFrame();
   PullNextVideoFrame();
 }
 
-void InProcessReceiver::GotAudioFrame(scoped_ptr<PcmAudioFrame> audio_frame,
-                                      const base::TimeTicks& playout_time) {
+void InProcessReceiver::GotAudioFrame(scoped_ptr<AudioBus> audio_frame,
+                                      const base::TimeTicks& playout_time,
+                                      bool is_continuous) {
   DCHECK(cast_environment_->CurrentlyOn(CastEnvironment::MAIN));
-  OnAudioFrame(audio_frame.Pass(), playout_time);
-  // TODO(miu): Put this back here: PullNextAudioFrame();
+  if (audio_frame.get()) {
+    // TODO(miu): Remove use of deprecated PcmAudioFrame and also pass
+    // |is_continuous| flag.
+    scoped_ptr<PcmAudioFrame> pcm_frame(new PcmAudioFrame());
+    pcm_frame->channels = audio_frame->channels();
+    pcm_frame->frequency = audio_config_.frequency;
+    pcm_frame->samples.resize(audio_frame->channels() * audio_frame->frames());
+    audio_frame->ToInterleaved(
+        audio_frame->frames(), sizeof(int16), &pcm_frame->samples.front());
+    OnAudioFrame(pcm_frame.Pass(), playout_time);
+  }
+  PullNextAudioFrame();
 }
 
 void InProcessReceiver::GotVideoFrame(
     const scoped_refptr<VideoFrame>& video_frame,
     const base::TimeTicks& render_time) {
   DCHECK(cast_environment_->CurrentlyOn(CastEnvironment::MAIN));
   OnVideoFrame(video_frame, render_time);
   PullNextVideoFrame();
 }
 
 void InProcessReceiver::PullNextAudioFrame() {
   DCHECK(cast_environment_->CurrentlyOn(CastEnvironment::MAIN));
   cast_receiver_->frame_receiver()->GetRawAudioFrame(
-      1 /* 10 ms of samples */,
-      audio_config_.frequency,
       base::Bind(&InProcessReceiver::GotAudioFrame,
                  weak_factory_.GetWeakPtr()));
-  // TODO(miu): Fix audio decoder so that it never drops a request for the next
-  // frame of audio.  Once fixed, remove this, and add PullNextAudioFrame() to
-  // the end of GotAudioFrame(), so that it behaves just like GotVideoFrame().
-  // http://crbug.com/347361
-  cast_environment_->PostDelayedTask(
-      CastEnvironment::MAIN,
-      FROM_HERE,
-      base::Bind(&InProcessReceiver::PullNextAudioFrame,
-                 weak_factory_.GetWeakPtr()),
-      base::TimeDelta::FromMilliseconds(10));
 }
 
 void InProcessReceiver::PullNextVideoFrame() {
   DCHECK(cast_environment_->CurrentlyOn(CastEnvironment::MAIN));
   cast_receiver_->frame_receiver()->GetRawVideoFrame(base::Bind(
       &InProcessReceiver::GotVideoFrame, weak_factory_.GetWeakPtr()));
 }
 
 // static
 void InProcessReceiver::WillDestroyReceiver(InProcessReceiver* receiver) {
   DCHECK(receiver->cast_environment_->CurrentlyOn(CastEnvironment::MAIN));
 }
 
 }  // namespace cast
 }  // namespace media