Merge changes from topic "aidlize-audioflinger"
* changes:
Remove manual parceling from Interpolator and VolumeShaper
Make use of AIDL unions.
Convert AudioFlinger create* arguments to AIDL
Small fixes to AidlConversion
Correctly set offload info in AudioTrack
diff --git a/media/extractors/mp4/MPEG4Extractor.cpp b/media/extractors/mp4/MPEG4Extractor.cpp
index 42bfc39..cd70869 100644
--- a/media/extractors/mp4/MPEG4Extractor.cpp
+++ b/media/extractors/mp4/MPEG4Extractor.cpp
@@ -4386,7 +4386,7 @@
const uint8_t *ptr = (const uint8_t *)data;
- if (size < 5 || ptr[0] != 0x81) { // configurationVersion == 1
+ if (size < 4 || ptr[0] != 0x81) { // configurationVersion == 1
return NULL;
}
if (!strcasecmp(mime, MEDIA_MIMETYPE_IMAGE_AVIF)) {
diff --git a/services/mediaresourcemanager/ResourceManagerService.cpp b/services/mediaresourcemanager/ResourceManagerService.cpp
index 7bb606e..32ac583 100644
--- a/services/mediaresourcemanager/ResourceManagerService.cpp
+++ b/services/mediaresourcemanager/ResourceManagerService.cpp
@@ -511,8 +511,8 @@
resource.value -= res.value;
} else {
onLastRemoved(res, info);
- info.resources.erase(resType);
actualRemoved.value = resource.value;
+ info.resources.erase(resType);
}
// Add it to the list of removed resources for observers.