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

Side by Side Diff: content/renderer/media/webmediasource_impl.cc

Issue 63253002: Rename WebKit namespace to blink (part 3) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 1 month 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 "content/renderer/media/webmediasource_impl.h" 5 #include "content/renderer/media/webmediasource_impl.h"
6 6
7 #include "base/guid.h" 7 #include "base/guid.h"
8 #include "content/renderer/media/websourcebuffer_impl.h" 8 #include "content/renderer/media/websourcebuffer_impl.h"
9 #include "media/filters/chunk_demuxer.h" 9 #include "media/filters/chunk_demuxer.h"
10 #include "third_party/WebKit/public/platform/WebCString.h" 10 #include "third_party/WebKit/public/platform/WebCString.h"
11 #include "third_party/WebKit/public/platform/WebString.h" 11 #include "third_party/WebKit/public/platform/WebString.h"
12 12
13 using ::WebKit::WebString; 13 using ::blink::WebString;
14 using ::WebKit::WebMediaSource; 14 using ::blink::WebMediaSource;
15 15
16 namespace content { 16 namespace content {
17 17
18 #define COMPILE_ASSERT_MATCHING_STATUS_ENUM(webkit_name, chromium_name) \ 18 #define COMPILE_ASSERT_MATCHING_STATUS_ENUM(webkit_name, chromium_name) \
19 COMPILE_ASSERT(static_cast<int>(WebMediaSource::webkit_name) == \ 19 COMPILE_ASSERT(static_cast<int>(WebMediaSource::webkit_name) == \
20 static_cast<int>(media::ChunkDemuxer::chromium_name), \ 20 static_cast<int>(media::ChunkDemuxer::chromium_name), \
21 mismatching_status_enums) 21 mismatching_status_enums)
22 COMPILE_ASSERT_MATCHING_STATUS_ENUM(AddStatusOk, kOk); 22 COMPILE_ASSERT_MATCHING_STATUS_ENUM(AddStatusOk, kOk);
23 COMPILE_ASSERT_MATCHING_STATUS_ENUM(AddStatusNotSupported, kNotSupported); 23 COMPILE_ASSERT_MATCHING_STATUS_ENUM(AddStatusNotSupported, kNotSupported);
24 COMPILE_ASSERT_MATCHING_STATUS_ENUM(AddStatusReachedIdLimit, kReachedIdLimit); 24 COMPILE_ASSERT_MATCHING_STATUS_ENUM(AddStatusReachedIdLimit, kReachedIdLimit);
25 #undef COMPILE_ASSERT_MATCHING_STATUS_ENUM 25 #undef COMPILE_ASSERT_MATCHING_STATUS_ENUM
26 26
27 WebMediaSourceImpl::WebMediaSourceImpl( 27 WebMediaSourceImpl::WebMediaSourceImpl(
28 media::ChunkDemuxer* demuxer, media::LogCB log_cb) 28 media::ChunkDemuxer* demuxer, media::LogCB log_cb)
29 : demuxer_(demuxer), 29 : demuxer_(demuxer),
30 log_cb_(log_cb) { 30 log_cb_(log_cb) {
31 DCHECK(demuxer_); 31 DCHECK(demuxer_);
32 } 32 }
33 33
34 WebMediaSourceImpl::~WebMediaSourceImpl() {} 34 WebMediaSourceImpl::~WebMediaSourceImpl() {}
35 35
36 WebMediaSource::AddStatus WebMediaSourceImpl::addSourceBuffer( 36 WebMediaSource::AddStatus WebMediaSourceImpl::addSourceBuffer(
37 const WebKit::WebString& type, 37 const blink::WebString& type,
38 const WebKit::WebVector<WebKit::WebString>& codecs, 38 const blink::WebVector<blink::WebString>& codecs,
39 WebKit::WebSourceBuffer** source_buffer) { 39 blink::WebSourceBuffer** source_buffer) {
40 std::string id = base::GenerateGUID(); 40 std::string id = base::GenerateGUID();
41 std::vector<std::string> new_codecs(codecs.size()); 41 std::vector<std::string> new_codecs(codecs.size());
42 for (size_t i = 0; i < codecs.size(); ++i) 42 for (size_t i = 0; i < codecs.size(); ++i)
43 new_codecs[i] = codecs[i].utf8().data(); 43 new_codecs[i] = codecs[i].utf8().data();
44 WebMediaSource::AddStatus result = 44 WebMediaSource::AddStatus result =
45 static_cast<WebMediaSource::AddStatus>( 45 static_cast<WebMediaSource::AddStatus>(
46 demuxer_->AddId(id, type.utf8().data(), new_codecs)); 46 demuxer_->AddId(id, type.utf8().data(), new_codecs));
47 47
48 if (result == WebMediaSource::AddStatusOk) 48 if (result == WebMediaSource::AddStatusOk)
49 *source_buffer = new WebSourceBufferImpl(id, demuxer_); 49 *source_buffer = new WebSourceBufferImpl(id, demuxer_);
(...skipping 28 matching lines...) Expand all
78 } 78 }
79 79
80 demuxer_->MarkEndOfStream(pipeline_status); 80 demuxer_->MarkEndOfStream(pipeline_status);
81 } 81 }
82 82
83 void WebMediaSourceImpl::unmarkEndOfStream() { 83 void WebMediaSourceImpl::unmarkEndOfStream() {
84 demuxer_->UnmarkEndOfStream(); 84 demuxer_->UnmarkEndOfStream();
85 } 85 }
86 86
87 } // namespace content 87 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/webmediasource_impl.h ('k') | content/renderer/media/webrtc_audio_capturer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698