| Index: media/cast/sender/external_video_encoder.cc
|
| diff --git a/media/cast/video_sender/external_video_encoder.cc b/media/cast/sender/external_video_encoder.cc
|
| similarity index 97%
|
| rename from media/cast/video_sender/external_video_encoder.cc
|
| rename to media/cast/sender/external_video_encoder.cc
|
| index 96ee51956fb597fe76e9e99ff5f010465db76ada..e3abecd4074cb183290a92b3b4b77b06c03b8f05 100644
|
| --- a/media/cast/video_sender/external_video_encoder.cc
|
| +++ b/media/cast/sender/external_video_encoder.cc
|
| @@ -2,7 +2,7 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "media/cast/video_sender/external_video_encoder.h"
|
| +#include "media/cast/sender/external_video_encoder.h"
|
|
|
| #include "base/bind.h"
|
| #include "base/logging.h"
|
| @@ -13,7 +13,7 @@
|
| #include "media/base/video_util.h"
|
| #include "media/cast/cast_defines.h"
|
| #include "media/cast/logging/logging_defines.h"
|
| -#include "media/cast/transport/cast_transport_config.h"
|
| +#include "media/cast/net/cast_transport_config.h"
|
| #include "media/video/video_encode_accelerator.h"
|
|
|
| namespace media {
|
| @@ -99,13 +99,13 @@ class LocalVideoEncodeAcceleratorClient
|
|
|
| VideoCodecProfile output_profile = media::VIDEO_CODEC_PROFILE_UNKNOWN;
|
| switch (video_config.codec) {
|
| - case transport::CODEC_VIDEO_VP8:
|
| + case CODEC_VIDEO_VP8:
|
| output_profile = media::VP8PROFILE_MAIN;
|
| break;
|
| - case transport::CODEC_VIDEO_H264:
|
| + case CODEC_VIDEO_H264:
|
| output_profile = media::H264PROFILE_MAIN;
|
| break;
|
| - case transport::CODEC_VIDEO_FAKE:
|
| + case CODEC_VIDEO_FAKE:
|
| NOTREACHED() << "Fake software video encoder cannot be external";
|
| break;
|
| default:
|
| @@ -220,10 +220,10 @@ class LocalVideoEncodeAcceleratorClient
|
| stream_header_.append(static_cast<const char*>(output_buffer->memory()),
|
| payload_size);
|
| } else if (!encoded_frame_data_storage_.empty()) {
|
| - scoped_ptr<transport::EncodedFrame> encoded_frame(
|
| - new transport::EncodedFrame());
|
| - encoded_frame->dependency = key_frame ? transport::EncodedFrame::KEY :
|
| - transport::EncodedFrame::DEPENDENT;
|
| + scoped_ptr<EncodedFrame> encoded_frame(
|
| + new EncodedFrame());
|
| + encoded_frame->dependency = key_frame ? EncodedFrame::KEY :
|
| + EncodedFrame::DEPENDENT;
|
| encoded_frame->frame_id = ++last_encoded_frame_id_;
|
| if (key_frame)
|
| encoded_frame->referenced_frame_id = encoded_frame->frame_id;
|
|
|