NuPlayer: allow restartAudio in non-offload mode.
Bug: 27349327
Bug: 27059518
Change-Id: Ia41de9dbe8949ca04f6f3cd11f5b01cea2f53a74
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
index 44279ce..6c54e3f 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
+++ b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
@@ -746,7 +746,7 @@
if (!mPaused) {
mRenderer->pause();
}
- restartAudioFromOffload(
+ restartAudio(
currentPositionUs, true /* forceNonOffload */,
true /* needsToCreateAudioDecoder */);
if (!mPaused) {
@@ -1149,7 +1149,7 @@
positionUs = mPreviousSeekTimeUs;
}
- restartAudioFromOffload(
+ restartAudio(
positionUs, false /* forceNonOffload */,
reason == Renderer::kDueToError /* needsToCreateAudioDecoder */);
}
@@ -1488,11 +1488,8 @@
mRenderer->closeAudioSink();
}
-void NuPlayer::restartAudioFromOffload(
+void NuPlayer::restartAudio(
int64_t currentPositionUs, bool forceNonOffload, bool needsToCreateAudioDecoder) {
- if (!mOffloadAudio) {
- return;
- }
mAudioDecoder->pause();
mAudioDecoder.clear();
++mAudioDecoderGeneration;
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayer.h b/media/libmediaplayerservice/nuplayer/NuPlayer.h
index 5e48b30..a55aa5f 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayer.h
+++ b/media/libmediaplayerservice/nuplayer/NuPlayer.h
@@ -233,7 +233,7 @@
void tryOpenAudioSinkForOffload(const sp<AMessage> &format, bool hasVideo);
void closeAudioSink();
- void restartAudioFromOffload(
+ void restartAudio(
int64_t currentPositionUs, bool forceNonOffload, bool needsToCreateAudioDecoder);
void determineAudioModeChange();