| Index: media/cast/video_sender/video_sender.h
|
| diff --git a/media/cast/video_sender/video_sender.h b/media/cast/video_sender/video_sender.h
|
| index 07f02fb4a0b7de64bc877782c9861e0dd0f3543f..20f91821c64e02f8df6dc551cbed028676f148ed 100644
|
| --- a/media/cast/video_sender/video_sender.h
|
| +++ b/media/cast/video_sender/video_sender.h
|
| @@ -17,6 +17,8 @@
|
| #include "media/cast/congestion_control/congestion_control.h"
|
| #include "media/cast/rtcp/rtcp.h"
|
| #include "media/cast/rtp_sender/rtp_sender.h"
|
| +#include "media/filters/gpu_video_accelerator_factories.h"
|
| +#include "media/video/video_encode_accelerator.h"
|
|
|
| namespace crypto {
|
| class Encryptor;
|
| @@ -44,10 +46,11 @@ class PacedPacketSender;
|
| class VideoSender : public base::NonThreadSafe,
|
| public base::SupportsWeakPtr<VideoSender> {
|
| public:
|
| - VideoSender(scoped_refptr<CastEnvironment> cast_environment,
|
| - const VideoSenderConfig& video_config,
|
| - VideoEncoderController* const video_encoder_controller,
|
| - PacedPacketSender* const paced_packet_sender);
|
| + VideoSender(
|
| + scoped_refptr<CastEnvironment> cast_environment,
|
| + const VideoSenderConfig& video_config,
|
| + const scoped_refptr<GpuVideoAcceleratorFactories>& gpu_factories,
|
| + PacedPacketSender* const paced_packet_sender);
|
|
|
| virtual ~VideoSender();
|
|
|
| @@ -59,14 +62,6 @@ class VideoSender : public base::NonThreadSafe,
|
| const scoped_refptr<media::VideoFrame>& video_frame,
|
| const base::TimeTicks& capture_time);
|
|
|
| - // The video_frame must be valid until the closure callback is called.
|
| - // The closure callback is called from the main 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 InsertCodedVideoFrame(const EncodedVideoFrame* video_frame,
|
| - const base::TimeTicks& capture_time,
|
| - const base::Closure callback);
|
| -
|
| // Only called from the main cast thread.
|
| void IncomingRtcpPacket(const uint8* packet, size_t length,
|
| const base::Closure callback);
|
| @@ -123,7 +118,6 @@ class VideoSender : public base::NonThreadSafe,
|
| scoped_ptr<VideoEncoder> video_encoder_;
|
| scoped_ptr<Rtcp> rtcp_;
|
| scoped_ptr<RtpSender> rtp_sender_;
|
| - VideoEncoderController* video_encoder_controller_;
|
| uint8 max_unacked_frames_;
|
| scoped_ptr<crypto::Encryptor> encryptor_;
|
| std::string iv_mask_;
|
|
|