| Index: media/cast/sender/video_encoder_impl.h
|
| diff --git a/media/cast/video_sender/video_encoder_impl.h b/media/cast/sender/video_encoder_impl.h
|
| similarity index 86%
|
| rename from media/cast/video_sender/video_encoder_impl.h
|
| rename to media/cast/sender/video_encoder_impl.h
|
| index 840b52ea7c69c77c94867a65dd11f269d7502caa..54a380265c20a1be14d55ff86db4c083b22460ff 100644
|
| --- a/media/cast/video_sender/video_encoder_impl.h
|
| +++ b/media/cast/sender/video_encoder_impl.h
|
| @@ -2,14 +2,14 @@
|
| // 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_IMPL_H_
|
| -#define MEDIA_CAST_VIDEO_SENDER_VIDEO_ENCODER_IMPL_H_
|
| +#ifndef MEDIA_CAST_SENDER_VIDEO_ENCODER_IMPL_H_
|
| +#define MEDIA_CAST_SENDER_VIDEO_ENCODER_IMPL_H_
|
|
|
| #include "base/memory/scoped_ptr.h"
|
| #include "media/cast/cast_config.h"
|
| #include "media/cast/cast_environment.h"
|
| -#include "media/cast/video_sender/software_video_encoder.h"
|
| -#include "media/cast/video_sender/video_encoder.h"
|
| +#include "media/cast/sender/software_video_encoder.h"
|
| +#include "media/cast/sender/video_encoder.h"
|
|
|
| namespace media {
|
| class VideoFrame;
|
| @@ -26,7 +26,7 @@ class VideoEncoderImpl : public VideoEncoder {
|
| int bit_rate;
|
| };
|
|
|
| - typedef base::Callback<void(scoped_ptr<transport::EncodedFrame>)>
|
| + typedef base::Callback<void(scoped_ptr<EncodedFrame>)>
|
| FrameEncodedCallback;
|
|
|
| VideoEncoderImpl(scoped_refptr<CastEnvironment> cast_environment,
|
| @@ -68,4 +68,4 @@ class VideoEncoderImpl : public VideoEncoder {
|
| } // namespace cast
|
| } // namespace media
|
|
|
| -#endif // MEDIA_CAST_VIDEO_SENDER_VIDEO_ENCODER_IMPL_H_
|
| +#endif // MEDIA_CAST_SENDER_VIDEO_ENCODER_IMPL_H_
|
|
|