| Index: media/cast/receiver/audio_decoder.cc
|
| diff --git a/media/cast/audio_receiver/audio_decoder.cc b/media/cast/receiver/audio_decoder.cc
|
| similarity index 95%
|
| rename from media/cast/audio_receiver/audio_decoder.cc
|
| rename to media/cast/receiver/audio_decoder.cc
|
| index e4e9a1453eb68d71b96cb90a560de9698e97e874..de6ced56984454ad4949ed84e0e0d3a68157560b 100644
|
| --- a/media/cast/audio_receiver/audio_decoder.cc
|
| +++ b/media/cast/receiver/audio_decoder.cc
|
| @@ -2,7 +2,7 @@
|
| // 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"
|
| @@ -200,18 +200,16 @@ class AudioDecoder::Pcm16Impl : public AudioDecoder::ImplBase {
|
|
|
| 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.";
|
|
|