summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice/MediaPlayerFactory.cpp
diff options
context:
space:
mode:
authorManikanta Sivapala <msivap@codeaurora.org>2015-07-21 19:33:40 +0530
committerLinux Build Service Account <lnxbuild@localhost>2015-10-06 03:24:32 -0600
commitc9792cdfba32fd517b7940d5d1a2a93496afb80c (patch)
tree66c297f3339f844d43faab2391e3b76c191023fd /media/libmediaplayerservice/MediaPlayerFactory.cpp
parent15019fc4fb84fef2c50274c6d10907e3a6dd14aa (diff)
downloadframeworks_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/libmediaplayerservice/MediaPlayerFactory.cpp')
-rw-r--r--media/libmediaplayerservice/MediaPlayerFactory.cpp8
1 files changed, 8 insertions, 0 deletions
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;
}