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

Side by Side Diff: Source/WebCore/platform/graphics/MediaPlayer.h

Issue 13674022: Remove MEDIA_SOURCE feature define. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@blink-master
Patch Set: Rebase Created 7 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved. 2 * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 class AVCFPlayer; 58 class AVCFPlayer;
59 class QTMovieGWorld; 59 class QTMovieGWorld;
60 class QTMovieVisualContext; 60 class QTMovieVisualContext;
61 61
62 namespace WebCore { 62 namespace WebCore {
63 63
64 class AudioSourceProvider; 64 class AudioSourceProvider;
65 class Document; 65 class Document;
66 class GStreamerGWorld; 66 class GStreamerGWorld;
67 class MediaPlayerPrivateInterface; 67 class MediaPlayerPrivateInterface;
68 #if ENABLE(MEDIA_SOURCE)
69 class MediaSource; 68 class MediaSource;
70 #endif
71 class TextTrackRepresentation; 69 class TextTrackRepresentation;
72 70
73 // Structure that will hold every native 71 // Structure that will hold every native
74 // types supported by the current media player. 72 // types supported by the current media player.
75 // We have to do that has multiple media players 73 // We have to do that has multiple media players
76 // backend can live at runtime. 74 // backend can live at runtime.
77 struct PlatformMedia { 75 struct PlatformMedia {
78 enum { 76 enum {
79 None, 77 None,
80 QTMovieType, 78 QTMovieType,
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after
266 bool hasAudio() const; 264 bool hasAudio() const;
267 265
268 void setFrameView(FrameView* frameView) { m_frameView = frameView; } 266 void setFrameView(FrameView* frameView) { m_frameView = frameView; }
269 FrameView* frameView() { return m_frameView; } 267 FrameView* frameView() { return m_frameView; }
270 bool inMediaDocument(); 268 bool inMediaDocument();
271 269
272 IntSize size() const { return m_size; } 270 IntSize size() const { return m_size; }
273 void setSize(const IntSize& size); 271 void setSize(const IntSize& size);
274 272
275 bool load(const KURL&, const ContentType&, const String& keySystem); 273 bool load(const KURL&, const ContentType&, const String& keySystem);
276 #if ENABLE(MEDIA_SOURCE)
277 bool load(const KURL&, PassRefPtr<MediaSource>); 274 bool load(const KURL&, PassRefPtr<MediaSource>);
278 #endif
279 void cancelLoad(); 275 void cancelLoad();
280 276
281 bool visible() const; 277 bool visible() const;
282 void setVisible(bool); 278 void setVisible(bool);
283 279
284 void prepareToPlay(); 280 void prepareToPlay();
285 void play(); 281 void play();
286 void pause(); 282 void pause();
287 283
288 #if ENABLE(ENCRYPTED_MEDIA) 284 #if ENABLE(ENCRYPTED_MEDIA)
(...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after
489 float m_volume; 485 float m_volume;
490 bool m_muted; 486 bool m_muted;
491 bool m_preservesPitch; 487 bool m_preservesPitch;
492 bool m_privateBrowsing; 488 bool m_privateBrowsing;
493 bool m_shouldPrepareToRender; 489 bool m_shouldPrepareToRender;
494 bool m_contentMIMETypeWasInferredFromExtension; 490 bool m_contentMIMETypeWasInferredFromExtension;
495 #if ENABLE(PLUGIN_PROXY_FOR_VIDEO) 491 #if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
496 WebMediaPlayerProxy* m_playerProxy; // not owned or used, passed to m_pri vate 492 WebMediaPlayerProxy* m_playerProxy; // not owned or used, passed to m_pri vate
497 #endif 493 #endif
498 494
499 #if ENABLE(MEDIA_SOURCE)
500 RefPtr<MediaSource> m_mediaSource; 495 RefPtr<MediaSource> m_mediaSource;
501 #endif
502 }; 496 };
503 497
504 typedef PassOwnPtr<MediaPlayerPrivateInterface> (*CreateMediaEnginePlayer)(Media Player*); 498 typedef PassOwnPtr<MediaPlayerPrivateInterface> (*CreateMediaEnginePlayer)(Media Player*);
505 typedef void (*MediaEngineSupportedTypes)(HashSet<String>& types); 499 typedef void (*MediaEngineSupportedTypes)(HashSet<String>& types);
506 #if ENABLE(ENCRYPTED_MEDIA) || ENABLE(ENCRYPTED_MEDIA_V2) 500 #if ENABLE(ENCRYPTED_MEDIA) || ENABLE(ENCRYPTED_MEDIA_V2)
507 typedef MediaPlayer::SupportsType (*MediaEngineSupportsType)(const String& type, const String& codecs, const String& keySystem, const KURL& url); 501 typedef MediaPlayer::SupportsType (*MediaEngineSupportsType)(const String& type, const String& codecs, const String& keySystem, const KURL& url);
508 #else 502 #else
509 typedef MediaPlayer::SupportsType (*MediaEngineSupportsType)(const String& type, const String& codecs, const KURL& url); 503 typedef MediaPlayer::SupportsType (*MediaEngineSupportsType)(const String& type, const String& codecs, const KURL& url);
510 #endif 504 #endif
511 typedef void (*MediaEngineGetSitesInMediaCache)(Vector<String>&); 505 typedef void (*MediaEngineGetSitesInMediaCache)(Vector<String>&);
512 typedef void (*MediaEngineClearMediaCache)(); 506 typedef void (*MediaEngineClearMediaCache)();
513 typedef void (*MediaEngineClearMediaCacheForSite)(const String&); 507 typedef void (*MediaEngineClearMediaCacheForSite)(const String&);
514 508
515 typedef void (*MediaEngineRegistrar)(CreateMediaEnginePlayer, MediaEngineSupport edTypes, MediaEngineSupportsType, 509 typedef void (*MediaEngineRegistrar)(CreateMediaEnginePlayer, MediaEngineSupport edTypes, MediaEngineSupportsType,
516 MediaEngineGetSitesInMediaCache, MediaEngineClearMediaCache, MediaEngineClea rMediaCacheForSite); 510 MediaEngineGetSitesInMediaCache, MediaEngineClearMediaCache, MediaEngineClea rMediaCacheForSite);
517 511
518 } 512 }
519 513
520 #endif // ENABLE(VIDEO) 514 #endif // ENABLE(VIDEO)
521 515
522 #endif 516 #endif
OLDNEW
« no previous file with comments | « Source/WebCore/platform/chromium/MIMETypeRegistryChromium.cpp ('k') | Source/WebCore/platform/graphics/MediaPlayer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698