diff options
| author | Manikanta Sivapala <msivap@codeaurora.org> | 2015-07-21 19:33:40 +0530 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2015-10-06 03:24:32 -0600 |
| commit | c9792cdfba32fd517b7940d5d1a2a93496afb80c (patch) | |
| tree | 66c297f3339f844d43faab2391e3b76c191023fd /media | |
| parent | 15019fc4fb84fef2c50274c6d10907e3a6dd14aa (diff) | |
| download | frameworks_av-c9792cdfba32fd517b7940d5d1a2a93496afb80c.zip frameworks_av-c9792cdfba32fd517b7940d5d1a2a93496afb80c.tar.gz frameworks_av-c9792cdfba32fd517b7940d5d1a2a93496afb80c.tar.bz2 | |
frameworks/av: Changes related to DASH
1) Add MEDIA_QOE event type
2) Open certain methods for extension by declaring them as virtual
3) Add DASH_PLAYER as a new player type
4) Creating DASH Player factory
Change-Id: I0376841530218703fabd9d4f45d2c9a32a1f52b2
Diffstat (limited to 'media')
| -rw-r--r-- | media/libavextensions/mediaplayerservice/AVMediaServiceExtensions.h | 4 | ||||
| -rw-r--r-- | media/libmediaplayerservice/MediaPlayerFactory.cpp | 8 | ||||
| -rw-r--r-- | media/libstagefright/rtsp/Android.mk | 5 |
3 files changed, 13 insertions, 4 deletions
diff --git a/media/libavextensions/mediaplayerservice/AVMediaServiceExtensions.h b/media/libavextensions/mediaplayerservice/AVMediaServiceExtensions.h index 5c31fad..d84344e 100644 --- a/media/libavextensions/mediaplayerservice/AVMediaServiceExtensions.h +++ b/media/libavextensions/mediaplayerservice/AVMediaServiceExtensions.h @@ -30,7 +30,7 @@ #define _AV_MEDIA_SERVICE_EXTENSIONS_H_ #include <common/AVExtensionsCommon.h> - +#include <MediaPlayerFactory.h> #include <utils/RefBase.h> #include <utils/String16.h> @@ -60,7 +60,7 @@ struct AVMediaServiceFactory { * Common delegate to the classes in libmediaplayerservice */ struct AVMediaServiceUtils { - + virtual void getDashPlayerFactory(MediaPlayerFactory::IFactory *&, player_type ) {} // RTSP IPV6 utils virtual bool pokeAHole(sp<MyHandler> handler, int rtpSocket, int rtcpSocket, const AString &transport, const AString &sessionHost); diff --git a/media/libmediaplayerservice/MediaPlayerFactory.cpp b/media/libmediaplayerservice/MediaPlayerFactory.cpp index 1be86d0..f0afc5a 100644 --- a/media/libmediaplayerservice/MediaPlayerFactory.cpp +++ b/media/libmediaplayerservice/MediaPlayerFactory.cpp @@ -32,6 +32,7 @@ #include "TestPlayerStub.h" #include "nuplayer/NuPlayerDriver.h" +#include <mediaplayerservice/AVMediaServiceExtensions.h> namespace android { @@ -241,6 +242,8 @@ class TestPlayerFactory : public MediaPlayerFactory::IFactory { }; void MediaPlayerFactory::registerBuiltinFactories() { + + MediaPlayerFactory::IFactory* pCustomFactory = NULL; Mutex::Autolock lock_(&sLock); if (sInitComplete) @@ -248,6 +251,11 @@ void MediaPlayerFactory::registerBuiltinFactories() { registerFactory_l(new NuPlayerFactory(), NU_PLAYER); registerFactory_l(new TestPlayerFactory(), TEST_PLAYER); + AVMediaServiceUtils::get()->getDashPlayerFactory(pCustomFactory, DASH_PLAYER); + if(pCustomFactory != NULL) { + ALOGV("Registering DASH_PLAYER"); + registerFactory_l(pCustomFactory, DASH_PLAYER); + } sInitComplete = true; } diff --git a/media/libstagefright/rtsp/Android.mk b/media/libstagefright/rtsp/Android.mk index 28c6fb6..8bc4295 100644 --- a/media/libstagefright/rtsp/Android.mk +++ b/media/libstagefright/rtsp/Android.mk @@ -22,9 +22,10 @@ LOCAL_SRC_FILES:= \ LOCAL_SHARED_LIBRARIES += libcrypto LOCAL_C_INCLUDES:= \ - $(TOP)/frameworks/av/media/libstagefright \ + $(TOP)/frameworks/av/media/libstagefright \ $(TOP)/frameworks/av/media/libavextensions \ - $(TOP)/frameworks/native/include/media/openmax + $(TOP)/frameworks/native/include/media/openmax \ + $(TOP)/frameworks/av/media/libmediaplayerservice \ LOCAL_MODULE:= libstagefright_rtsp |