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

Bug 1204419: P4. Remove MediaDataDemuxer API no longer used. r=cpearce

Browse Source
This commit is contained in:
Jean-Yves Avenard 2015-09-14 18:06:00 +10:00
parent 82279827e6
commit 71c5c9a7bf
9 changed files with 0 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dom/media/MP3Demuxer.cpp
View File

@ -338,11 +338,6 @@ MP3TrackDemuxer::GetBuffered() {
return TimeIntervals();
}
int64_t
MP3TrackDemuxer::GetEvictionOffset(TimeUnit aTime) {
return 0;
}
int64_t
MP3TrackDemuxer::StreamLength() const {
return mSource.GetLength();

1
dom/media/MP3Demuxer.h
View File

@ -355,7 +355,6 @@ public:
media::TimeUnit aTimeThreshold) override;
int64_t GetResourceOffset() const override;
media::TimeIntervals GetBuffered() override;
int64_t GetEvictionOffset(media::TimeUnit aTime) override;
private:
// Destructor.

2
dom/media/MediaDataDemuxer.h
View File

@ -207,8 +207,6 @@ public:
virtual media::TimeIntervals GetBuffered() = 0;
virtual int64_t GetEvictionOffset(media::TimeUnit aTime) = 0;
// If the MediaTrackDemuxer and MediaDataDemuxer hold cross references.
// BreakCycles must be overridden.
virtual void BreakCycles()

9
dom/media/fmp4/MP4Demuxer.cpp
View File

@ -382,15 +382,6 @@ MP4TrackDemuxer::SkipToNextRandomAccessPoint(media::TimeUnit aTimeThreshold)
}
}
int64_t
MP4TrackDemuxer::GetEvictionOffset(media::TimeUnit aTime)
{
EnsureUpToDateIndex();
MonitorAutoLock mon(mMonitor);
uint64_t offset = mIndex->GetEvictionOffset(aTime.ToMicroseconds());
return int64_t(offset == std::numeric_limits<uint64_t>::max() ? 0 : offset);
}
media::TimeIntervals
MP4TrackDemuxer::GetBuffered()
{

2
dom/media/fmp4/MP4Demuxer.h
View File

@ -77,8 +77,6 @@ public:
virtual media::TimeIntervals GetBuffered() override;
virtual int64_t GetEvictionOffset(media::TimeUnit aTime) override;
virtual void BreakCycles() override;
private:

7
dom/media/mediasource/MediaSourceDemuxer.cpp
View File

@ -317,13 +317,6 @@ MediaSourceTrackDemuxer::SkipToNextRandomAccessPoint(media::TimeUnit aTimeThresh
aTimeThreshold);
}
int64_t
MediaSourceTrackDemuxer::GetEvictionOffset(media::TimeUnit aTime)
{
// Unused.
return 0;
}
media::TimeIntervals
MediaSourceTrackDemuxer::GetBuffered()
{

2
dom/media/mediasource/MediaSourceDemuxer.h
View File

@ -107,8 +107,6 @@ public:
media::TimeIntervals GetBuffered() override;
int64_t GetEvictionOffset(media::TimeUnit aTime) override;
void BreakCycles() override;
bool GetSamplesMayBlock() const override

11
dom/media/webm/WebMDemuxer.cpp
View File

@ -998,17 +998,6 @@ WebMTrackDemuxer::SkipToNextRandomAccessPoint(media::TimeUnit aTimeThreshold)
}
}
int64_t
WebMTrackDemuxer::GetEvictionOffset(media::TimeUnit aTime)
{
int64_t offset;
if (!mParent->GetOffsetForTime(aTime.ToNanoseconds(), &offset)) {
return 0;
}
return offset;
}
media::TimeIntervals
WebMTrackDemuxer::GetBuffered()
{

2
dom/media/webm/WebMDemuxer.h
View File

@ -217,8 +217,6 @@ public:
media::TimeIntervals GetBuffered() override;
int64_t GetEvictionOffset(media::TimeUnit aTime) override;
void BreakCycles() override;
private: