Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(568)

Unified Diff: webkit/renderer/media/webmediasourceclient_impl.cc

Issue 18123002: Migrate webkit/renderer/media/ to content/renderer/media/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: delegates Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webkit/renderer/media/webmediasourceclient_impl.cc
diff --git a/webkit/renderer/media/webmediasourceclient_impl.cc b/webkit/renderer/media/webmediasourceclient_impl.cc
deleted file mode 100644
index 0e7ebab9539cb132215df57814e0af78e7770677..0000000000000000000000000000000000000000
--- a/webkit/renderer/media/webmediasourceclient_impl.cc
+++ /dev/null
@@ -1,83 +0,0 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "webkit/renderer/media/webmediasourceclient_impl.h"
-
-#include "base/guid.h"
-#include "media/filters/chunk_demuxer.h"
-#include "third_party/WebKit/public/platform/WebCString.h"
-#include "third_party/WebKit/public/platform/WebString.h"
-#include "webkit/renderer/media/websourcebuffer_impl.h"
-
-using ::WebKit::WebString;
-using ::WebKit::WebMediaSourceClient;
-
-namespace webkit_media {
-
-#define COMPILE_ASSERT_MATCHING_STATUS_ENUM(webkit_name, chromium_name) \
- COMPILE_ASSERT(static_cast<int>(WebMediaSourceClient::webkit_name) == \
- static_cast<int>(media::ChunkDemuxer::chromium_name), \
- mismatching_status_enums)
-COMPILE_ASSERT_MATCHING_STATUS_ENUM(AddStatusOk, kOk);
-COMPILE_ASSERT_MATCHING_STATUS_ENUM(AddStatusNotSupported, kNotSupported);
-COMPILE_ASSERT_MATCHING_STATUS_ENUM(AddStatusReachedIdLimit, kReachedIdLimit);
-#undef COMPILE_ASSERT_MATCHING_STATUS_ENUM
-
-WebMediaSourceClientImpl::WebMediaSourceClientImpl(
- media::ChunkDemuxer* demuxer, media::LogCB log_cb)
- : demuxer_(demuxer),
- log_cb_(log_cb) {
- DCHECK(demuxer_);
-}
-
-WebMediaSourceClientImpl::~WebMediaSourceClientImpl() {}
-
-WebMediaSourceClient::AddStatus WebMediaSourceClientImpl::addSourceBuffer(
- const WebKit::WebString& type,
- const WebKit::WebVector<WebKit::WebString>& codecs,
- WebKit::WebSourceBuffer** source_buffer) {
- std::string id = base::GenerateGUID();
- std::vector<std::string> new_codecs(codecs.size());
- for (size_t i = 0; i < codecs.size(); ++i)
- new_codecs[i] = codecs[i].utf8().data();
- WebMediaSourceClient::AddStatus result =
- static_cast<WebMediaSourceClient::AddStatus>(
- demuxer_->AddId(id, type.utf8().data(), new_codecs));
-
- if (result == WebMediaSourceClient::AddStatusOk)
- *source_buffer = new WebSourceBufferImpl(id, demuxer_);
-
- return result;
-}
-
-double WebMediaSourceClientImpl::duration() {
- return demuxer_->GetDuration();
-}
-
-void WebMediaSourceClientImpl::setDuration(double new_duration) {
- DCHECK_GE(new_duration, 0);
- demuxer_->SetDuration(new_duration);
-}
-
-void WebMediaSourceClientImpl::endOfStream(
- WebMediaSourceClient::EndOfStreamStatus status) {
- media::PipelineStatus pipeline_status = media::PIPELINE_OK;
-
- switch (status) {
- case WebMediaSourceClient::EndOfStreamStatusNoError:
- break;
- case WebMediaSourceClient::EndOfStreamStatusNetworkError:
- pipeline_status = media::PIPELINE_ERROR_NETWORK;
- break;
- case WebMediaSourceClient::EndOfStreamStatusDecodeError:
- pipeline_status = media::PIPELINE_ERROR_DECODE;
- break;
- default:
- NOTIMPLEMENTED();
- }
-
- demuxer_->EndOfStream(pipeline_status);
-}
-
-} // namespace webkit_media

Powered by Google App Engine
This is Rietveld 408576698