summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorRonghua Wu <ronghuawu@google.com>2015-07-15 12:23:48 -0700
committerRonghua Wu <ronghuawu@google.com>2015-07-17 10:19:21 -0700
commit37c8924c508a7c9b8bd3c8ce80fc005070531902 (patch)
tree0ed47e0ceb97bcdf6169e1189f0f555b6c2bd89c /include
parent495151d3f4c5f92f1d162efb32b636521c105df5 (diff)
downloadframeworks_av-37c8924c508a7c9b8bd3c8ce80fc005070531902.zip
frameworks_av-37c8924c508a7c9b8bd3c8ce80fc005070531902.tar.gz
frameworks_av-37c8924c508a7c9b8bd3c8ce80fc005070531902.tar.bz2
mediaresourcemanager: add pid to removeResource method
Bug: 22496209 Change-Id: I73311573e8d1ac15fec668a9ef6e6af7a07a1d30
Diffstat (limited to 'include')
-rw-r--r--include/media/IResourceManagerService.h2
-rw-r--r--include/media/stagefright/MediaCodec.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/include/media/IResourceManagerService.h b/include/media/IResourceManagerService.h
index 067392c..1e4f6de 100644
--- a/include/media/IResourceManagerService.h
+++ b/include/media/IResourceManagerService.h
@@ -43,7 +43,7 @@ public:
const sp<IResourceManagerClient> client,
const Vector<MediaResource> &resources) = 0;
- virtual void removeResource(int64_t clientId) = 0;
+ virtual void removeResource(int pid, int64_t clientId) = 0;
virtual bool reclaimResource(
int callingPid,
diff --git a/include/media/stagefright/MediaCodec.h b/include/media/stagefright/MediaCodec.h
index 09cbe8f..b1dc278 100644
--- a/include/media/stagefright/MediaCodec.h
+++ b/include/media/stagefright/MediaCodec.h
@@ -260,18 +260,18 @@ private:
virtual void binderDied(const wp<IBinder>& /*who*/);
void addResource(
- int pid,
int64_t clientId,
const sp<IResourceManagerClient> client,
const Vector<MediaResource> &resources);
void removeResource(int64_t clientId);
- bool reclaimResource(int callingPid, const Vector<MediaResource> &resources);
+ bool reclaimResource(const Vector<MediaResource> &resources);
private:
Mutex mLock;
sp<IResourceManagerService> mService;
+ int mPid;
};
State mState;