| Index: media/blink/webmediasource_impl.cc
|
| diff --git a/content/renderer/media/webmediasource_impl.cc b/media/blink/webmediasource_impl.cc
|
| similarity index 83%
|
| rename from content/renderer/media/webmediasource_impl.cc
|
| rename to media/blink/webmediasource_impl.cc
|
| index b3078f7edcd5261de65bf4d5b91938478d028f1b..aecad6f307f491bc8fb07bddbc20df125c0f10ed 100644
|
| --- a/content/renderer/media/webmediasource_impl.cc
|
| +++ b/media/blink/webmediasource_impl.cc
|
| @@ -2,10 +2,10 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "content/renderer/media/webmediasource_impl.h"
|
| +#include "media/blink/webmediasource_impl.h"
|
|
|
| #include "base/guid.h"
|
| -#include "content/renderer/media/websourcebuffer_impl.h"
|
| +#include "media/blink/websourcebuffer_impl.h"
|
| #include "media/filters/chunk_demuxer.h"
|
| #include "third_party/WebKit/public/platform/WebCString.h"
|
| #include "third_party/WebKit/public/platform/WebString.h"
|
| @@ -13,11 +13,11 @@
|
| using ::blink::WebString;
|
| using ::blink::WebMediaSource;
|
|
|
| -namespace content {
|
| +namespace media {
|
|
|
| #define COMPILE_ASSERT_MATCHING_STATUS_ENUM(webkit_name, chromium_name) \
|
| COMPILE_ASSERT(static_cast<int>(WebMediaSource::webkit_name) == \
|
| - static_cast<int>(media::ChunkDemuxer::chromium_name), \
|
| + static_cast<int>(ChunkDemuxer::chromium_name), \
|
| mismatching_status_enums)
|
| COMPILE_ASSERT_MATCHING_STATUS_ENUM(AddStatusOk, kOk);
|
| COMPILE_ASSERT_MATCHING_STATUS_ENUM(AddStatusNotSupported, kNotSupported);
|
| @@ -25,7 +25,7 @@ COMPILE_ASSERT_MATCHING_STATUS_ENUM(AddStatusReachedIdLimit, kReachedIdLimit);
|
| #undef COMPILE_ASSERT_MATCHING_STATUS_ENUM
|
|
|
| WebMediaSourceImpl::WebMediaSourceImpl(
|
| - media::ChunkDemuxer* demuxer, media::LogCB log_cb)
|
| + ChunkDemuxer* demuxer, LogCB log_cb)
|
| : demuxer_(demuxer),
|
| log_cb_(log_cb) {
|
| DCHECK(demuxer_);
|
| @@ -63,16 +63,16 @@ void WebMediaSourceImpl::setDuration(double new_duration) {
|
|
|
| void WebMediaSourceImpl::markEndOfStream(
|
| WebMediaSource::EndOfStreamStatus status) {
|
| - media::PipelineStatus pipeline_status = media::PIPELINE_OK;
|
| + PipelineStatus pipeline_status = PIPELINE_OK;
|
|
|
| switch (status) {
|
| case WebMediaSource::EndOfStreamStatusNoError:
|
| break;
|
| case WebMediaSource::EndOfStreamStatusNetworkError:
|
| - pipeline_status = media::PIPELINE_ERROR_NETWORK;
|
| + pipeline_status = PIPELINE_ERROR_NETWORK;
|
| break;
|
| case WebMediaSource::EndOfStreamStatusDecodeError:
|
| - pipeline_status = media::PIPELINE_ERROR_DECODE;
|
| + pipeline_status = PIPELINE_ERROR_DECODE;
|
| break;
|
| }
|
|
|
| @@ -83,4 +83,4 @@ void WebMediaSourceImpl::unmarkEndOfStream() {
|
| demuxer_->UnmarkEndOfStream();
|
| }
|
|
|
| -} // namespace content
|
| +} // namespace media
|
|
|