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

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

Issue 1235793005: Deprecate LogCB in favor of using MediaLog (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments and attempt to fix Android compilation Created 5 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
« no previous file with comments | « media/blink/webmediaplayer_impl.cc ('k') | media/blink/webmediasource_impl.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 #ifndef MEDIA_BLINK_WEBMEDIASOURCE_IMPL_H_ 5 #ifndef MEDIA_BLINK_WEBMEDIASOURCE_IMPL_H_
6 #define MEDIA_BLINK_WEBMEDIASOURCE_IMPL_H_ 6 #define MEDIA_BLINK_WEBMEDIASOURCE_IMPL_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
11 #include "media/base/media_export.h" 11 #include "media/base/media_export.h"
12 #include "media/base/media_log.h" 12 #include "media/base/media_log.h"
13 #include "third_party/WebKit/public/platform/WebMediaSource.h" 13 #include "third_party/WebKit/public/platform/WebMediaSource.h"
14 14
15 namespace media { 15 namespace media {
16 class ChunkDemuxer; 16 class ChunkDemuxer;
17 17
18 class MEDIA_EXPORT WebMediaSourceImpl 18 class MEDIA_EXPORT WebMediaSourceImpl
19 : NON_EXPORTED_BASE(public blink::WebMediaSource) { 19 : NON_EXPORTED_BASE(public blink::WebMediaSource) {
20 public: 20 public:
21 WebMediaSourceImpl(ChunkDemuxer* demuxer, LogCB log_cb); 21 WebMediaSourceImpl(ChunkDemuxer* demuxer,
22 const scoped_refptr<MediaLog>& media_log);
22 virtual ~WebMediaSourceImpl(); 23 virtual ~WebMediaSourceImpl();
23 24
24 // blink::WebMediaSource implementation. 25 // blink::WebMediaSource implementation.
25 virtual AddStatus addSourceBuffer( 26 virtual AddStatus addSourceBuffer(
26 const blink::WebString& type, 27 const blink::WebString& type,
27 const blink::WebVector<blink::WebString>& codecs, 28 const blink::WebVector<blink::WebString>& codecs,
28 blink::WebSourceBuffer** source_buffer); 29 blink::WebSourceBuffer** source_buffer);
29 virtual double duration(); 30 virtual double duration();
30 virtual void setDuration(double duration); 31 virtual void setDuration(double duration);
31 virtual void markEndOfStream(EndOfStreamStatus status); 32 virtual void markEndOfStream(EndOfStreamStatus status);
32 virtual void unmarkEndOfStream(); 33 virtual void unmarkEndOfStream();
33 34
34 private: 35 private:
35 ChunkDemuxer* demuxer_; // Owned by WebMediaPlayerImpl. 36 ChunkDemuxer* demuxer_; // Owned by WebMediaPlayerImpl.
36 LogCB log_cb_; 37 scoped_refptr<MediaLog> media_log_;
37 38
38 DISALLOW_COPY_AND_ASSIGN(WebMediaSourceImpl); 39 DISALLOW_COPY_AND_ASSIGN(WebMediaSourceImpl);
39 }; 40 };
40 41
41 } // namespace media 42 } // namespace media
42 43
43 #endif // MEDIA_BLINK_WEBMEDIASOURCE_IMPL_H_ 44 #endif // MEDIA_BLINK_WEBMEDIASOURCE_IMPL_H_
OLDNEW
« no previous file with comments | « media/blink/webmediaplayer_impl.cc ('k') | media/blink/webmediasource_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698