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

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

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/webmediaplayer_util.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 "base/macros.h" 11 #include "base/macros.h"
12 #include "media/base/media_log.h"
13 #include "media/blink/media_blink_export.h" 12 #include "media/blink/media_blink_export.h"
14 #include "third_party/WebKit/public/platform/WebMediaSource.h" 13 #include "third_party/WebKit/public/platform/WebMediaSource.h"
15 14
16 namespace media { 15 namespace media {
17 class ChunkDemuxer; 16 class ChunkDemuxer;
18 17
19 class MEDIA_BLINK_EXPORT WebMediaSourceImpl 18 class MEDIA_BLINK_EXPORT WebMediaSourceImpl
20 : NON_EXPORTED_BASE(public blink::WebMediaSource) { 19 : NON_EXPORTED_BASE(public blink::WebMediaSource) {
21 public: 20 public:
22 WebMediaSourceImpl(ChunkDemuxer* demuxer, 21 WebMediaSourceImpl(ChunkDemuxer* demuxer);
23 const scoped_refptr<MediaLog>& media_log);
24 ~WebMediaSourceImpl() override; 22 ~WebMediaSourceImpl() override;
25 23
26 // blink::WebMediaSource implementation. 24 // blink::WebMediaSource implementation.
27 AddStatus AddSourceBuffer(const blink::WebString& type, 25 AddStatus AddSourceBuffer(const blink::WebString& type,
28 const blink::WebString& codecs, 26 const blink::WebString& codecs,
29 blink::WebSourceBuffer** source_buffer) override; 27 blink::WebSourceBuffer** source_buffer) override;
30 double Duration() override; 28 double Duration() override;
31 void SetDuration(double duration) override; 29 void SetDuration(double duration) override;
32 void MarkEndOfStream(EndOfStreamStatus status) override; 30 void MarkEndOfStream(EndOfStreamStatus status) override;
33 void UnmarkEndOfStream() override; 31 void UnmarkEndOfStream() override;
34 32
35 private: 33 private:
36 ChunkDemuxer* demuxer_; // Owned by WebMediaPlayerImpl. 34 ChunkDemuxer* demuxer_; // Owned by WebMediaPlayerImpl.
37 scoped_refptr<MediaLog> media_log_;
38 35
39 DISALLOW_COPY_AND_ASSIGN(WebMediaSourceImpl); 36 DISALLOW_COPY_AND_ASSIGN(WebMediaSourceImpl);
40 }; 37 };
41 38
42 } // namespace media 39 } // namespace media
43 40
44 #endif // MEDIA_BLINK_WEBMEDIASOURCE_IMPL_H_ 41 #endif // MEDIA_BLINK_WEBMEDIASOURCE_IMPL_H_
OLDNEW
« no previous file with comments | « media/blink/webmediaplayer_util.cc ('k') | media/blink/webmediasource_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698