[Cast] Clean-up: Merge RtpReceiver+AudioReceiver+VideoReceiver-->FrameReceiver.

media/cast/receiver/audio_decoder.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_decoder.h"
+#include "media/cast/receiver/audio_decoder.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/sys_byteorder.h"
 #include "media/cast/cast_defines.h"
 #include "third_party/opus/src/include/opus.h"
 
@@ skipping 177 matching lines @@
     audio_bus = AudioBus::Create(num_channels_, num_samples).Pass();
     audio_bus->FromInterleaved(pcm_data, num_samples, sizeof(int16));
     return audio_bus.Pass();
   }
 
   DISALLOW_COPY_AND_ASSIGN(Pcm16Impl);
 };
 
 AudioDecoder::AudioDecoder(
     const scoped_refptr<CastEnvironment>& cast_environment,
-    const FrameReceiverConfig& audio_config)
+    int channels,
+    int sampling_rate,
+    transport::AudioCodec codec)
     : cast_environment_(cast_environment) {
-  switch (audio_config.codec.audio) {
+  switch (codec) {
     case transport::kOpus:
-      impl_ = new OpusImpl(cast_environment,
-                           audio_config.channels,
-                           audio_config.frequency);
+      impl_ = new OpusImpl(cast_environment, channels, sampling_rate);
       break;
     case transport::kPcm16:
-      impl_ = new Pcm16Impl(cast_environment,
-                            audio_config.channels,
-                            audio_config.frequency);
+      impl_ = new Pcm16Impl(cast_environment, channels, sampling_rate);
       break;
     default:
       NOTREACHED() << "Unknown or unspecified codec.";
       break;
   }
 }
 
 AudioDecoder::~AudioDecoder() {}
 
 CastInitializationStatus AudioDecoder::InitializationResult() const {
@@ skipping 14 matching lines @@
   cast_environment_->PostTask(CastEnvironment::AUDIO,
                               FROM_HERE,
                               base::Bind(&AudioDecoder::ImplBase::DecodeFrame,
                                          impl_,
                                          base::Passed(&encoded_frame),
                                          callback));
 }
 
 }  // namespace cast
 }  // namespace media