author | JW Wang <jwwang@mozilla.com> |
Wed, 20 Apr 2016 16:02:37 +0800 | |
changeset 294004 | f2d195c7313f2c58f5a4bf6d6614adf0ef53b275 |
parent 294003 | e6fa15a5e1d7699fc95f6e66256de4e04c3e9ff5 |
child 294005 | efd7dcae14fafe98cd887414da25070932e51676 |
push id | 30196 |
push user | kwierso@gmail.com |
push date | Wed, 20 Apr 2016 20:55:01 +0000 |
treeherder | mozilla-central@93090fa30653 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | jya |
bugs | 1265634 |
milestone | 48.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
dom/media/MediaDecoderStateMachine.cpp | file | annotate | diff | comparison | revisions | |
dom/media/MediaDecoderStateMachine.h | file | annotate | diff | comparison | revisions |
--- a/dom/media/MediaDecoderStateMachine.cpp +++ b/dom/media/MediaDecoderStateMachine.cpp @@ -2695,23 +2695,23 @@ MediaDecoderStateMachine::SizeOfVideoQue size_t MediaDecoderStateMachine::SizeOfAudioQueue() const { return mReader->SizeOfAudioQueueInBytes(); } AbstractCanonical<media::TimeIntervals>* -MediaDecoderStateMachine::CanonicalBuffered() +MediaDecoderStateMachine::CanonicalBuffered() const { return mReader->CanonicalBuffered(); } MediaEventSource<void>& -MediaDecoderStateMachine::OnMediaNotSeekable() +MediaDecoderStateMachine::OnMediaNotSeekable() const { return mReader->OnMediaNotSeekable(); } } // namespace mozilla // avoid redefined macro in unified build #undef LOG
--- a/dom/media/MediaDecoderStateMachine.h +++ b/dom/media/MediaDecoderStateMachine.h @@ -217,17 +217,17 @@ public: MOZ_ASSERT(NS_IsMainThread()); mResource = nullptr; } TimedMetadataEventSource& TimedMetadataEvent() { return mMetadataManager.TimedMetadataEvent(); } - MediaEventSource<void>& OnMediaNotSeekable(); + MediaEventSource<void>& OnMediaNotSeekable() const; MediaEventSourceExc<nsAutoPtr<MediaInfo>, nsAutoPtr<MetadataTags>, MediaDecoderEventVisibility>& MetadataLoadedEvent() { return mMetadataLoadedEvent; } MediaEventSourceExc<nsAutoPtr<MediaInfo>, MediaDecoderEventVisibility>& @@ -1034,17 +1034,17 @@ private: // Current playback position in the stream in bytes. Canonical<int64_t> mPlaybackOffset; // Used to distiguish whether the audio is producing sound. Canonical<bool> mIsAudioDataAudible; public: - AbstractCanonical<media::TimeIntervals>* CanonicalBuffered(); + AbstractCanonical<media::TimeIntervals>* CanonicalBuffered() const; AbstractCanonical<media::NullableTimeUnit>* CanonicalDuration() { return &mDuration; } AbstractCanonical<bool>* CanonicalIsShutdown() { return &mIsShutdown; } AbstractCanonical<NextFrameStatus>* CanonicalNextFrameStatus() {