Bug 1314547. Part 2 - remove unused public functions. r=cpearce

MozReview-Commit-ID: 2PndXBXmwRv

--HG--
extra : rebase_source : ede08db67cc25ffed00cc22409dc3346db81a3fb
extra : source : 7cee8e95c52a4f23bce6475c160961c42e518f22
This commit is contained in:
JW Wang 2016-11-02 17:16:59 +08:00
Родитель 544c3e8512
Коммит 2639894677
2 изменённых файлов: 4 добавлений и 22 удалений

Просмотреть файл

@ -782,7 +782,7 @@ MediaDecoder::MetadataLoaded(nsAutoPtr<MediaInfo> aInfo,
aInfo->HasAudio(), aInfo->HasVideo());
mMediaSeekable = aInfo->mMediaSeekable;
SetMediaSeekableOnlyInBufferedRanges(aInfo->mMediaSeekableOnlyInBufferedRanges);
mMediaSeekableOnlyInBufferedRanges = aInfo->mMediaSeekableOnlyInBufferedRanges;
mInfo = aInfo.forget();
ConstructMediaTracks();
@ -1276,12 +1276,6 @@ MediaDecoder::UpdateEstimatedMediaDuration(int64_t aDuration)
mEstimatedDuration = Some(TimeUnit::FromMicroseconds(aDuration));
}
void
MediaDecoder::SetMediaSeekableOnlyInBufferedRanges(bool aMediaSeekableOnlyInBufferedRanges){
MOZ_ASSERT(NS_IsMainThread());
mMediaSeekableOnlyInBufferedRanges = aMediaSeekableOnlyInBufferedRanges;
}
bool
MediaDecoder::IsTransportSeekable()
{
@ -1297,13 +1291,6 @@ MediaDecoder::IsMediaSeekable()
return mMediaSeekable;
}
bool
MediaDecoder::IsMediaSeekableOnlyInBufferedRanges()
{
MOZ_ASSERT(NS_IsMainThread());
return mMediaSeekableOnlyInBufferedRanges;
}
media::TimeIntervals
MediaDecoder::GetSeekable()
{
@ -1317,7 +1304,7 @@ MediaDecoder::GetSeekable()
// We can seek in buffered range if the media is seekable. Also, we can seek
// in unbuffered ranges if the transport level is seekable (local file or the
// server supports range requests, etc.) or in cue-less WebMs
if (IsMediaSeekableOnlyInBufferedRanges()) {
if (mMediaSeekableOnlyInBufferedRanges) {
return GetBuffered();
} else if (!IsMediaSeekable()) {
return media::TimeIntervals();

Просмотреть файл

@ -251,15 +251,9 @@ protected:
void UpdateEstimatedMediaDuration(int64_t aDuration) override;
public:
// Set a flag indicating whether seeking is supported only in buffered ranges
void SetMediaSeekableOnlyInBufferedRanges(bool aMediaSeekableOnlyInBufferedRanges);
// Returns true if this media supports random seeking. False for example with
// chained ogg files.
bool IsMediaSeekable();
// Returns true if this media supports seeking only in buffered ranges. True
// for example in WebMs with no cues
bool IsMediaSeekableOnlyInBufferedRanges();
// Returns true if seeking is supported on a transport level (e.g. the server
// supports range requests, we are playing a file, etc.).
bool IsTransportSeekable();
@ -768,7 +762,8 @@ protected:
// back again.
Canonical<int64_t> mDecoderPosition;
// True if the media is only seekable within its buffered ranges.
// True if the media is only seekable within its buffered ranges
// like WebMs with no cues.
Canonical<bool> mMediaSeekableOnlyInBufferedRanges;
// True if the decoder is visible.