| Index: media/cast/video_sender/video_encoder_impl.h
|
| diff --git a/media/cast/video_sender/video_encoder.h b/media/cast/video_sender/video_encoder_impl.h
|
| similarity index 74%
|
| copy from media/cast/video_sender/video_encoder.h
|
| copy to media/cast/video_sender/video_encoder_impl.h
|
| index 559dff16734fd4c9e72f1c2b8aa1a52d0e90ce73..9eff4726386d93098ff0addd133df133a814e451 100644
|
| --- a/media/cast/video_sender/video_encoder.h
|
| +++ b/media/cast/video_sender/video_encoder_impl.h
|
| @@ -2,15 +2,15 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef MEDIA_CAST_VIDEO_SENDER_VIDEO_ENCODER_H_
|
| -#define MEDIA_CAST_VIDEO_SENDER_VIDEO_ENCODER_H_
|
| +#ifndef MEDIA_CAST_VIDEO_SENDER_VIDEO_ENCODER_IMPL_H_
|
| +#define MEDIA_CAST_VIDEO_SENDER_VIDEO_ENCODER_IMPL_H_
|
|
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/memory/weak_ptr.h"
|
| -#include "base/message_loop/message_loop.h"
|
| #include "media/cast/cast_config.h"
|
| #include "media/cast/cast_environment.h"
|
| #include "media/cast/video_sender/codecs/vp8/vp8_encoder.h"
|
| +#include "media/cast/video_sender/video_encoder.h"
|
|
|
| namespace media {
|
| class VideoFrame;
|
| @@ -21,16 +21,16 @@ namespace cast {
|
|
|
| // This object is called external from the main cast thread and internally from
|
| // the video encoder thread.
|
| -class VideoEncoder : public VideoEncoderController {
|
| +class VideoEncoderImpl : public VideoEncoder {
|
| public:
|
| typedef base::Callback<void(scoped_ptr<EncodedVideoFrame>,
|
| const base::TimeTicks&)> FrameEncodedCallback;
|
|
|
| - VideoEncoder(scoped_refptr<CastEnvironment> cast_environment,
|
| - const VideoSenderConfig& video_config,
|
| - uint8 max_unacked_frames);
|
| + VideoEncoderImpl(scoped_refptr<CastEnvironment> cast_environment,
|
| + const VideoSenderConfig& video_config,
|
| + uint8 max_unacked_frames);
|
|
|
| - virtual ~VideoEncoder();
|
| + virtual ~VideoEncoderImpl();
|
|
|
| // Called from the main cast thread. This function post the encode task to the
|
| // video encoder thread;
|
| @@ -39,9 +39,17 @@ class VideoEncoder : public VideoEncoderController {
|
| // the encoder is done with the frame; it does not mean that the encoded frame
|
| // has been sent out.
|
| // Once the encoded frame is ready the frame_encoded_callback is called.
|
| - bool EncodeVideoFrame(const scoped_refptr<media::VideoFrame>& video_frame,
|
| - const base::TimeTicks& capture_time,
|
| - const FrameEncodedCallback& frame_encoded_callback);
|
| + virtual bool EncodeVideoFrame(
|
| + const scoped_refptr<media::VideoFrame>& video_frame,
|
| + const base::TimeTicks& capture_time,
|
| + const FrameEncodedCallback& frame_encoded_callback) OVERRIDE;
|
| +
|
| + // The following functions are called from the main cast thread.
|
| + virtual void SetBitRate(int new_bit_rate) OVERRIDE;
|
| + virtual void SkipNextFrame(bool skip_next_frame) OVERRIDE;
|
| + virtual void GenerateKeyFrame() OVERRIDE;
|
| + virtual void LatestFrameIdToReference(uint32 frame_id) OVERRIDE;
|
| + virtual int NumberOfSkippedFrames() const OVERRIDE;
|
|
|
| protected:
|
| struct CodecDynamicConfig {
|
| @@ -57,16 +65,7 @@ class VideoEncoder : public VideoEncoderController {
|
| const CodecDynamicConfig& dynamic_config,
|
| const FrameEncodedCallback& frame_encoded_callback);
|
|
|
| - // The following functions are called from the main cast thread.
|
| - virtual void SetBitRate(int new_bit_rate) OVERRIDE;
|
| - virtual void SkipNextFrame(bool skip_next_frame) OVERRIDE;
|
| - virtual void GenerateKeyFrame() OVERRIDE;
|
| - virtual void LatestFrameIdToReference(uint32 frame_id) OVERRIDE;
|
| - virtual int NumberOfSkippedFrames() const OVERRIDE;
|
| -
|
| private:
|
| - friend class base::RefCountedThreadSafe<VideoEncoder>;
|
| -
|
| const VideoSenderConfig video_config_;
|
| scoped_refptr<CastEnvironment> cast_environment_;
|
| scoped_ptr<Vp8Encoder> vp8_encoder_;
|
| @@ -74,10 +73,10 @@ class VideoEncoder : public VideoEncoderController {
|
| bool skip_next_frame_;
|
| int skip_count_;
|
|
|
| - DISALLOW_COPY_AND_ASSIGN(VideoEncoder);
|
| + DISALLOW_COPY_AND_ASSIGN(VideoEncoderImpl);
|
| };
|
|
|
| } // namespace cast
|
| } // namespace media
|
|
|
| -#endif // MEDIA_CAST_VIDEO_SENDER_VIDEO_ENCODER_H_
|
| +#endif // MEDIA_CAST_VIDEO_SENDER_VIDEO_ENCODER_IMPL_H_
|
|
|