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

Side by Side Diff: content/renderer/media/webmediasourceclient_impl.h

Issue 19649007: Update the WebMediaSourceClientImpl & ChunkDemuxer to received explicit end of stream cancellation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix build buster caused by rebase. Created 7 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 | 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 #ifndef CONTENT_RENDERER_MEDIA_WEBMEDIASOURCECLIENT_IMPL_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_WEBMEDIASOURCECLIENT_IMPL_H_
6 #define CONTENT_RENDERER_MEDIA_WEBMEDIASOURCECLIENT_IMPL_H_ 6 #define CONTENT_RENDERER_MEDIA_WEBMEDIASOURCECLIENT_IMPL_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 11 matching lines...) Expand all
22 WebMediaSourceClientImpl(media::ChunkDemuxer* demuxer, media::LogCB log_cb); 22 WebMediaSourceClientImpl(media::ChunkDemuxer* demuxer, media::LogCB log_cb);
23 virtual ~WebMediaSourceClientImpl(); 23 virtual ~WebMediaSourceClientImpl();
24 24
25 // WebKit::WebMediaSourceClient implementation. 25 // WebKit::WebMediaSourceClient implementation.
26 virtual AddStatus addSourceBuffer( 26 virtual AddStatus addSourceBuffer(
27 const WebKit::WebString& type, 27 const WebKit::WebString& type,
28 const WebKit::WebVector<WebKit::WebString>& codecs, 28 const WebKit::WebVector<WebKit::WebString>& codecs,
29 WebKit::WebSourceBuffer** source_buffer) OVERRIDE; 29 WebKit::WebSourceBuffer** source_buffer) OVERRIDE;
30 virtual double duration() OVERRIDE; 30 virtual double duration() OVERRIDE;
31 virtual void setDuration(double duration) OVERRIDE; 31 virtual void setDuration(double duration) OVERRIDE;
32 virtual void endOfStream(EndOfStreamStatus status) OVERRIDE; 32 // TODO(acolwell): Remove this once endOfStream() is removed from Blink.
33 virtual void endOfStream(EndOfStreamStatus status) {
34 markEndOfStream(status);
35 }
36 virtual void markEndOfStream(EndOfStreamStatus status) OVERRIDE;
37 virtual void unmarkEndOfStream() OVERRIDE;
33 38
34 private: 39 private:
35 media::ChunkDemuxer* demuxer_; // Owned by WebMediaPlayerImpl. 40 media::ChunkDemuxer* demuxer_; // Owned by WebMediaPlayerImpl.
36 media::LogCB log_cb_; 41 media::LogCB log_cb_;
37 42
38 DISALLOW_COPY_AND_ASSIGN(WebMediaSourceClientImpl); 43 DISALLOW_COPY_AND_ASSIGN(WebMediaSourceClientImpl);
39 }; 44 };
40 45
41 } // namespace content 46 } // namespace content
42 47
43 #endif // CONTENT_RENDERER_MEDIA_WEBMEDIASOURCECLIENT_IMPL_H_ 48 #endif // CONTENT_RENDERER_MEDIA_WEBMEDIASOURCECLIENT_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698