Revert "NuPlayer: use kWhatPauseOnBufferingStart instead of kWhatBufferingStart in RTSPSource."
This reverts commit 2c9a30a341e50f53039e1b7da96dfa91104fdd62.
RTSPSource::pause() will stop receiving data in RTSPSource. This is different from GenericSource::pause().
Change-Id: I2df2bf350731ce0fb1f278942b23ccc6f4f37fb9
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
index cede584..5c13633 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
+++ b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
@@ -2142,7 +2142,11 @@
mPausedForBuffering = true;
onPause();
}
+ // fall-thru
+ }
+ case Source::kWhatBufferingStart:
+ {
notifyListener(MEDIA_INFO, MEDIA_INFO_BUFFERING_START, 0);
break;
}
@@ -2160,7 +2164,11 @@
onResume();
}
}
+ // fall-thru
+ }
+ case Source::kWhatBufferingEnd:
+ {
notifyListener(MEDIA_INFO, MEDIA_INFO_BUFFERING_END, 0);
break;
}
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerSource.h b/media/libmediaplayerservice/nuplayer/NuPlayerSource.h
index 0176eafa..fba4540 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayerSource.h
+++ b/media/libmediaplayerservice/nuplayer/NuPlayerSource.h
@@ -46,6 +46,8 @@
kWhatFlagsChanged,
kWhatVideoSizeChanged,
kWhatBufferingUpdate,
+ kWhatBufferingStart,
+ kWhatBufferingEnd,
kWhatPauseOnBufferingStart,
kWhatResumeOnBufferingEnd,
kWhatCacheStats,
diff --git a/media/libmediaplayerservice/nuplayer/RTSPSource.cpp b/media/libmediaplayerservice/nuplayer/RTSPSource.cpp
index 2ecab6d..c861fd1 100644
--- a/media/libmediaplayerservice/nuplayer/RTSPSource.cpp
+++ b/media/libmediaplayerservice/nuplayer/RTSPSource.cpp
@@ -725,7 +725,7 @@
mBuffering = true;
sp<AMessage> notify = dupNotify();
- notify->setInt32("what", kWhatPauseOnBufferingStart);
+ notify->setInt32("what", kWhatBufferingStart);
notify->post();
}
}
@@ -741,7 +741,7 @@
mBuffering = false;
sp<AMessage> notify = dupNotify();
- notify->setInt32("what", kWhatResumeOnBufferingEnd);
+ notify->setInt32("what", kWhatBufferingEnd);
notify->post();
}