| Index: media/cast/sender/vp8_encoder.h
|
| diff --git a/media/cast/video_sender/codecs/vp8/vp8_encoder.h b/media/cast/sender/vp8_encoder.h
|
| similarity index 90%
|
| rename from media/cast/video_sender/codecs/vp8/vp8_encoder.h
|
| rename to media/cast/sender/vp8_encoder.h
|
| index 2421cf15114819d5083e8447958644d6f85cc73c..357e263a107d562a53f8c6e3a9fd62a578a5dfef 100644
|
| --- a/media/cast/video_sender/codecs/vp8/vp8_encoder.h
|
| +++ b/media/cast/sender/vp8_encoder.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_CODECS_VP8_VP8_ENCODER_H_
|
| -#define MEDIA_CAST_VIDEO_SENDER_CODECS_VP8_VP8_ENCODER_H_
|
| +#ifndef MEDIA_CAST_SENDER_CODECS_VP8_VP8_ENCODER_H_
|
| +#define MEDIA_CAST_SENDER_CODECS_VP8_VP8_ENCODER_H_
|
|
|
| #include "base/basictypes.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/threading/thread_checker.h"
|
| #include "base/time/time.h"
|
| #include "media/cast/cast_config.h"
|
| -#include "media/cast/video_sender/software_video_encoder.h"
|
| +#include "media/cast/sender/software_video_encoder.h"
|
| #include "third_party/libvpx/source/libvpx/vpx/vpx_encoder.h"
|
|
|
| namespace media {
|
| @@ -37,7 +37,7 @@ class Vp8Encoder : public SoftwareVideoEncoder {
|
|
|
| // Encode a raw image (as a part of a video stream).
|
| virtual bool Encode(const scoped_refptr<media::VideoFrame>& video_frame,
|
| - transport::EncodedFrame* encoded_image) OVERRIDE;
|
| + EncodedFrame* encoded_image) OVERRIDE;
|
|
|
| // Update the encoder with a new target bit rate.
|
| virtual void UpdateRates(uint32 new_bitrate) OVERRIDE;
|
| @@ -100,4 +100,4 @@ class Vp8Encoder : public SoftwareVideoEncoder {
|
| } // namespace cast
|
| } // namespace media
|
|
|
| -#endif // MEDIA_CAST_VIDEO_SENDER_CODECS_VP8_VP8_ENCODER_H_
|
| +#endif // MEDIA_CAST_SENDER_CODECS_VP8_VP8_ENCODER_H_
|
|
|