| Index: media/cast/sender/audio_encoder.h
|
| diff --git a/media/cast/audio_sender/audio_encoder.h b/media/cast/sender/audio_encoder.h
|
| similarity index 83%
|
| rename from media/cast/audio_sender/audio_encoder.h
|
| rename to media/cast/sender/audio_encoder.h
|
| index a8e27bcd56e900a45c4d20275c2a812247337fb6..eee192bfaeb3082d3b426ca83fae2e01a7645efb 100644
|
| --- a/media/cast/audio_sender/audio_encoder.h
|
| +++ b/media/cast/sender/audio_encoder.h
|
| @@ -2,8 +2,8 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef MEDIA_CAST_AUDIO_SENDER_AUDIO_ENCODER_H_
|
| -#define MEDIA_CAST_AUDIO_SENDER_AUDIO_ENCODER_H_
|
| +#ifndef MEDIA_CAST_SENDER_AUDIO_ENCODER_H_
|
| +#define MEDIA_CAST_SENDER_AUDIO_ENCODER_H_
|
|
|
| #include "base/memory/ref_counted.h"
|
| #include "base/memory/scoped_ptr.h"
|
| @@ -20,14 +20,14 @@ namespace cast {
|
|
|
| class AudioEncoder {
|
| public:
|
| - typedef base::Callback<void(scoped_ptr<transport::EncodedFrame>)>
|
| + typedef base::Callback<void(scoped_ptr<EncodedFrame>)>
|
| FrameEncodedCallback;
|
|
|
| AudioEncoder(const scoped_refptr<CastEnvironment>& cast_environment,
|
| int num_channels,
|
| int sampling_rate,
|
| int bitrate,
|
| - transport::Codec codec,
|
| + Codec codec,
|
| const FrameEncodedCallback& frame_encoded_callback);
|
| virtual ~AudioEncoder();
|
|
|
| @@ -53,4 +53,4 @@ class AudioEncoder {
|
| } // namespace cast
|
| } // namespace media
|
|
|
| -#endif // MEDIA_CAST_AUDIO_SENDER_AUDIO_ENCODER_H_
|
| +#endif // MEDIA_CAST_SENDER_AUDIO_ENCODER_H_
|
|
|