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

Side by Side Diff: media/blink/webmediasource_impl.cc

Issue 2815303006: Convert MediaLog from being ref counted to owned by WebMediaPlayer. (Closed)
Patch Set: Rebase. Created 3 years, 8 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
« no previous file with comments | « media/blink/webmediasource_impl.h ('k') | media/cast/sender/h264_vt_encoder_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "media/blink/webmediasource_impl.h" 5 #include "media/blink/webmediasource_impl.h"
6 6
7 #include "base/guid.h" 7 #include "base/guid.h"
8 #include "media/base/mime_util.h" 8 #include "media/base/mime_util.h"
9 #include "media/blink/websourcebuffer_impl.h" 9 #include "media/blink/websourcebuffer_impl.h"
10 #include "media/filters/chunk_demuxer.h" 10 #include "media/filters/chunk_demuxer.h"
11 #include "third_party/WebKit/public/platform/WebString.h" 11 #include "third_party/WebKit/public/platform/WebString.h"
12 12
13 using ::blink::WebString; 13 using ::blink::WebString;
14 using ::blink::WebMediaSource; 14 using ::blink::WebMediaSource;
15 15
16 namespace media { 16 namespace media {
17 17
18 #define STATIC_ASSERT_MATCHING_STATUS_ENUM(webkit_name, chromium_name) \ 18 #define STATIC_ASSERT_MATCHING_STATUS_ENUM(webkit_name, chromium_name) \
19 static_assert(static_cast<int>(WebMediaSource::webkit_name) == \ 19 static_assert(static_cast<int>(WebMediaSource::webkit_name) == \
20 static_cast<int>(ChunkDemuxer::chromium_name), \ 20 static_cast<int>(ChunkDemuxer::chromium_name), \
21 "mismatching status enum values: " #webkit_name) 21 "mismatching status enum values: " #webkit_name)
22 STATIC_ASSERT_MATCHING_STATUS_ENUM(kAddStatusOk, kOk); 22 STATIC_ASSERT_MATCHING_STATUS_ENUM(kAddStatusOk, kOk);
23 STATIC_ASSERT_MATCHING_STATUS_ENUM(kAddStatusNotSupported, kNotSupported); 23 STATIC_ASSERT_MATCHING_STATUS_ENUM(kAddStatusNotSupported, kNotSupported);
24 STATIC_ASSERT_MATCHING_STATUS_ENUM(kAddStatusReachedIdLimit, kReachedIdLimit); 24 STATIC_ASSERT_MATCHING_STATUS_ENUM(kAddStatusReachedIdLimit, kReachedIdLimit);
25 #undef STATIC_ASSERT_MATCHING_STATUS_ENUM 25 #undef STATIC_ASSERT_MATCHING_STATUS_ENUM
26 26
27 WebMediaSourceImpl::WebMediaSourceImpl(ChunkDemuxer* demuxer, 27 WebMediaSourceImpl::WebMediaSourceImpl(ChunkDemuxer* demuxer)
28 const scoped_refptr<MediaLog>& media_log) 28 : demuxer_(demuxer) {
29 : demuxer_(demuxer), media_log_(media_log) {
30 DCHECK(demuxer_); 29 DCHECK(demuxer_);
31 } 30 }
32 31
33 WebMediaSourceImpl::~WebMediaSourceImpl() {} 32 WebMediaSourceImpl::~WebMediaSourceImpl() {}
34 33
35 WebMediaSource::AddStatus WebMediaSourceImpl::AddSourceBuffer( 34 WebMediaSource::AddStatus WebMediaSourceImpl::AddSourceBuffer(
36 const blink::WebString& type, 35 const blink::WebString& type,
37 const blink::WebString& codecs, 36 const blink::WebString& codecs,
38 blink::WebSourceBuffer** source_buffer) { 37 blink::WebSourceBuffer** source_buffer) {
39 std::string id = base::GenerateGUID(); 38 std::string id = base::GenerateGUID();
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 } 71 }
73 72
74 demuxer_->MarkEndOfStream(pipeline_status); 73 demuxer_->MarkEndOfStream(pipeline_status);
75 } 74 }
76 75
77 void WebMediaSourceImpl::UnmarkEndOfStream() { 76 void WebMediaSourceImpl::UnmarkEndOfStream() {
78 demuxer_->UnmarkEndOfStream(); 77 demuxer_->UnmarkEndOfStream();
79 } 78 }
80 79
81 } // namespace media 80 } // namespace media
OLDNEW
« no previous file with comments | « media/blink/webmediasource_impl.h ('k') | media/cast/sender/h264_vt_encoder_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698