Bug 845095 - Enable media dormancy everywhere for MP4 and Media Source playback - r=jya

--HG--
extra : rebase_source : 40a9429fb4e1490d6afaf25fbb7466fc4beaaaf2
This commit is contained in:
Edwin Flores 2016-05-31 21:08:00 +02:00
parent 462669a29b
commit bd172274b3
2 changed files with 0 additions and 16 deletions

View File

@ -30,18 +30,10 @@
namespace mozilla {
#if defined(MOZ_GONK_MEDIACODEC) || defined(XP_WIN) || defined(MOZ_APPLEMEDIA) || defined(MOZ_FFMPEG)
#define MP4_READER_DORMANT_HEURISTIC
#else
#undef MP4_READER_DORMANT_HEURISTIC
#endif
MP4Decoder::MP4Decoder(MediaDecoderOwner* aOwner)
: MediaDecoder(aOwner)
{
#if defined(MP4_READER_DORMANT_HEURISTIC)
mDormantSupported = Preferences::GetBool("media.decoder.heuristic.dormant.enabled", false);
#endif
}
MediaDecoderStateMachine* MP4Decoder::CreateStateMachine()

View File

@ -33,12 +33,6 @@ extern mozilla::LogModule* GetMediaSourceAPILog();
#define MSE_DEBUGV(arg, ...) MOZ_LOG(GetMediaSourceLog(), mozilla::LogLevel::Verbose, ("SourceBuffer(%p:%s)::%s: " arg, this, mType.get(), __func__, ##__VA_ARGS__))
#define MSE_API(arg, ...) MOZ_LOG(GetMediaSourceAPILog(), mozilla::LogLevel::Debug, ("SourceBuffer(%p:%s)::%s: " arg, this, mType.get(), __func__, ##__VA_ARGS__))
#if defined(MOZ_GONK_MEDIACODEC) || defined(XP_WIN) || defined(MOZ_APPLEMEDIA) || defined(MOZ_FFMPEG)
#define MP4_READER_DORMANT_HEURISTIC
#else
#undef MP4_READER_DORMANT_HEURISTIC
#endif
namespace mozilla {
using media::TimeUnit;
@ -308,9 +302,7 @@ SourceBuffer::SourceBuffer(MediaSource* aMediaSource, const nsACString& aType)
new TrackBuffersManager(aMediaSource->GetDecoder(), aType);
// Now that we know what type we're dealing with, enable dormant as needed.
#if defined(MP4_READER_DORMANT_HEURISTIC)
aMediaSource->GetDecoder()->NotifyDormantSupported(Preferences::GetBool("media.decoder.heuristic.dormant.enabled", false));
#endif
MSE_DEBUG("Create mTrackBuffersManager=%p",
mTrackBuffersManager.get());