Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 03:15:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1305876: P3. Make function members const. r=gerald

Browse Source 
MozReview-Commit-ID: 6R9Y9ofjKp8
This commit is contained in:
Jean-Yves Avenard 2016-10-12 21:03:06 +11:00
parent eb41ff60cb
commit 393d5d4fe1
2 changed files with 40 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
dom/media/mediasource/TrackBuffersManager.cpp
View File

@ -304,7 +304,7 @@ TrackBuffersManager::EvictData(const TimeUnit& aPlaybackTime, int64_t aSize)
}
TimeIntervals
TrackBuffersManager::Buffered()
TrackBuffersManager::Buffered() const
{
MSE_DEBUG("");
// http://w3c.github.io/media-source/index.html#widl-SourceBuffer-buffered
@ -1912,6 +1912,19 @@ TrackBuffersManager::GetTracksList()
return tracks;
}
nsTArray<const TrackBuffersManager::TrackData*>
TrackBuffersManager::GetTracksList() const
{
nsTArray<const TrackData*> tracks;
if (HasVideo()) {
tracks.AppendElement(&mVideoTracks);
}
if (HasAudio()) {
tracks.AppendElement(&mAudioTracks);
}
return tracks;
}
void
TrackBuffersManager::SetAppendState(SourceBufferAttributes::AppendState aAppendState)
{
@ -1921,21 +1934,21 @@ TrackBuffersManager::SetAppendState(SourceBufferAttributes::AppendState aAppendS
}
MediaInfo
TrackBuffersManager::GetMetadata()
TrackBuffersManager::GetMetadata() const
{
MonitorAutoLock mon(mMonitor);
return mInfo;
}
const TimeIntervals&
TrackBuffersManager::Buffered(TrackInfo::TrackType aTrack)
TrackBuffersManager::Buffered(TrackInfo::TrackType aTrack) const
{
MOZ_ASSERT(OnTaskQueue());
return GetTracksData(aTrack).mBufferedRanges;
}
const media::TimeUnit&
TrackBuffersManager::HighestStartTime(TrackInfo::TrackType aTrack)
TrackBuffersManager::HighestStartTime(TrackInfo::TrackType aTrack) const
{
MOZ_ASSERT(OnTaskQueue());
return GetTracksData(aTrack).mHighestStartTimestamp;
@ -1951,7 +1964,7 @@ TrackBuffersManager::SafeBuffered(TrackInfo::TrackType aTrack) const
}
TimeUnit
TrackBuffersManager::HighestStartTime()
TrackBuffersManager::HighestStartTime() const
{
MonitorAutoLock mon(mMonitor);
TimeUnit highestStartTime;
@ -1963,19 +1976,19 @@ TrackBuffersManager::HighestStartTime()
}
TimeUnit
TrackBuffersManager::HighestEndTime()
TrackBuffersManager::HighestEndTime() const
{
MonitorAutoLock mon(mMonitor);
TimeUnit highestEndTime;
nsTArray<TimeIntervals*> tracks;
nsTArray<const TimeIntervals*> tracks;
if (HasVideo()) {
tracks.AppendElement(&mVideoBufferedRanges);
}
if (HasAudio()) {
tracks.AppendElement(&mAudioBufferedRanges);
}
for (auto trackRanges : tracks) {
for (const auto& trackRanges : tracks) {
highestEndTime = std::max(trackRanges->GetEnd(), highestEndTime);
}
return highestEndTime;
@ -2009,7 +2022,7 @@ TrackBuffersManager::UpdateEvictionIndex(TrackData& aTrackData,
}
const TrackBuffersManager::TrackBuffer&
TrackBuffersManager::GetTrackBuffer(TrackInfo::TrackType aTrack)
TrackBuffersManager::GetTrackBuffer(TrackInfo::TrackType aTrack) const
{
MOZ_ASSERT(OnTaskQueue());
return GetTracksData(aTrack).GetTrackBuffer();
@ -2331,7 +2344,7 @@ TrackBuffersManager::GetSample(TrackInfo::TrackType aTrack,
int32_t
TrackBuffersManager::FindCurrentPosition(TrackInfo::TrackType aTrack,
const TimeUnit& aFuzz)
const TimeUnit& aFuzz) const
{
MOZ_ASSERT(OnTaskQueue());
auto& trackData = GetTracksData(aTrack);
@ -2426,17 +2439,17 @@ TrackBuffersManager::GetNextRandomAccessPoint(TrackInfo::TrackType aTrack,
}
void
TrackBuffersManager::TrackData::AddSizeOfResources(MediaSourceDecoder::ResourceSizes* aSizes)
TrackBuffersManager::TrackData::AddSizeOfResources(MediaSourceDecoder::ResourceSizes* aSizes) const
{
for (TrackBuffer& buffer : mBuffers) {
for (MediaRawData* data : buffer) {
for (const TrackBuffer& buffer : mBuffers) {
for (const MediaRawData* data : buffer) {
aSizes->mByteSize += data->SizeOfIncludingThis(aSizes->mMallocSizeOf);
}
}
}
void
TrackBuffersManager::AddSizeOfResources(MediaSourceDecoder::ResourceSizes* aSizes)
TrackBuffersManager::AddSizeOfResources(MediaSourceDecoder::ResourceSizes* aSizes) const
{
MOZ_ASSERT(OnTaskQueue());
mVideoTracks.AddSizeOfResources(aSizes);

25
dom/media/mediasource/TrackBuffersManager.h
View File

@ -122,9 +122,9 @@ public:
// Returns the buffered range currently managed.
// This may be called on any thread.
// Buffered must conform to http://w3c.github.io/media-source/index.html#widl-SourceBuffer-buffered
media::TimeIntervals Buffered();
media::TimeUnit HighestStartTime();
media::TimeUnit HighestEndTime();
media::TimeIntervals Buffered() const;
media::TimeUnit HighestStartTime() const;
media::TimeUnit HighestEndTime() const;
// Return the size of the data managed by this SourceBufferContentManager.
int64_t GetSize() const;
@ -138,10 +138,10 @@ public:
int64_t EvictionThreshold() const;
// Interface for MediaSourceDemuxer
MediaInfo GetMetadata();
const TrackBuffer& GetTrackBuffer(TrackInfo::TrackType aTrack);
const media::TimeIntervals& Buffered(TrackInfo::TrackType);
const media::TimeUnit& HighestStartTime(TrackInfo::TrackType);
MediaInfo GetMetadata() const;
const TrackBuffer& GetTrackBuffer(TrackInfo::TrackType aTrack) const;
const media::TimeIntervals& Buffered(TrackInfo::TrackType) const;
const media::TimeUnit& HighestStartTime(TrackInfo::TrackType) const;
media::TimeIntervals SafeBuffered(TrackInfo::TrackType) const;
bool IsEnded() const
{
@ -160,11 +160,11 @@ public:
const media::TimeUnit& aFuzz,
MediaResult& aResult);
int32_t FindCurrentPosition(TrackInfo::TrackType aTrack,
const media::TimeUnit& aFuzz);
const media::TimeUnit& aFuzz) const;
media::TimeUnit GetNextRandomAccessPoint(TrackInfo::TrackType aTrack,
const media::TimeUnit& aFuzz);
void AddSizeOfResources(MediaSourceDecoder::ResourceSizes* aSizes);
void AddSizeOfResources(MediaSourceDecoder::ResourceSizes* aSizes) const;
private:
typedef MozPromise<bool, MediaResult, /* IsExclusive = */ true> CodedFrameProcessingPromise;
@ -376,7 +376,7 @@ private:
mNextInsertionIndex.reset();
}
void AddSizeOfResources(MediaSourceDecoder::ResourceSizes* aSizes);
void AddSizeOfResources(MediaSourceDecoder::ResourceSizes* aSizes) const;
};
void CheckSequenceDiscontinuity(const media::TimeUnit& aPresentationTime);
@ -413,6 +413,7 @@ private:
MozPromiseHolder<CodedFrameProcessingPromise> mProcessingPromise;
// Trackbuffers definition.
nsTArray<const TrackData*> GetTracksList() const;
nsTArray<TrackData*> GetTracksList();
TrackData& GetTracksData(TrackType aTrack)
{
@ -438,11 +439,11 @@ private:
TrackData mAudioTracks;
// TaskQueue methods and objects.
AbstractThread* GetTaskQueue()
AbstractThread* GetTaskQueue() const
{
return mTaskQueue;
}
bool OnTaskQueue()
bool OnTaskQueue() const
{
return !GetTaskQueue() || GetTaskQueue()->IsCurrentThreadIn();
}