summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice/MediaPlayerFactory.cpp
diff options
context:
space:
mode:
authorRonghua Wu <ronghuawu@google.com>2015-07-21 09:50:48 -0700
committerRonghua Wu <ronghuawu@google.com>2015-07-21 19:04:41 -0700
commit68845c14ebf2c7282800b1abffde38d8e9a57aab (patch)
treec4e924999d0ed48ae4c1a08d44777cbc5b161906 /media/libmediaplayerservice/MediaPlayerFactory.cpp
parentf8f669d7a727e4ad5505cd85741f4d50dbaffbf9 (diff)
downloadframeworks_av-68845c14ebf2c7282800b1abffde38d8e9a57aab.zip
frameworks_av-68845c14ebf2c7282800b1abffde38d8e9a57aab.tar.gz
frameworks_av-68845c14ebf2c7282800b1abffde38d8e9a57aab.tar.bz2
libmediaplayerservice: propagate caller pid to MediaCodec.
Bug: 22630317 Change-Id: I0337d74f4ef04bf96f2de83f33d98d0d7da47c12
Diffstat (limited to 'media/libmediaplayerservice/MediaPlayerFactory.cpp')
-rw-r--r--media/libmediaplayerservice/MediaPlayerFactory.cpp13
1 files changed, 7 insertions, 6 deletions
diff --git a/media/libmediaplayerservice/MediaPlayerFactory.cpp b/media/libmediaplayerservice/MediaPlayerFactory.cpp
index e8d495b..d5d12f7 100644
--- a/media/libmediaplayerservice/MediaPlayerFactory.cpp
+++ b/media/libmediaplayerservice/MediaPlayerFactory.cpp
@@ -135,7 +135,8 @@ player_type MediaPlayerFactory::getPlayerType(const sp<IMediaPlayer>& client,
sp<MediaPlayerBase> MediaPlayerFactory::createPlayer(
player_type playerType,
void* cookie,
- notify_callback_f notifyFunc) {
+ notify_callback_f notifyFunc,
+ pid_t pid) {
sp<MediaPlayerBase> p;
IFactory* factory;
status_t init_result;
@@ -149,7 +150,7 @@ sp<MediaPlayerBase> MediaPlayerFactory::createPlayer(
factory = sFactoryMap.valueFor(playerType);
CHECK(NULL != factory);
- p = factory->createPlayer();
+ p = factory->createPlayer(pid);
if (p == NULL) {
ALOGE("Failed to create player object of type %d, create failed",
@@ -217,7 +218,7 @@ class StagefrightPlayerFactory :
return 0.0;
}
- virtual sp<MediaPlayerBase> createPlayer() {
+ virtual sp<MediaPlayerBase> createPlayer(pid_t /* pid */) {
ALOGV(" create StagefrightPlayer");
return new StagefrightPlayer();
}
@@ -279,9 +280,9 @@ class NuPlayerFactory : public MediaPlayerFactory::IFactory {
return 1.0;
}
- virtual sp<MediaPlayerBase> createPlayer() {
+ virtual sp<MediaPlayerBase> createPlayer(pid_t pid) {
ALOGV(" create NuPlayer");
- return new NuPlayerDriver;
+ return new NuPlayerDriver(pid);
}
};
@@ -297,7 +298,7 @@ class TestPlayerFactory : public MediaPlayerFactory::IFactory {
return 0.0;
}
- virtual sp<MediaPlayerBase> createPlayer() {
+ virtual sp<MediaPlayerBase> createPlayer(pid_t /* pid */) {
ALOGV("Create Test Player stub");
return new TestPlayerStub();
}