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

Unified Diff: content/renderer/media/webmediasource_impl.h

Issue 220113002: MSE: Pick frame processor in ChunkDemuxer::AddId; prepare unit tests to pick processor (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Ready for review Created 6 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | content/renderer/media/webmediasource_impl.cc » ('j') | media/filters/chunk_demuxer.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/media/webmediasource_impl.h
diff --git a/content/renderer/media/webmediasource_impl.h b/content/renderer/media/webmediasource_impl.h
index 42d5eef9405b5f92c846d8caad605eb82161d7d5..b3540b3fe3bee642062440b75dd3d3441cb85409 100644
--- a/content/renderer/media/webmediasource_impl.h
+++ b/content/renderer/media/webmediasource_impl.h
@@ -26,11 +26,20 @@ class WebMediaSourceImpl : public blink::WebMediaSource {
virtual AddStatus addSourceBuffer(
const blink::WebString& type,
const blink::WebVector<blink::WebString>& codecs,
- blink::WebSourceBuffer** source_buffer) OVERRIDE;
- virtual double duration() OVERRIDE;
- virtual void setDuration(double duration) OVERRIDE;
- virtual void markEndOfStream(EndOfStreamStatus status) OVERRIDE;
- virtual void unmarkEndOfStream() OVERRIDE;
+ const bool use_legacy_frame_processor,
+ blink::WebSourceBuffer** source_buffer);
+ virtual double duration();
+ virtual void setDuration(double duration);
+ virtual void markEndOfStream(EndOfStreamStatus status);
+ virtual void unmarkEndOfStream();
+
+ // TODO(wolenetz): Remove once Blink uses |use_legacy_frame_processor|
+ // interface, above, to select the frame processor. See
+ // http://crbug.com/249422.
+ virtual AddStatus addSourceBuffer(
+ const blink::WebString& type,
+ const blink::WebVector<blink::WebString>& codecs,
+ blink::WebSourceBuffer** source_buffer);
private:
media::ChunkDemuxer* demuxer_; // Owned by WebMediaPlayerImpl.
« no previous file with comments | « no previous file | content/renderer/media/webmediasource_impl.cc » ('j') | media/filters/chunk_demuxer.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698