Changeset 142845 in webkit
- Timestamp:
- Feb 13, 2013 7:45:10 PM (11 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r142843 r142845 1 2013-02-13 Soo-Hyun Choi <sh9.choi@samsung.com> 2 3 Fix indentation error in MediaPlayerPrivateGStreamer.h 4 https://bugs.webkit.org/show_bug.cgi?id=109768 5 6 Reviewed by Kentaro Hara. 7 8 No new tests as this patch just changes indentation style. 9 10 * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h: 11 (MediaPlayerPrivateGStreamer): 12 (WebCore::MediaPlayerPrivateGStreamer::hasVideo): 13 (WebCore::MediaPlayerPrivateGStreamer::hasAudio): 14 (WebCore::MediaPlayerPrivateGStreamer::engineDescription): 15 (WebCore::MediaPlayerPrivateGStreamer::isLiveStream): 16 1 17 2013-02-13 Adam Barth <abarth@webkit.org> 2 18 -
trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h
r142251 r142845 40 40 41 41 class MediaPlayerPrivateGStreamer : public MediaPlayerPrivateGStreamerBase { 42 public: 43 ~MediaPlayerPrivateGStreamer(); 44 static void registerMediaEngine(MediaEngineRegistrar); 45 gboolean handleMessage(GstMessage*); 42 46 43 public: 44 ~MediaPlayerPrivateGStreamer(); 45 static void registerMediaEngine(MediaEngineRegistrar); 46 gboolean handleMessage(GstMessage*); 47 bool hasVideo() const { return m_hasVideo; } 48 bool hasAudio() const { return m_hasAudio; } 47 49 48 bool hasVideo() const { return m_hasVideo; } 49 bool hasAudio() const { return m_hasAudio; } 50 void load(const String &url); 51 void commitLoad(); 52 void cancelLoad(); 50 53 51 void load(const String &url);52 void commitLoad();53 void cancelLoad();54 void prepareToPlay(); 55 void play(); 56 void pause(); 54 57 55 void prepareToPlay(); 56 void play(); 57 void pause(); 58 bool paused() const; 59 bool seeking() const; 58 60 59 bool paused() const; 60 bool seeking() const; 61 float duration() const; 62 float currentTime() const; 63 void seek(float); 61 64 62 float duration() const; 63 float currentTime() const; 64 void seek(float); 65 void setRate(float); 66 void setPreservesPitch(bool); 65 67 66 void setRate(float);67 void setPreservesPitch(bool);68 void setPreload(MediaPlayer::Preload); 69 void fillTimerFired(Timer<MediaPlayerPrivateGStreamer>*); 68 70 69 void setPreload(MediaPlayer::Preload); 70 void fillTimerFired(Timer<MediaPlayerPrivateGStreamer>*); 71 PassRefPtr<TimeRanges> buffered() const; 72 float maxTimeSeekable() const; 73 bool didLoadingProgress() const; 74 unsigned totalBytes() const; 75 float maxTimeLoaded() const; 71 76 72 PassRefPtr<TimeRanges> buffered() const;73 float maxTimeSeekable() const;74 bool didLoadingProgress() const;75 unsigned totalBytes() const;76 float maxTimeLoaded() const;77 void loadStateChanged(); 78 void timeChanged(); 79 void didEnd(); 80 void durationChanged(); 81 void loadingFailed(MediaPlayer::NetworkState); 77 82 78 void loadStateChanged(); 79 void timeChanged(); 80 void didEnd(); 81 void durationChanged(); 82 void loadingFailed(MediaPlayer::NetworkState); 83 void videoChanged(); 84 void audioChanged(); 85 void notifyPlayerOfVideo(); 86 void notifyPlayerOfAudio(); 83 87 84 void videoChanged(); 85 void audioChanged(); 86 void notifyPlayerOfVideo(); 87 void notifyPlayerOfAudio(); 88 void sourceChanged(); 89 GstElement* audioSink() const; 88 90 89 void sourceChanged(); 90 GstElement* audioSink() const;91 private: 92 MediaPlayerPrivateGStreamer(MediaPlayer*); 91 93 92 private: 93 MediaPlayerPrivateGStreamer(MediaPlayer*); 94 static PassOwnPtr<MediaPlayerPrivateInterface> create(MediaPlayer*); 94 95 95 static PassOwnPtr<MediaPlayerPrivateInterface> create(MediaPlayer*); 96 static void getSupportedTypes(HashSet<String>&); 97 static MediaPlayer::SupportsType supportsType(const String& type, const String& codecs, const KURL&); 96 98 97 static void getSupportedTypes(HashSet<String>&); 98 static MediaPlayer::SupportsType supportsType(const String& type, const String& codecs, const KURL&); 99 static bool isAvailable(); 99 100 100 static bool isAvailable(); 101 void updateAudioSink(); 102 void createAudioSink(); 101 103 102 void updateAudioSink(); 103 void createAudioSink(); 104 float playbackPosition() const; 104 105 105 float playbackPosition() const; 106 void cacheDuration(); 107 void updateStates(); 106 108 107 void cacheDuration();108 void updateStates();109 void createGSTPlayBin(); 110 bool changePipelineState(GstState); 109 111 110 void createGSTPlayBin();111 bool changePipelineState(GstState state);112 bool loadNextLocation(); 113 void mediaLocationChanged(GstMessage*); 112 114 113 bool loadNextLocation();114 void mediaLocationChanged(GstMessage*);115 void setDownloadBuffering(); 116 void processBufferingStats(GstMessage*); 115 117 116 void setDownloadBuffering();117 void processBufferingStats(GstMessage*);118 virtual String engineDescription() const { return "GStreamer"; } 119 virtual bool isLiveStream() const { return m_isStreaming; } 118 120 119 virtual String engineDescription() const { return "GStreamer"; } 120 virtual bool isLiveStream() const { return m_isStreaming; } 121 122 private: 123 GRefPtr<GstElement> m_playBin; 124 GRefPtr<GstElement> m_source; 125 float m_seekTime; 126 bool m_changingRate; 127 float m_endTime; 128 bool m_isEndReached; 129 mutable bool m_isStreaming; 130 GstStructure* m_mediaLocations; 131 int m_mediaLocationCurrentIndex; 132 bool m_resetPipeline; 133 bool m_paused; 134 bool m_seeking; 135 bool m_buffering; 136 float m_playbackRate; 137 bool m_errorOccured; 138 gfloat m_mediaDuration; 139 bool m_startedBuffering; 140 Timer<MediaPlayerPrivateGStreamer> m_fillTimer; 141 float m_maxTimeLoaded; 142 int m_bufferingPercentage; 143 MediaPlayer::Preload m_preload; 144 bool m_delayingLoad; 145 bool m_mediaDurationKnown; 146 mutable float m_maxTimeLoadedAtLastDidLoadingProgress; 147 bool m_volumeAndMuteInitialized; 148 bool m_hasVideo; 149 bool m_hasAudio; 150 guint m_audioTimerHandler; 151 guint m_videoTimerHandler; 152 GRefPtr<GstElement> m_webkitAudioSink; 153 mutable long m_totalBytes; 154 KURL m_url; 155 bool m_originalPreloadWasAutoAndWasOverridden; 156 bool m_preservesPitch; 157 }; 121 private: 122 GRefPtr<GstElement> m_playBin; 123 GRefPtr<GstElement> m_source; 124 float m_seekTime; 125 bool m_changingRate; 126 float m_endTime; 127 bool m_isEndReached; 128 mutable bool m_isStreaming; 129 GstStructure* m_mediaLocations; 130 int m_mediaLocationCurrentIndex; 131 bool m_resetPipeline; 132 bool m_paused; 133 bool m_seeking; 134 bool m_buffering; 135 float m_playbackRate; 136 bool m_errorOccured; 137 gfloat m_mediaDuration; 138 bool m_startedBuffering; 139 Timer<MediaPlayerPrivateGStreamer> m_fillTimer; 140 float m_maxTimeLoaded; 141 int m_bufferingPercentage; 142 MediaPlayer::Preload m_preload; 143 bool m_delayingLoad; 144 bool m_mediaDurationKnown; 145 mutable float m_maxTimeLoadedAtLastDidLoadingProgress; 146 bool m_volumeAndMuteInitialized; 147 bool m_hasVideo; 148 bool m_hasAudio; 149 guint m_audioTimerHandler; 150 guint m_videoTimerHandler; 151 GRefPtr<GstElement> m_webkitAudioSink; 152 mutable long m_totalBytes; 153 KURL m_url; 154 bool m_originalPreloadWasAutoAndWasOverridden; 155 bool m_preservesPitch; 156 }; 158 157 } 159 158
Note: See TracChangeset
for help on using the changeset viewer.