| Index: media/cast/audio_sender/audio_sender.h
|
| diff --git a/media/cast/audio_sender/audio_sender.h b/media/cast/audio_sender/audio_sender.h
|
| index 85f73051be8cb75b11ddafe0d4d8700b8f4bf0d7..32196354f31563f9b4a8359f104eef6b4ed1d89f 100644
|
| --- a/media/cast/audio_sender/audio_sender.h
|
| +++ b/media/cast/audio_sender/audio_sender.h
|
| @@ -13,7 +13,6 @@
|
| #include "base/time/tick_clock.h"
|
| #include "base/time/time.h"
|
| #include "media/cast/cast_config.h"
|
| -#include "media/cast/cast_environment.h"
|
| #include "media/cast/rtcp/rtcp.h"
|
| #include "media/cast/transport/rtp_sender/rtp_sender.h"
|
|
|
| @@ -56,17 +55,19 @@ class AudioSender : public base::NonThreadSafe,
|
| // The closure callback is called from the main cast thread as soon as
|
| // the cast sender is done with the frame; it does not mean that the encoded
|
| // frame has been sent out.
|
| - void InsertCodedAudioFrame(const EncodedAudioFrame* audio_frame,
|
| - const base::TimeTicks& recorded_time,
|
| - const base::Closure callback);
|
| + void InsertCodedAudioFrame(
|
| + const transport::EncodedAudioFrame* audio_frame,
|
| + const base::TimeTicks& recorded_time,
|
| + const base::Closure callback);
|
|
|
| // Only called from the main cast thread.
|
| void IncomingRtcpPacket(const uint8* packet, size_t length,
|
| const base::Closure callback);
|
|
|
| protected:
|
| - void SendEncodedAudioFrame(scoped_ptr<EncodedAudioFrame> audio_frame,
|
| - const base::TimeTicks& recorded_time);
|
| + void SendEncodedAudioFrame(
|
| + scoped_ptr<transport::EncodedAudioFrame> audio_frame,
|
| + const base::TimeTicks& recorded_time);
|
|
|
| private:
|
| friend class LocalRtcpAudioSenderFeedback;
|
| @@ -76,8 +77,8 @@ class AudioSender : public base::NonThreadSafe,
|
|
|
| // Caller must allocate the destination |encrypted_frame|. The data member
|
| // will be resized to hold the encrypted size.
|
| - bool EncryptAudioFrame(const EncodedAudioFrame& audio_frame,
|
| - EncodedAudioFrame* encrypted_frame);
|
| + bool EncryptAudioFrame(const transport::EncodedAudioFrame& audio_frame,
|
| + transport::EncodedAudioFrame* encrypted_frame);
|
|
|
| void ScheduleNextRtcpReport();
|
| void SendRtcpReport();
|
|
|