summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWei Jia <wjia@google.com>2015-05-16 00:52:10 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-05-16 00:52:10 +0000
commit4a95e69406aa2e9896d865962d6d947ebbdac6fc (patch)
tree8dff7a9f6eaae119d20e70560418653725dfbc2a
parent88063ca54bc064fedb836fa020b699f8c61ce6ed (diff)
parent2984080a97d6d43f640029b58930a28e58b8754a (diff)
downloadframeworks_av-4a95e69406aa2e9896d865962d6d947ebbdac6fc.zip
frameworks_av-4a95e69406aa2e9896d865962d6d947ebbdac6fc.tar.gz
frameworks_av-4a95e69406aa2e9896d865962d6d947ebbdac6fc.tar.bz2
Merge "mediaplayer: remove unused parameter needNotify in NuPlayer::performSeek." into mnc-dev
-rw-r--r--media/libmediaplayerservice/nuplayer/NuPlayer.cpp21
-rw-r--r--media/libmediaplayerservice/nuplayer/NuPlayer.h2
2 files changed, 10 insertions, 13 deletions
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
index 1fb4365..96a7adb 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
+++ b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
@@ -69,18 +69,16 @@ private:
};
struct NuPlayer::SeekAction : public Action {
- SeekAction(int64_t seekTimeUs, bool needNotify)
- : mSeekTimeUs(seekTimeUs),
- mNeedNotify(needNotify) {
+ SeekAction(int64_t seekTimeUs)
+ : mSeekTimeUs(seekTimeUs) {
}
virtual void execute(NuPlayer *player) {
- player->performSeek(mSeekTimeUs, mNeedNotify);
+ player->performSeek(mSeekTimeUs);
}
private:
int64_t mSeekTimeUs;
- bool mNeedNotify;
DISALLOW_EVIL_CONSTRUCTORS(SeekAction);
};
@@ -649,7 +647,7 @@ void NuPlayer::onMessageReceived(const sp<AMessage> &msg) {
int64_t currentPositionUs = 0;
if (getCurrentPosition(&currentPositionUs) == OK) {
mDeferredActions.push_back(
- new SeekAction(currentPositionUs, false /* needNotify */));
+ new SeekAction(currentPositionUs));
}
}
@@ -1101,7 +1099,7 @@ void NuPlayer::onMessageReceived(const sp<AMessage> &msg) {
false /* audio */, false /* notifyComplete */);
}
- performSeek(positionUs, false /* needNotify */);
+ performSeek(positionUs);
if (reason == Renderer::kDueToError) {
mRenderer->signalDisableOffloadAudio();
mOffloadAudio = false;
@@ -1147,7 +1145,7 @@ void NuPlayer::onMessageReceived(const sp<AMessage> &msg) {
FLUSH_CMD_FLUSH /* video */));
mDeferredActions.push_back(
- new SeekAction(seekTimeUs, needNotify));
+ new SeekAction(seekTimeUs));
// After a flush without shutdown, decoder is paused.
// Don't resume it until source seek is done, otherwise it could
@@ -1769,11 +1767,10 @@ void NuPlayer::processDeferredActions() {
}
}
-void NuPlayer::performSeek(int64_t seekTimeUs, bool needNotify) {
- ALOGV("performSeek seekTimeUs=%lld us (%.2f secs), needNotify(%d)",
+void NuPlayer::performSeek(int64_t seekTimeUs) {
+ ALOGV("performSeek seekTimeUs=%lld us (%.2f secs)",
(long long)seekTimeUs,
- seekTimeUs / 1E6,
- needNotify);
+ seekTimeUs / 1E6);
if (mSource == NULL) {
// This happens when reset occurs right before the loop mode
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayer.h b/media/libmediaplayerservice/nuplayer/NuPlayer.h
index df9debc..f417f48 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayer.h
+++ b/media/libmediaplayerservice/nuplayer/NuPlayer.h
@@ -250,7 +250,7 @@ private:
void processDeferredActions();
- void performSeek(int64_t seekTimeUs, bool needNotify);
+ void performSeek(int64_t seekTimeUs);
void performDecoderFlush(FlushCommand audio, FlushCommand video);
void performReset();
void performScanSources();