diff options
-rw-r--r-- | media/libmediaplayerservice/nuplayer/NuPlayer.cpp | 59 | ||||
-rw-r--r-- | media/libmediaplayerservice/nuplayer/NuPlayer.h | 1 |
2 files changed, 32 insertions, 28 deletions
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp index 4a1a34d..26b83bb 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp +++ b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp @@ -830,20 +830,6 @@ void NuPlayer::onMessageReceived(const sp<AMessage> &msg) { // Don't try to re-open audio sink if there's an existing decoder. if (mAudioSink != NULL && mAudioDecoder == NULL) { - sp<MetaData> audioMeta = mSource->getFormatMeta(true /* audio */); - sp<AMessage> videoFormat = mSource->getFormat(false /* audio */); - audio_stream_type_t streamType = mAudioSink->getAudioStreamType(); - const bool hasVideo = (videoFormat != NULL); - const bool canOffload = canOffloadStream( - audioMeta, hasVideo, mSource->isStreaming(), streamType); - if (canOffload) { - if (!mOffloadAudio) { - mRenderer->signalEnableOffloadAudio(); - } - // open audio sink early under offload mode. - sp<AMessage> format = mSource->getFormat(true /*audio*/); - tryOpenAudioSinkForOffload(format, hasVideo); - } instantiateDecoder(true, &mAudioDecoder); } @@ -1104,20 +1090,6 @@ void NuPlayer::onMessageReceived(const sp<AMessage> &msg) { performSeek(positionUs); if (reason == Renderer::kDueToError) { - sp<MetaData> audioMeta = mSource->getFormatMeta(true /* audio */); - sp<AMessage> videoFormat = mSource->getFormat(false /* audio */); - audio_stream_type_t streamType = mAudioSink->getAudioStreamType(); - const bool hasVideo = (videoFormat != NULL); - const bool canOffload = canOffloadStream( - audioMeta, hasVideo, mSource->isStreaming(), streamType); - if (canOffload) { - mRenderer->signalEnableOffloadAudio(); - sp<AMessage> format = mSource->getFormat(true /*audio*/); - tryOpenAudioSinkForOffload(format, hasVideo); - } else { - mRenderer->signalDisableOffloadAudio(); - mOffloadAudio = false; - } instantiateDecoder(true /* audio */, &mAudioDecoder); } } @@ -1449,6 +1421,36 @@ void NuPlayer::closeAudioSink() { mRenderer->closeAudioSink(); } +void NuPlayer::determineAudioModeChange() { + if (mSource == NULL || mAudioSink == NULL) { + return; + } + + if (mRenderer == NULL) { + ALOGW("No renderer can be used to determine audio mode. Use non-offload for safety."); + mOffloadAudio = false; + return; + } + + sp<MetaData> audioMeta = mSource->getFormatMeta(true /* audio */); + sp<AMessage> videoFormat = mSource->getFormat(false /* audio */); + audio_stream_type_t streamType = mAudioSink->getAudioStreamType(); + const bool hasVideo = (videoFormat != NULL); + const bool canOffload = canOffloadStream( + audioMeta, hasVideo, mSource->isStreaming(), streamType); + if (canOffload) { + if (!mOffloadAudio) { + mRenderer->signalEnableOffloadAudio(); + } + // open audio sink early under offload mode. + sp<AMessage> format = mSource->getFormat(true /*audio*/); + tryOpenAudioSinkForOffload(format, hasVideo); + } else { + mRenderer->signalDisableOffloadAudio(); + mOffloadAudio = false; + } +} + status_t NuPlayer::instantiateDecoder(bool audio, sp<DecoderBase> *decoder) { if (*decoder != NULL) { return OK; @@ -1490,6 +1492,7 @@ status_t NuPlayer::instantiateDecoder(bool audio, sp<DecoderBase> *decoder) { ++mAudioDecoderGeneration; notify->setInt32("generation", mAudioDecoderGeneration); + determineAudioModeChange(); if (mOffloadAudio) { const bool hasVideo = (mSource->getFormat(false /*audio */) != NULL); format->setInt32("has-video", hasVideo); diff --git a/media/libmediaplayerservice/nuplayer/NuPlayer.h b/media/libmediaplayerservice/nuplayer/NuPlayer.h index 38904bc..9f4c462 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayer.h +++ b/media/libmediaplayerservice/nuplayer/NuPlayer.h @@ -220,6 +220,7 @@ private: void tryOpenAudioSinkForOffload(const sp<AMessage> &format, bool hasVideo); void closeAudioSink(); + void determineAudioModeChange(); status_t instantiateDecoder(bool audio, sp<DecoderBase> *decoder); |