resourcemanager: subclassify codecs into HW or SW
As part of refactoring the resource manager and the resources,
this change does the subclassification of codecs into
hardware of software.
Since, there is no change in the functionality or addition
or modifications of ResourceManagerService binder APIs,
this change is unflagged.
Bug: 289097671
Test: atest android.media.misc.cts.ResourceManagerTest
atest android.media.misc.cts.ResourceManagerMultiTest
/data/nativetest64/ResourceManagerService_test/ResourceManagerService_test
/data/nativetest64/ResourceObserverService_test/ResourceObserverService_test
Change-Id: Ia5e2607a541ee687b1b8bc0b9e3aeba7edb2a2c8
diff --git a/services/mediaresourcemanager/ResourceManagerMetrics.cpp b/services/mediaresourcemanager/ResourceManagerMetrics.cpp
index e26fd28..a4c05e9 100644
--- a/services/mediaresourcemanager/ResourceManagerMetrics.cpp
+++ b/services/mediaresourcemanager/ResourceManagerMetrics.cpp
@@ -46,9 +46,12 @@
inline const char* getCodecType(MediaResourceSubType codecType) {
switch (codecType) {
- case MediaResourceSubType::kAudioCodec: return "Audio";
- case MediaResourceSubType::kVideoCodec: return "Video";
- case MediaResourceSubType::kImageCodec: return "Image";
+ case MediaResourceSubType::kHwAudioCodec: return "Hw Audio";
+ case MediaResourceSubType::kSwAudioCodec: return "Sw Audio";
+ case MediaResourceSubType::kHwVideoCodec: return "Hw Video";
+ case MediaResourceSubType::kSwVideoCodec: return "Sw Video";
+ case MediaResourceSubType::kHwImageCodec: return "Hw Image";
+ case MediaResourceSubType::kSwImageCodec: return "Sw Image";
case MediaResourceSubType::kUnspecifiedSubType:
default:
return "Unspecified";
@@ -56,39 +59,29 @@
return "Unspecified";
}
-static CodecBucket getCodecBucket(bool isHardware,
- bool isEncoder,
- MediaResourceSubType codecType) {
- if (isHardware) {
- switch (codecType) {
- case MediaResourceSubType::kAudioCodec:
- if (isEncoder) return HwAudioEncoder;
- return HwAudioDecoder;
- case MediaResourceSubType::kVideoCodec:
- if (isEncoder) return HwVideoEncoder;
- return HwVideoDecoder;
- case MediaResourceSubType::kImageCodec:
- if (isEncoder) return HwImageEncoder;
- return HwImageDecoder;
- case MediaResourceSubType::kUnspecifiedSubType:
- default:
- return CodecBucketUnspecified;
- }
- } else {
- switch (codecType) {
- case MediaResourceSubType::kAudioCodec:
- if (isEncoder) return SwAudioEncoder;
- return SwAudioDecoder;
- case MediaResourceSubType::kVideoCodec:
- if (isEncoder) return SwVideoEncoder;
- return SwVideoDecoder;
- case MediaResourceSubType::kImageCodec:
- if (isEncoder) return SwImageEncoder;
- return SwImageDecoder;
- case MediaResourceSubType::kUnspecifiedSubType:
- default:
- return CodecBucketUnspecified;
- }
+inline bool isHardwareCodec(MediaResourceSubType codecType) {
+ return (codecType == MediaResourceSubType::kHwAudioCodec ||
+ codecType == MediaResourceSubType::kHwVideoCodec ||
+ codecType == MediaResourceSubType::kHwImageCodec);
+}
+
+static CodecBucket getCodecBucket(bool isEncoder, MediaResourceSubType codecType) {
+ switch (codecType) {
+ case MediaResourceSubType::kHwAudioCodec:
+ return isEncoder? HwAudioEncoder : HwAudioDecoder;
+ case MediaResourceSubType::kSwAudioCodec:
+ return isEncoder? SwAudioEncoder : SwAudioDecoder;
+ case MediaResourceSubType::kHwVideoCodec:
+ return isEncoder? HwVideoEncoder : HwVideoDecoder;
+ case MediaResourceSubType::kSwVideoCodec:
+ return isEncoder? SwVideoEncoder : SwVideoDecoder;
+ case MediaResourceSubType::kHwImageCodec:
+ return isEncoder? HwImageEncoder : HwImageDecoder;
+ case MediaResourceSubType::kSwImageCodec:
+ return isEncoder? SwImageEncoder : SwImageDecoder;
+ case MediaResourceSubType::kUnspecifiedSubType:
+ default:
+ return CodecBucketUnspecified;
}
return CodecBucketUnspecified;
@@ -179,8 +172,10 @@
std::scoped_lock lock(mLock);
ClientConfigMap::iterator entry = mClientConfigMap.find(clientConfig.clientInfo.id);
if (entry != mClientConfigMap.end() &&
- (clientConfig.codecType == MediaResourceSubType::kVideoCodec ||
- clientConfig.codecType == MediaResourceSubType::kImageCodec)) {
+ (clientConfig.codecType == MediaResourceSubType::kHwVideoCodec ||
+ clientConfig.codecType == MediaResourceSubType::kSwVideoCodec ||
+ clientConfig.codecType == MediaResourceSubType::kHwImageCodec ||
+ clientConfig.codecType == MediaResourceSubType::kSwImageCodec)) {
int pid = clientConfig.clientInfo.pid;
// Update the pixel count for this process
updatePixelCount(pid, clientConfig.width * (long)clientConfig.height,
@@ -201,13 +196,13 @@
mClientConfigMap[clientConfig.clientInfo.id] = clientConfig;
// Update the concurrent codec count for this process.
- CodecBucket codecBucket = getCodecBucket(clientConfig.isHardware,
- clientConfig.isEncoder,
- clientConfig.codecType);
+ CodecBucket codecBucket = getCodecBucket(clientConfig.isEncoder, clientConfig.codecType);
increaseConcurrentCodecs(pid, codecBucket);
- if (clientConfig.codecType == MediaResourceSubType::kVideoCodec ||
- clientConfig.codecType == MediaResourceSubType::kImageCodec) {
+ if (clientConfig.codecType == MediaResourceSubType::kHwVideoCodec ||
+ clientConfig.codecType == MediaResourceSubType::kSwVideoCodec ||
+ clientConfig.codecType == MediaResourceSubType::kHwImageCodec ||
+ clientConfig.codecType == MediaResourceSubType::kSwImageCodec) {
// Update the pixel count for this process
increasePixelCount(pid, clientConfig.width * (long)clientConfig.height);
}
@@ -236,7 +231,7 @@
clientConfig.clientInfo.name.c_str(),
static_cast<int32_t>(clientConfig.codecType),
clientConfig.isEncoder,
- clientConfig.isHardware,
+ isHardwareCodec(clientConfig.codecType),
clientConfig.width, clientConfig.height,
systemConcurrentCodecs,
appConcurrentCodecs,
@@ -249,7 +244,7 @@
ALOGV("%s: Pushed MEDIA_CODEC_STARTED atom: "
"Process[pid(%d): uid(%d)] "
- "Codec: [%s: %ju] is %s %s %s "
+ "Codec: [%s: %ju] is %s %s "
"Timestamp: %jd "
"Resolution: %d x %d "
"ConcurrentCodec[%d]={System: %d App: %d} "
@@ -259,7 +254,6 @@
pid, clientConfig.clientInfo.uid,
clientConfig.clientInfo.name.c_str(),
clientConfig.id,
- clientConfig.isHardware? "hardware" : "software",
getCodecType(clientConfig.codecType),
clientConfig.isEncoder? "encoder" : "decoder",
clientConfig.timeStamp,
@@ -273,13 +267,13 @@
std::scoped_lock lock(mLock);
int pid = clientConfig.clientInfo.pid;
// Update the concurrent codec count for this process.
- CodecBucket codecBucket = getCodecBucket(clientConfig.isHardware,
- clientConfig.isEncoder,
- clientConfig.codecType);
+ CodecBucket codecBucket = getCodecBucket(clientConfig.isEncoder, clientConfig.codecType);
decreaseConcurrentCodecs(pid, codecBucket);
- if (clientConfig.codecType == MediaResourceSubType::kVideoCodec ||
- clientConfig.codecType == MediaResourceSubType::kImageCodec) {
+ if (clientConfig.codecType == MediaResourceSubType::kHwVideoCodec ||
+ clientConfig.codecType == MediaResourceSubType::kSwVideoCodec ||
+ clientConfig.codecType == MediaResourceSubType::kHwImageCodec ||
+ clientConfig.codecType == MediaResourceSubType::kSwImageCodec) {
// Update the pixel count for this process
decreasePixelCount(pid, clientConfig.width * (long)clientConfig.height);
}
@@ -319,7 +313,7 @@
clientConfig.clientInfo.name.c_str(),
static_cast<int32_t>(clientConfig.codecType),
clientConfig.isEncoder,
- clientConfig.isHardware,
+ isHardwareCodec(clientConfig.codecType),
clientConfig.width, clientConfig.height,
systemConcurrentCodecs,
appConcurrentCodecs,
@@ -327,7 +321,7 @@
usageTime);
ALOGV("%s: Pushed MEDIA_CODEC_STOPPED atom: "
"Process[pid(%d): uid(%d)] "
- "Codec: [%s: %ju] is %s %s %s "
+ "Codec: [%s: %ju] is %s %s "
"Timestamp: %jd Usage time: %jd "
"Resolution: %d x %d "
"ConcurrentCodec[%d]={System: %d App: %d} "
@@ -336,7 +330,6 @@
pid, clientConfig.clientInfo.uid,
clientConfig.clientInfo.name.c_str(),
clientConfig.id,
- clientConfig.isHardware? "hardware" : "software",
getCodecType(clientConfig.codecType),
clientConfig.isEncoder? "encoder" : "decoder",
clientConfig.timeStamp, usageTime,
diff --git a/services/mediaresourcemanager/ResourceManagerService.cpp b/services/mediaresourcemanager/ResourceManagerService.cpp
index 9552e25..6c02b23 100644
--- a/services/mediaresourcemanager/ResourceManagerService.cpp
+++ b/services/mediaresourcemanager/ResourceManagerService.cpp
@@ -168,13 +168,16 @@
sp<IMediaResourceMonitor> service = interface_cast<IMediaResourceMonitor>(binder);
for (size_t i = 0; i < resources.size(); ++i) {
switch (resources[i].subType) {
- case MediaResource::SubType::kAudioCodec:
+ case MediaResource::SubType::kHwAudioCodec:
+ case MediaResource::SubType::kSwAudioCodec:
service->notifyResourceGranted(pid, IMediaResourceMonitor::TYPE_AUDIO_CODEC);
break;
- case MediaResource::SubType::kVideoCodec:
+ case MediaResource::SubType::kHwVideoCodec:
+ case MediaResource::SubType::kSwVideoCodec:
service->notifyResourceGranted(pid, IMediaResourceMonitor::TYPE_VIDEO_CODEC);
break;
- case MediaResource::SubType::kImageCodec:
+ case MediaResource::SubType::kHwImageCodec:
+ case MediaResource::SubType::kSwImageCodec:
service->notifyResourceGranted(pid, IMediaResourceMonitor::TYPE_IMAGE_CODEC);
break;
case MediaResource::SubType::kUnspecifiedSubType:
@@ -366,7 +369,8 @@
}
mCpuBoostCount++;
} else if (resource.type == MediaResource::Type::kBattery
- && resource.subType == MediaResource::SubType::kVideoCodec) {
+ && (resource.subType == MediaResource::SubType::kHwVideoCodec
+ || resource.subType == MediaResource::SubType::kSwVideoCodec)) {
mSystemCB->noteStartVideo(clientInfo.uid);
}
}
@@ -380,7 +384,8 @@
mSystemCB->requestCpusetBoost(false);
}
} else if (resource.type == MediaResource::Type::kBattery
- && resource.subType == MediaResource::SubType::kVideoCodec) {
+ && (resource.subType == MediaResource::SubType::kHwVideoCodec
+ || resource.subType == MediaResource::SubType::kSwVideoCodec)) {
mSystemCB->noteStopVideo(clientInfo.uid);
}
}
@@ -904,9 +909,12 @@
// Codec resources are segregated by audio, video and image domains.
case MediaResource::Type::kSecureCodec:
case MediaResource::Type::kNonSecureCodec:
- for (MediaResource::SubType subType : {MediaResource::SubType::kAudioCodec,
- MediaResource::SubType::kVideoCodec,
- MediaResource::SubType::kImageCodec}) {
+ for (MediaResource::SubType subType : {MediaResource::SubType::kHwAudioCodec,
+ MediaResource::SubType::kSwAudioCodec,
+ MediaResource::SubType::kHwVideoCodec,
+ MediaResource::SubType::kSwVideoCodec,
+ MediaResource::SubType::kHwImageCodec,
+ MediaResource::SubType::kSwImageCodec}) {
std::shared_ptr<IResourceManagerClient> client;
uid_t uid = 0;
if (getBiggestClientPendingRemoval_l(pid, type, subType, uid, &client)) {
diff --git a/services/mediaresourcemanager/ResourceObserverService.cpp b/services/mediaresourcemanager/ResourceObserverService.cpp
index 6c5cecf..72e249f 100644
--- a/services/mediaresourcemanager/ResourceObserverService.cpp
+++ b/services/mediaresourcemanager/ResourceObserverService.cpp
@@ -41,7 +41,8 @@
};
static MediaObservableType getObservableType(const MediaResourceParcel& res) {
- if (res.subType == MediaResourceSubType::kVideoCodec) {
+ if (res.subType == MediaResourceSubType::kHwVideoCodec ||
+ res.subType == MediaResourceSubType::kSwVideoCodec) {
if (res.type == MediaResourceType::kNonSecureCodec) {
return MediaObservableType::kVideoNonSecureCodec;
}
diff --git a/services/mediaresourcemanager/aidl/android/media/ClientConfigParcel.aidl b/services/mediaresourcemanager/aidl/android/media/ClientConfigParcel.aidl
index 3c9c8c7..699a272 100644
--- a/services/mediaresourcemanager/aidl/android/media/ClientConfigParcel.aidl
+++ b/services/mediaresourcemanager/aidl/android/media/ClientConfigParcel.aidl
@@ -40,11 +40,6 @@
*/
boolean isEncoder;
- /**
- * true if this is hardware codec, false otherwise.
- */
- boolean isHardware;
-
/*
* Video Resolution of the codec when it was configured, as width and height (in pixels).
*/
@@ -55,6 +50,7 @@
* Timestamp (in microseconds) when this configuration is created.
*/
long timeStamp;
+
/*
* ID associated with the Codec.
* This will be used by the metrics:
diff --git a/services/mediaresourcemanager/aidl/android/media/MediaResourceSubType.aidl b/services/mediaresourcemanager/aidl/android/media/MediaResourceSubType.aidl
index 72a0551..311b6c3 100644
--- a/services/mediaresourcemanager/aidl/android/media/MediaResourceSubType.aidl
+++ b/services/mediaresourcemanager/aidl/android/media/MediaResourceSubType.aidl
@@ -24,7 +24,10 @@
@Backing(type="int")
enum MediaResourceSubType {
kUnspecifiedSubType = 0,
- kAudioCodec = 1,
- kVideoCodec = 2,
- kImageCodec = 3,
+ kHwAudioCodec = 1,
+ kSwAudioCodec = 2,
+ kHwVideoCodec = 3,
+ kSwVideoCodec = 4,
+ kHwImageCodec = 5,
+ kSwImageCodec = 6,
}
diff --git a/services/mediaresourcemanager/aidl/android/media/MediaResourceType.aidl b/services/mediaresourcemanager/aidl/android/media/MediaResourceType.aidl
index b2bb71b..353e59c 100644
--- a/services/mediaresourcemanager/aidl/android/media/MediaResourceType.aidl
+++ b/services/mediaresourcemanager/aidl/android/media/MediaResourceType.aidl
@@ -24,10 +24,13 @@
@Backing(type="int")
enum MediaResourceType {
kUnspecified = 0,
+ // Codec resource type as secure or unsecure
kSecureCodec = 1,
kNonSecureCodec = 2,
+ // Other Codec resource types understood by the frameworks
kGraphicMemory = 3,
kCpuBoost = 4,
kBattery = 5,
+ // DRM Session resource type
kDrmSession = 6,
}
diff --git a/services/mediaresourcemanager/test/ResourceManagerService_test.cpp b/services/mediaresourcemanager/test/ResourceManagerService_test.cpp
index ae3faea..7df7d26 100644
--- a/services/mediaresourcemanager/test/ResourceManagerService_test.cpp
+++ b/services/mediaresourcemanager/test/ResourceManagerService_test.cpp
@@ -28,32 +28,32 @@
private:
static MediaResource createSecureVideoCodecResource(int amount = 1) {
return MediaResource(MediaResource::Type::kSecureCodec,
- MediaResource::SubType::kVideoCodec, amount);
+ MediaResource::SubType::kHwVideoCodec, amount);
}
static MediaResource createNonSecureVideoCodecResource(int amount = 1) {
return MediaResource(MediaResource::Type::kNonSecureCodec,
- MediaResource::SubType::kVideoCodec, amount);
+ MediaResource::SubType::kHwVideoCodec, amount);
}
static MediaResource createSecureAudioCodecResource(int amount = 1) {
return MediaResource(MediaResource::Type::kSecureCodec,
- MediaResource::SubType::kAudioCodec, amount);
+ MediaResource::SubType::kHwAudioCodec, amount);
}
static MediaResource createNonSecureAudioCodecResource(int amount = 1) {
return MediaResource(MediaResource::Type::kNonSecureCodec,
- MediaResource::SubType::kAudioCodec, amount);
+ MediaResource::SubType::kHwAudioCodec, amount);
}
static MediaResource createSecureImageCodecResource(int amount = 1) {
return MediaResource(MediaResource::Type::kSecureCodec,
- MediaResource::SubType::kImageCodec, amount);
+ MediaResource::SubType::kHwImageCodec, amount);
}
static MediaResource createNonSecureImageCodecResource(int amount = 1) {
return MediaResource(MediaResource::Type::kNonSecureCodec,
- MediaResource::SubType::kImageCodec, amount);
+ MediaResource::SubType::kHwImageCodec, amount);
}
static MediaResource createGraphicMemoryResource(int amount = 1) {
@@ -272,13 +272,15 @@
// test adding new types (including types that differs only in subType)
resources11.push_back(MediaResource(MediaResource::Type::kNonSecureCodec, 1));
- resources11.push_back(MediaResource(MediaResource::Type::kSecureCodec, MediaResource::SubType::kVideoCodec, 1));
+ resources11.push_back(MediaResource(MediaResource::Type::kSecureCodec,
+ MediaResource::SubType::kHwVideoCodec, 1));
mService->addResource(client1Info, mTestClient1, resources11);
expected.clear();
expected.push_back(MediaResource(MediaResource::Type::kSecureCodec, 2));
expected.push_back(MediaResource(MediaResource::Type::kNonSecureCodec, 1));
- expected.push_back(MediaResource(MediaResource::Type::kSecureCodec, MediaResource::SubType::kVideoCodec, 1));
+ expected.push_back(MediaResource(MediaResource::Type::kSecureCodec,
+ MediaResource::SubType::kHwVideoCodec, 1));
expected.push_back(MediaResource(MediaResource::Type::kGraphicMemory, 500));
expectEqResourceInfo(infos1.at(getId(mTestClient1)), kTestUid1, mTestClient1, expected);
}
@@ -811,7 +813,8 @@
// new client request should cause VIDEO_ON
std::vector<MediaResourceParcel> resources1;
- resources1.push_back(MediaResource(MediaResource::Type::kBattery, MediaResource::SubType::kVideoCodec, 1));
+ resources1.push_back(MediaResource(MediaResource::Type::kBattery,
+ MediaResource::SubType::kHwVideoCodec, 1));
ClientInfoParcel client1Info{.pid = static_cast<int32_t>(kTestPid1),
.uid = static_cast<int32_t>(kTestUid1),
.id = getId(mTestClient1),
@@ -826,7 +829,8 @@
// new client request should cause VIDEO_ON
std::vector<MediaResourceParcel> resources2;
- resources2.push_back(MediaResource(MediaResource::Type::kBattery, MediaResource::SubType::kVideoCodec, 2));
+ resources2.push_back(MediaResource(MediaResource::Type::kBattery,
+ MediaResource::SubType::kHwVideoCodec, 2));
ClientInfoParcel client2Info{.pid = static_cast<int32_t>(kTestPid2),
.uid = static_cast<int32_t>(kTestUid2),
.id = getId(mTestClient2),
@@ -1372,9 +1376,9 @@
int64_t id,
const ClientInfoParcel& clientInfo,
ClientConfigParcel& clientConfig) {
- clientConfig.codecType = MediaResource::SubType::kVideoCodec;
+ clientConfig.codecType = hw? MediaResource::SubType::kHwVideoCodec :
+ MediaResource::SubType::kSwVideoCodec;
clientConfig.isEncoder = encoder;
- clientConfig.isHardware = hw;
clientConfig.width = width;
clientConfig.height = height;
clientConfig.timeStamp = systemTime(SYSTEM_TIME_MONOTONIC) / 1000LL;
diff --git a/services/mediaresourcemanager/test/ResourceObserverService_test.cpp b/services/mediaresourcemanager/test/ResourceObserverService_test.cpp
index 85769d5..3f8ed2a 100644
--- a/services/mediaresourcemanager/test/ResourceObserverService_test.cpp
+++ b/services/mediaresourcemanager/test/ResourceObserverService_test.cpp
@@ -118,22 +118,22 @@
static MediaResource createSecureVideoCodecResource(int amount = 1) {
return MediaResource(MediaResource::Type::kSecureCodec,
- MediaResource::SubType::kVideoCodec, amount);
+ MediaResource::SubType::kHwVideoCodec, amount);
}
static MediaResource createNonSecureVideoCodecResource(int amount = 1) {
return MediaResource(MediaResource::Type::kNonSecureCodec,
- MediaResource::SubType::kVideoCodec, amount);
+ MediaResource::SubType::kHwVideoCodec, amount);
}
static MediaResource createSecureAudioCodecResource(int amount = 1) {
return MediaResource(MediaResource::Type::kSecureCodec,
- MediaResource::SubType::kAudioCodec, amount);
+ MediaResource::SubType::kHwAudioCodec, amount);
}
static MediaResource createNonSecureAudioCodecResource(int amount = 1) {
return MediaResource(MediaResource::Type::kNonSecureCodec,
- MediaResource::SubType::kAudioCodec, amount);
+ MediaResource::SubType::kHwAudioCodec, amount);
}
// Operators for GTest macros.