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

Side by Side Diff: content/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: Created 7 years, 5 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "webkit/renderer/media/websourcebuffer_impl.h" 5 #include "content/renderer/media/websourcebuffer_impl.h"
6 6
7 #include "media/filters/chunk_demuxer.h" 7 #include "media/filters/chunk_demuxer.h"
8 8
9 namespace webkit_media { 9 namespace content {
10 10
11 WebSourceBufferImpl::WebSourceBufferImpl( 11 WebSourceBufferImpl::WebSourceBufferImpl(
12 const std::string& id, media::ChunkDemuxer* demuxer) 12 const std::string& id, media::ChunkDemuxer* demuxer)
13 : id_(id), 13 : id_(id),
14 demuxer_(demuxer) { 14 demuxer_(demuxer) {
15 DCHECK(demuxer_); 15 DCHECK(demuxer_);
16 } 16 }
17 17
18 WebSourceBufferImpl::~WebSourceBufferImpl() { 18 WebSourceBufferImpl::~WebSourceBufferImpl() {
19 DCHECK(!demuxer_) << "Object destroyed w/o removedFromMediaSource() call"; 19 DCHECK(!demuxer_) << "Object destroyed w/o removedFromMediaSource() call";
(...skipping 21 matching lines...) Expand all
41 base::TimeDelta time_offset = base::TimeDelta::FromMicroseconds( 41 base::TimeDelta time_offset = base::TimeDelta::FromMicroseconds(
42 offset * base::Time::kMicrosecondsPerSecond); 42 offset * base::Time::kMicrosecondsPerSecond);
43 return demuxer_->SetTimestampOffset(id_, time_offset); 43 return demuxer_->SetTimestampOffset(id_, time_offset);
44 } 44 }
45 45
46 void WebSourceBufferImpl::removedFromMediaSource() { 46 void WebSourceBufferImpl::removedFromMediaSource() {
47 demuxer_->RemoveId(id_); 47 demuxer_->RemoveId(id_);
48 demuxer_ = NULL; 48 demuxer_ = NULL;
49 } 49 }
50 50
51 } // namespace webkit_media 51 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698