diff options
| author | Li Sun <sunli@codeaurora.org> | 2015-08-28 14:40:58 +0800 |
|---|---|---|
| committer | Satish Kamuju <skamuj@codeaurora.org> | 2015-10-06 17:38:48 +0530 |
| commit | 0bb42323c0ec767ba771298f933babdcb51cb41b (patch) | |
| tree | cc62acb1ce24fe6a894d3927972e91c5d02fb74d /media/libmediaplayerservice | |
| parent | 63edd77ab527f615afc193ea50e15dfcdeb9fe6f (diff) | |
| download | frameworks_av-0bb42323c0ec767ba771298f933babdcb51cb41b.zip frameworks_av-0bb42323c0ec767ba771298f933babdcb51cb41b.tar.gz frameworks_av-0bb42323c0ec767ba771298f933babdcb51cb41b.tar.bz2 | |
httplive: refactor for HLS customization
Change access modifiers and add overridable methods in HLS stack.
Change-Id: Iae8e77246cc6643735af18617717fba713d0038c
Diffstat (limited to 'media/libmediaplayerservice')
| -rw-r--r-- | media/libmediaplayerservice/nuplayer/HTTPLiveSource.h | 3 | ||||
| -rw-r--r-- | media/libmediaplayerservice/nuplayer/NuPlayer.h | 2 | ||||
| -rw-r--r-- | media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp | 3 |
3 files changed, 5 insertions, 3 deletions
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<AMessage> &msg); -private: enum Flags { // Don't log any URLs. kFlagIncognito = 1, @@ -79,7 +78,7 @@ private: bool mHasMetadata; bool mMetadataSelected; - void onSessionNotify(const sp<AMessage> &msg); + virtual void onSessionNotify(const sp<AMessage> &msg); void pollForRawData( const sp<AMessage> &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<Surface> &wrapper); void performResumeDecoders(bool needNotify); - void onSourceNotify(const sp<AMessage> &msg); + virtual void onSourceNotify(const sp<AMessage> &msg); void onClosedCaptionNotify(const sp<AMessage> &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<AMessage> &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. |