From 0bb42323c0ec767ba771298f933babdcb51cb41b Mon Sep 17 00:00:00 2001 From: Li Sun Date: Fri, 28 Aug 2015 14:40:58 +0800 Subject: httplive: refactor for HLS customization Change access modifiers and add overridable methods in HLS stack. Change-Id: Iae8e77246cc6643735af18617717fba713d0038c --- .../mediaplayerservice/AVNuExtensions.h | 1 + .../mediaplayerservice/AVNuUtils.cpp | 4 ++++ .../nuplayer/HTTPLiveSource.h | 3 +-- media/libmediaplayerservice/nuplayer/NuPlayer.h | 2 +- .../nuplayer/NuPlayerDecoder.cpp | 3 +++ media/libstagefright/httplive/LiveSession.cpp | 2 +- media/libstagefright/httplive/LiveSession.h | 23 ++++++++++++++-------- media/libstagefright/httplive/PlaylistFetcher.cpp | 4 ++++ media/libstagefright/httplive/PlaylistFetcher.h | 2 +- 9 files changed, 31 insertions(+), 13 deletions(-) (limited to 'media') diff --git a/media/libavextensions/mediaplayerservice/AVNuExtensions.h b/media/libavextensions/mediaplayerservice/AVNuExtensions.h index 4d1421c..a10937d 100644 --- a/media/libavextensions/mediaplayerservice/AVNuExtensions.h +++ b/media/libavextensions/mediaplayerservice/AVNuExtensions.h @@ -82,6 +82,7 @@ struct AVNuUtils { audio_format_t sinkFormat, bool isOffload); virtual void printFileName(int fd); + virtual void checkFormatChange(bool *formatChange, const sp &accessUnit); // ----- NO TRESSPASSING BEYOND THIS LINE ------ DECLARE_LOADABLE_SINGLETON(AVNuUtils); diff --git a/media/libavextensions/mediaplayerservice/AVNuUtils.cpp b/media/libavextensions/mediaplayerservice/AVNuUtils.cpp index bc07c90..aacf76a 100644 --- a/media/libavextensions/mediaplayerservice/AVNuUtils.cpp +++ b/media/libavextensions/mediaplayerservice/AVNuUtils.cpp @@ -100,6 +100,10 @@ status_t AVNuUtils::convertToSinkFormatIfNeeded(const sp &, sp void AVNuUtils::printFileName(int) {} +void AVNuUtils::checkFormatChange(bool * /*formatChange*/, + const sp & /*accessUnit*/) { +} + // ----- NO TRESSPASSING BEYOND THIS LINE ------ AVNuUtils::AVNuUtils() {} diff --git a/media/libmediaplayerservice/nuplayer/HTTPLiveSource.h b/media/libmediaplayerservice/nuplayer/HTTPLiveSource.h index dff0d1e..388156c 100644 --- a/media/libmediaplayerservice/nuplayer/HTTPLiveSource.h +++ b/media/libmediaplayerservice/nuplayer/HTTPLiveSource.h @@ -54,7 +54,6 @@ protected: virtual void onMessageReceived(const sp &msg); -private: enum Flags { // Don't log any URLs. kFlagIncognito = 1, @@ -79,7 +78,7 @@ private: bool mHasMetadata; bool mMetadataSelected; - void onSessionNotify(const sp &msg); + virtual void onSessionNotify(const sp &msg); void pollForRawData( const sp &msg, int32_t currentGeneration, LiveSession::StreamType fetchType, int32_t pushWhat); diff --git a/media/libmediaplayerservice/nuplayer/NuPlayer.h b/media/libmediaplayerservice/nuplayer/NuPlayer.h index 190908f..4ed3079 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayer.h +++ b/media/libmediaplayerservice/nuplayer/NuPlayer.h @@ -267,7 +267,7 @@ protected: void performSetSurface(const sp &wrapper); void performResumeDecoders(bool needNotify); - void onSourceNotify(const sp &msg); + virtual void onSourceNotify(const sp &msg); void onClosedCaptionNotify(const sp &msg); void queueDecoderShutdown( diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp b/media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp index 43589a5..27650d7 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp +++ b/media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp @@ -39,6 +39,8 @@ #include "avc_utils.h" #include "ATSParser.h" +#include "mediaplayerservice/AVNuExtensions.h" + namespace android { @@ -714,6 +716,7 @@ status_t NuPlayer::Decoder::fetchInputData(sp &reply) { // treat seamless format change separately formatChange = !seamlessFormatChange; } + AVNuUtils::get()->checkFormatChange(&formatChange, accessUnit); // For format or time change, return EOS to queue EOS input, // then wait for EOS on output. diff --git a/media/libstagefright/httplive/LiveSession.cpp b/media/libstagefright/httplive/LiveSession.cpp index 8720c88..1b0b1c5 100644 --- a/media/libstagefright/httplive/LiveSession.cpp +++ b/media/libstagefright/httplive/LiveSession.cpp @@ -54,7 +54,7 @@ const int64_t LiveSession::kReadyMarkUs = 5000000ll; const int64_t LiveSession::kPrepareMarkUs = 1500000ll; const int64_t LiveSession::kUnderflowMarkUs = 1000000ll; -struct LiveSession::BandwidthEstimator : public RefBase { +struct LiveSession::BandwidthEstimator : public LiveSession::BandwidthBaseEstimator { BandwidthEstimator(); void addBandwidthMeasurement(size_t numBytes, int64_t delayUs); diff --git a/media/libstagefright/httplive/LiveSession.h b/media/libstagefright/httplive/LiveSession.h index 90d56d0..4667c71 100644 --- a/media/libstagefright/httplive/LiveSession.h +++ b/media/libstagefright/httplive/LiveSession.h @@ -73,7 +73,7 @@ struct LiveSession : public AHandler { const sp &httpService); int64_t calculateMediaTimeUs(int64_t firstTimeUs, int64_t timeUs, int32_t discontinuitySeq); - status_t dequeueAccessUnit(StreamType stream, sp *accessUnit); + virtual status_t dequeueAccessUnit(StreamType stream, sp *accessUnit); status_t getStreamFormat(StreamType stream, sp *format); @@ -117,7 +117,6 @@ protected: virtual void onMessageReceived(const sp &msg); -private: friend struct PlaylistFetcher; enum { @@ -142,6 +141,14 @@ private: static const int64_t kPrepareMarkUs; static const int64_t kUnderflowMarkUs; + struct BandwidthBaseEstimator : public RefBase { + virtual void addBandwidthMeasurement(size_t numBytes, int64_t delayUs) = 0; + virtual bool estimateBandwidth( + int32_t *bandwidth, + bool *isStable = NULL, + int32_t *shortTermBps = NULL) = 0; + }; + struct BandwidthEstimator; struct BandwidthItem { size_t mPlaylistIndex; @@ -201,7 +208,7 @@ private: ssize_t mOrigBandwidthIndex; int32_t mLastBandwidthBps; bool mLastBandwidthStable; - sp mBandwidthEstimator; + sp mBandwidthEstimator; sp mPlaylist; int32_t mMaxWidth; @@ -251,10 +258,10 @@ private: KeyedVector mDiscontinuityAbsStartTimesUs; KeyedVector mDiscontinuityOffsetTimesUs; - sp addFetcher(const char *uri); + virtual sp addFetcher(const char *uri); void onConnect(const sp &msg); - void onMasterPlaylistFetched(const sp &msg); + virtual void onMasterPlaylistFetched(const sp &msg); void onSeek(const sp &msg); bool UriIsSameAsIndex( const AString &uri, int32_t index, bool newUri); @@ -284,7 +291,7 @@ private: void onChangeConfiguration2(const sp &msg); void onChangeConfiguration3(const sp &msg); - void swapPacketSource(StreamType stream); + virtual void swapPacketSource(StreamType stream); void tryToFinishBandwidthSwitch(const AString &oldUri); void cancelBandwidthSwitch(bool resume = false); bool checkSwitchProgress( @@ -296,7 +303,7 @@ private: void schedulePollBuffering(); void cancelPollBuffering(); void restartPollBuffering(); - void onPollBuffering(); + virtual void onPollBuffering(); bool checkBuffering(bool &underflow, bool &ready, bool &down, bool &up); void startBufferingIfNecessary(); void stopBufferingIfNecessary(); @@ -304,7 +311,7 @@ private: void finishDisconnect(); - void postPrepared(status_t err); + virtual void postPrepared(status_t err); void postError(status_t err); DISALLOW_EVIL_CONSTRUCTORS(LiveSession); diff --git a/media/libstagefright/httplive/PlaylistFetcher.cpp b/media/libstagefright/httplive/PlaylistFetcher.cpp index 72d832e..5ad29c3 100644 --- a/media/libstagefright/httplive/PlaylistFetcher.cpp +++ b/media/libstagefright/httplive/PlaylistFetcher.cpp @@ -1418,6 +1418,10 @@ void PlaylistFetcher::onDownloadNext() { } } + if (checkSwitchBandwidth()) { + return; + } + ++mSeqNumber; // if adapting, pause after found the next starting point diff --git a/media/libstagefright/httplive/PlaylistFetcher.h b/media/libstagefright/httplive/PlaylistFetcher.h index c8ca457..74cc0dd 100644 --- a/media/libstagefright/httplive/PlaylistFetcher.h +++ b/media/libstagefright/httplive/PlaylistFetcher.h @@ -89,7 +89,6 @@ protected: virtual ~PlaylistFetcher(); virtual void onMessageReceived(const sp &msg); -private: enum { kMaxNumRetries = 5, }; @@ -249,6 +248,7 @@ private: void updateDuration(); void updateTargetDuration(); + virtual bool checkSwitchBandwidth() { return false; } DISALLOW_EVIL_CONSTRUCTORS(PlaylistFetcher); }; -- cgit v1.1