зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1314529. Part 2 - remove MediaDecoder::SetMediaSeekable(). r=cpearce
MozReview-Commit-ID: 6JJrKi3KTll --HG-- extra : rebase_source : f12b55befd8264a076f393f7e44e77f1f843fbea extra : source : 1f4a048de0f8c75d7aab8396f50c197afdae7d38
This commit is contained in:
Родитель
e6bb1c3c9c
Коммит
7ea7732b4a
|
@ -782,7 +782,7 @@ MediaDecoder::MetadataLoaded(nsAutoPtr<MediaInfo> aInfo,
|
|||
aInfo->mAudio.mChannels, aInfo->mAudio.mRate,
|
||||
aInfo->HasAudio(), aInfo->HasVideo());
|
||||
|
||||
SetMediaSeekable(aInfo->mMediaSeekable);
|
||||
mMediaSeekable = aInfo->mMediaSeekable;
|
||||
SetMediaSeekableOnlyInBufferedRanges(aInfo->mMediaSeekableOnlyInBufferedRanges);
|
||||
mInfo = aInfo.forget();
|
||||
ConstructMediaTracks();
|
||||
|
@ -1277,12 +1277,6 @@ MediaDecoder::UpdateEstimatedMediaDuration(int64_t aDuration)
|
|||
mEstimatedDuration = Some(TimeUnit::FromMicroseconds(aDuration));
|
||||
}
|
||||
|
||||
void
|
||||
MediaDecoder::SetMediaSeekable(bool aMediaSeekable) {
|
||||
MOZ_ASSERT(NS_IsMainThread());
|
||||
mMediaSeekable = aMediaSeekable;
|
||||
}
|
||||
|
||||
void
|
||||
MediaDecoder::SetMediaSeekableOnlyInBufferedRanges(bool aMediaSeekableOnlyInBufferedRanges){
|
||||
MOZ_ASSERT(NS_IsMainThread());
|
||||
|
|
|
@ -251,8 +251,6 @@ protected:
|
|||
void UpdateEstimatedMediaDuration(int64_t aDuration) override;
|
||||
|
||||
public:
|
||||
// Set a flag indicating whether random seeking is supported
|
||||
void SetMediaSeekable(bool aMediaSeekable);
|
||||
// Set a flag indicating whether seeking is supported only in buffered ranges
|
||||
void SetMediaSeekableOnlyInBufferedRanges(bool aMediaSeekableOnlyInBufferedRanges);
|
||||
|
||||
|
@ -572,7 +570,7 @@ private:
|
|||
|
||||
void OnMediaNotSeekable()
|
||||
{
|
||||
SetMediaSeekable(false);
|
||||
mMediaSeekable = false;
|
||||
}
|
||||
|
||||
void FinishShutdown();
|
||||
|
|
Загрузка…
Ссылка в новой задаче