Index: media/blink/websourcebuffer_impl.cc |
diff --git a/content/renderer/media/websourcebuffer_impl.cc b/media/blink/websourcebuffer_impl.cc |
similarity index 92% |
rename from content/renderer/media/websourcebuffer_impl.cc |
rename to media/blink/websourcebuffer_impl.cc |
index 1b8e4fa143561c66d727cc304bb8bbe1d984bd68..c87c2b986308e774be00067b27ffa06217c975f8 100644 |
--- a/content/renderer/media/websourcebuffer_impl.cc |
+++ b/media/blink/websourcebuffer_impl.cc |
@@ -2,21 +2,21 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "content/renderer/media/websourcebuffer_impl.h" |
+#include "media/blink/websourcebuffer_impl.h" |
#include <limits> |
#include "base/float_util.h" |
#include "media/filters/chunk_demuxer.h" |
-namespace content { |
+namespace media { |
static base::TimeDelta DoubleToTimeDelta(double time) { |
DCHECK(!base::IsNaN(time)); |
DCHECK_NE(time, -std::numeric_limits<double>::infinity()); |
if (time == std::numeric_limits<double>::infinity()) |
- return media::kInfiniteDuration(); |
+ return kInfiniteDuration(); |
// Don't use base::TimeDelta::Max() here, as we want the largest finite time |
// delta. |
@@ -31,10 +31,10 @@ static base::TimeDelta DoubleToTimeDelta(double time) { |
} |
WebSourceBufferImpl::WebSourceBufferImpl( |
- const std::string& id, media::ChunkDemuxer* demuxer) |
+ const std::string& id, ChunkDemuxer* demuxer) |
: id_(id), |
demuxer_(demuxer), |
- append_window_end_(media::kInfiniteDuration()) { |
+ append_window_end_(kInfiniteDuration()) { |
DCHECK(demuxer_); |
} |
@@ -60,7 +60,7 @@ bool WebSourceBufferImpl::setMode(WebSourceBuffer::AppendMode mode) { |
} |
blink::WebTimeRanges WebSourceBufferImpl::buffered() { |
- media::Ranges<base::TimeDelta> ranges = demuxer_->GetBufferedRanges(id_); |
+ Ranges<base::TimeDelta> ranges = demuxer_->GetBufferedRanges(id_); |
blink::WebTimeRanges result(ranges.size()); |
for (size_t i = 0; i < ranges.size(); i++) { |
result[i].start = ranges.start(i).InSecondsF(); |
@@ -131,4 +131,4 @@ void WebSourceBufferImpl::removedFromMediaSource() { |
demuxer_ = NULL; |
} |
-} // namespace content |
+} // namespace media |