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

Unified Diff: webkit/renderer/media/websourcebuffer_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/websourcebuffer_impl.cc
diff --git a/webkit/renderer/media/websourcebuffer_impl.cc b/webkit/renderer/media/websourcebuffer_impl.cc
deleted file mode 100644
index 64784dbb135232e558b86f11663dc33d262fe570..0000000000000000000000000000000000000000
--- a/webkit/renderer/media/websourcebuffer_impl.cc
+++ /dev/null
@@ -1,51 +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/websourcebuffer_impl.h"
-
-#include "media/filters/chunk_demuxer.h"
-
-namespace webkit_media {
-
-WebSourceBufferImpl::WebSourceBufferImpl(
- const std::string& id, media::ChunkDemuxer* demuxer)
- : id_(id),
- demuxer_(demuxer) {
- DCHECK(demuxer_);
-}
-
-WebSourceBufferImpl::~WebSourceBufferImpl() {
- DCHECK(!demuxer_) << "Object destroyed w/o removedFromMediaSource() call";
-}
-
-WebKit::WebTimeRanges WebSourceBufferImpl::buffered() {
- media::Ranges<base::TimeDelta> ranges = demuxer_->GetBufferedRanges(id_);
- WebKit::WebTimeRanges result(ranges.size());
- for (size_t i = 0; i < ranges.size(); i++) {
- result[i].start = ranges.start(i).InSecondsF();
- result[i].end = ranges.end(i).InSecondsF();
- }
- return result;
-}
-
-void WebSourceBufferImpl::append(const unsigned char* data, unsigned length) {
- demuxer_->AppendData(id_, data, length);
-}
-
-void WebSourceBufferImpl::abort() {
- demuxer_->Abort(id_);
-}
-
-bool WebSourceBufferImpl::setTimestampOffset(double offset) {
- base::TimeDelta time_offset = base::TimeDelta::FromMicroseconds(
- offset * base::Time::kMicrosecondsPerSecond);
- return demuxer_->SetTimestampOffset(id_, time_offset);
-}
-
-void WebSourceBufferImpl::removedFromMediaSource() {
- demuxer_->RemoveId(id_);
- demuxer_ = NULL;
-}
-
-} // namespace webkit_media
« content/shell/renderer/DEPS ('K') | « webkit/renderer/media/websourcebuffer_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698