Merge "Convert FLAC Extractor to V3 format"
diff --git a/services/audiopolicy/common/managerdefinitions/include/AudioPolicyConfig.h b/services/audiopolicy/common/managerdefinitions/include/AudioPolicyConfig.h
index d1a0f9b..5099ebb 100644
--- a/services/audiopolicy/common/managerdefinitions/include/AudioPolicyConfig.h
+++ b/services/audiopolicy/common/managerdefinitions/include/AudioPolicyConfig.h
@@ -176,7 +176,8 @@
AUDIO_FORMAT_AAC_HE_V1, AUDIO_FORMAT_AAC_HE_V2, AUDIO_FORMAT_AAC_ELD,
AUDIO_FORMAT_AAC_XHE}},
{AUDIO_FORMAT_DOLBY_TRUEHD, {}},
- {AUDIO_FORMAT_E_AC3_JOC, {}}};
+ {AUDIO_FORMAT_E_AC3_JOC, {}},
+ {AUDIO_FORMAT_AC4, {}}};
}
private:
diff --git a/services/audiopolicy/config/audio_policy_configuration.xml b/services/audiopolicy/config/audio_policy_configuration.xml
index 1d037c3..b5ecbf9 100644
--- a/services/audiopolicy/config/audio_policy_configuration.xml
+++ b/services/audiopolicy/config/audio_policy_configuration.xml
@@ -198,7 +198,7 @@
<!-- End of Volume section -->
- <?disabledUntilHalV4_1
+ <?disabledUntilHalV5_0
<!-- Surround configuration -->
<surroundSound>
@@ -214,6 +214,7 @@
<format name="AUDIO_FORMAT_DTS" />
<format name="AUDIO_FORMAT_DTS_HD" />
<format name="AUDIO_FORMAT_AAC_LC" subformats="AUDIO_FORMAT_AAC_HE_V1 AUDIO_FORMAT_AAC_HE_V2 AUDIO_FORMAT_AAC_ELD AUDIO_FORMAT_AAC_XHE" />
+ <format name="AUDIO_FORMAT_AC4" />
</formats>
</surroundSound>
diff --git a/services/audiopolicy/config/msd_audio_policy_configuration.xml b/services/audiopolicy/config/msd_audio_policy_configuration.xml
index a811f5e..db17bc6 100644
--- a/services/audiopolicy/config/msd_audio_policy_configuration.xml
+++ b/services/audiopolicy/config/msd_audio_policy_configuration.xml
@@ -32,6 +32,9 @@
<profile name="" format="AUDIO_FORMAT_E_AC3"
samplingRates="32000,44100,48000"
channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_5POINT1,AUDIO_CHANNEL_OUT_7POINT1"/>
+ <profile name="" format="AUDIO_FORMAT_E_AC3_JOC"
+ samplingRates="32000,44100,48000"
+ channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_5POINT1,AUDIO_CHANNEL_OUT_7POINT1"/>
<profile name="" format="AUDIO_FORMAT_AC4"
samplingRates="32000,44100,48000"
channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_5POINT1,AUDIO_CHANNEL_OUT_7POINT1"/>
@@ -50,6 +53,18 @@
<devicePort tagName="MS12 Input" type="AUDIO_DEVICE_OUT_BUS" role="sink">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+ <profile name="" format="AUDIO_FORMAT_AC3"
+ samplingRates="32000,44100,48000"
+ channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_5POINT1"/>
+ <profile name="" format="AUDIO_FORMAT_E_AC3"
+ samplingRates="32000,44100,48000"
+ channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_5POINT1,AUDIO_CHANNEL_OUT_7POINT1"/>
+ <profile name="" format="AUDIO_FORMAT_E_AC3_JOC"
+ samplingRates="32000,44100,48000"
+ channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_5POINT1,AUDIO_CHANNEL_OUT_7POINT1"/>
+ <profile name="" format="AUDIO_FORMAT_AC4"
+ samplingRates="32000,44100,48000"
+ channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_5POINT1,AUDIO_CHANNEL_OUT_7POINT1"/>
</devicePort>
<devicePort tagName="MS12 Output" type="AUDIO_DEVICE_IN_BUS" role="source">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
index 0041570..c50839d 100644
--- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
@@ -217,7 +217,8 @@
audio_devices_t newDevice = getNewOutputDevice(mPrimaryOutput, false /*fromCache*/);
updateCallRouting(newDevice);
}
- const audio_devices_t msdOutDevice = getMsdAudioOutDeviceTypes();
+ const audio_devices_t msdOutDevice = getModuleDeviceTypes(
+ mAvailableOutputDevices, AUDIO_HARDWARE_MODULE_ID_MSD);
for (size_t i = 0; i < mOutputs.size(); i++) {
sp<SwAudioOutputDescriptor> desc = mOutputs.valueAt(i);
if ((mEngine->getPhoneState() != AUDIO_MODE_IN_CALL) || (desc != mPrimaryOutput)) {
@@ -526,6 +527,24 @@
return deviceList.itemAt(0);
}
+audio_devices_t AudioPolicyManager::getModuleDeviceTypes(
+ const DeviceVector& devices, const char *moduleId) const {
+ sp<HwModule> mod = mHwModules.getModuleFromName(moduleId);
+ return mod != 0 ? devices.getDeviceTypesFromHwModule(mod->getHandle()) : AUDIO_DEVICE_NONE;
+}
+
+bool AudioPolicyManager::isDeviceOfModule(
+ const sp<DeviceDescriptor>& devDesc, const char *moduleId) const {
+ sp<HwModule> module = mHwModules.getModuleFromName(moduleId);
+ if (module != 0) {
+ return mAvailableOutputDevices.getDevicesFromHwModule(module->getHandle())
+ .indexOf(devDesc) != NAME_NOT_FOUND
+ || mAvailableInputDevices.getDevicesFromHwModule(module->getHandle())
+ .indexOf(devDesc) != NAME_NOT_FOUND;
+ }
+ return false;
+}
+
void AudioPolicyManager::setPhoneState(audio_mode_t state)
{
ALOGV("setPhoneState() state %d", state);
@@ -771,7 +790,8 @@
routing_strategy strategy;
audio_devices_t device;
const audio_port_handle_t requestedDeviceId = *selectedDeviceId;
- audio_devices_t msdDevice = getMsdAudioOutDeviceTypes();
+ audio_devices_t msdDevice =
+ getModuleDeviceTypes(mAvailableOutputDevices, AUDIO_HARDWARE_MODULE_ID_MSD);
// The supplied portId must be AUDIO_PORT_HANDLE_NONE
if (*portId != AUDIO_PORT_HANDLE_NONE) {
@@ -1084,14 +1104,6 @@
return 0;
}
-audio_devices_t AudioPolicyManager::getMsdAudioOutDeviceTypes() const {
- sp<HwModule> msdModule = mHwModules.getModuleFromName(AUDIO_HARDWARE_MODULE_ID_MSD);
- if (msdModule != 0) {
- return mAvailableOutputDevices.getDeviceTypesFromHwModule(msdModule->getHandle());
- }
- return AUDIO_DEVICE_NONE;
-}
-
const AudioPatchCollection AudioPolicyManager::getMsdPatches() const {
AudioPatchCollection msdPatches;
sp<HwModule> msdModule = mHwModules.getModuleFromName(AUDIO_HARDWARE_MODULE_ID_MSD);
@@ -2669,6 +2681,19 @@
return res;
}
+void AudioPolicyManager::dumpManualSurroundFormats(String8 *dst) const
+{
+ size_t i = 0;
+ constexpr size_t audioFormatPrefixLen = sizeof("AUDIO_FORMAT_");
+ for (const auto& fmt : mManualSurroundFormats) {
+ if (i++ != 0) dst->append(", ");
+ std::string sfmt;
+ FormatConverter::toString(fmt, sfmt);
+ dst->append(sfmt.size() >= audioFormatPrefixLen ?
+ sfmt.c_str() + audioFormatPrefixLen - 1 : sfmt.c_str());
+ }
+}
+
void AudioPolicyManager::dump(String8 *dst) const
{
dst->appendFormat("\nAudioPolicyManager Dump: %p\n", this);
@@ -2682,8 +2707,15 @@
"HDMI system audio", "encoded surround output", "vibrate ringing" };
for (audio_policy_force_use_t i = AUDIO_POLICY_FORCE_FOR_COMMUNICATION;
i < AUDIO_POLICY_FORCE_USE_CNT; i = (audio_policy_force_use_t)((int)i + 1)) {
- dst->appendFormat(" Force use for %s: %d\n",
- forceUses[i], mEngine->getForceUse(i));
+ audio_policy_forced_cfg_t forceUseValue = mEngine->getForceUse(i);
+ dst->appendFormat(" Force use for %s: %d", forceUses[i], forceUseValue);
+ if (i == AUDIO_POLICY_FORCE_FOR_ENCODED_SURROUND &&
+ forceUseValue == AUDIO_POLICY_FORCE_ENCODED_SURROUND_MANUAL) {
+ dst->append(" (MANUAL: ");
+ dumpManualSurroundFormats(dst);
+ dst->append(")");
+ }
+ dst->append("\n");
}
dst->appendFormat(" TTS output %savailable\n", mTtsOutputAvailable ? "" : "not ");
dst->appendFormat(" Master mono: %s\n", mMasterMono ? "on" : "off");
@@ -2698,17 +2730,6 @@
mAudioPatches.dump(dst);
mPolicyMixes.dump(dst);
mAudioSources.dump(dst);
- if (!mSurroundFormats.empty()) {
- dst->append("\nEnabled Surround Formats:\n");
- size_t i = 0;
- for (const auto& fmt : mSurroundFormats) {
- dst->append(i++ == 0 ? " " : ", ");
- std::string sfmt;
- FormatConverter::toString(fmt, sfmt);
- dst->append(sfmt.c_str());
- }
- dst->append("\n");
- }
}
status_t AudioPolicyManager::dump(int fd)
@@ -3568,63 +3589,56 @@
(surroundFormats == NULL || surroundFormatsEnabled == NULL))) {
return BAD_VALUE;
}
- ALOGV("getSurroundFormats() numSurroundFormats %d surroundFormats %p surroundFormatsEnabled %p"
- " reported %d", *numSurroundFormats, surroundFormats, surroundFormatsEnabled, reported);
-
- // Only return value if there is HDMI output.
- if ((mAvailableOutputDevices.types() & AUDIO_DEVICE_OUT_HDMI) == 0) {
- return INVALID_OPERATION;
- }
+ ALOGV("%s() numSurroundFormats %d surroundFormats %p surroundFormatsEnabled %p reported %d",
+ __func__, *numSurroundFormats, surroundFormats, surroundFormatsEnabled, reported);
size_t formatsWritten = 0;
size_t formatsMax = *numSurroundFormats;
- *numSurroundFormats = 0;
- std::unordered_set<audio_format_t> formats;
+ std::unordered_set<audio_format_t> formats; // Uses primary surround formats only
if (reported) {
- // Return formats from HDMI profiles, that have already been resolved by
+ // Return formats from all device profiles that have already been resolved by
// checkOutputsForDevice().
- DeviceVector hdmiOutputDevs = mAvailableOutputDevices.getDevicesFromTypeMask(
- AUDIO_DEVICE_OUT_HDMI);
- for (size_t i = 0; i < hdmiOutputDevs.size(); i++) {
- FormatVector supportedFormats =
- hdmiOutputDevs[i]->getAudioPort()->getAudioProfiles().getSupportedFormats();
- for (size_t j = 0; j < supportedFormats.size(); j++) {
- if (mConfig.getSurroundFormats().count(supportedFormats[j]) != 0) {
- formats.insert(supportedFormats[j]);
- } else {
- for (const auto& pair : mConfig.getSurroundFormats()) {
- if (pair.second.count(supportedFormats[j]) != 0) {
- formats.insert(pair.first);
- break;
- }
- }
- }
- }
+ for (size_t i = 0; i < mAvailableOutputDevices.size(); i++) {
+ sp<DeviceDescriptor> device = mAvailableOutputDevices[i];
+ FormatVector supportedFormats =
+ device->getAudioPort()->getAudioProfiles().getSupportedFormats();
+ for (size_t j = 0; j < supportedFormats.size(); j++) {
+ if (mConfig.getSurroundFormats().count(supportedFormats[j]) != 0) {
+ formats.insert(supportedFormats[j]);
+ } else {
+ for (const auto& pair : mConfig.getSurroundFormats()) {
+ if (pair.second.count(supportedFormats[j]) != 0) {
+ formats.insert(pair.first);
+ break;
+ }
+ }
+ }
+ }
}
} else {
for (const auto& pair : mConfig.getSurroundFormats()) {
formats.insert(pair.first);
}
}
+ *numSurroundFormats = formats.size();
+ audio_policy_forced_cfg_t forceUse = mEngine->getForceUse(
+ AUDIO_POLICY_FORCE_FOR_ENCODED_SURROUND);
for (const auto& format: formats) {
if (formatsWritten < formatsMax) {
surroundFormats[formatsWritten] = format;
- bool formatEnabled = false;
- if (mConfig.getSurroundFormats().count(format) == 0) {
- // Check sub-formats
- for (const auto& pair : mConfig.getSurroundFormats()) {
- for (const auto& subformat : pair.second) {
- formatEnabled = mSurroundFormats.count(subformat) != 0;
- if (formatEnabled) break;
- }
- if (formatEnabled) break;
- }
- } else {
- formatEnabled = mSurroundFormats.count(format) != 0;
+ bool formatEnabled = true;
+ switch (forceUse) {
+ case AUDIO_POLICY_FORCE_ENCODED_SURROUND_MANUAL:
+ formatEnabled = mManualSurroundFormats.count(format) != 0;
+ break;
+ case AUDIO_POLICY_FORCE_ENCODED_SURROUND_NEVER:
+ formatEnabled = false;
+ break;
+ default: // AUTO or ALWAYS => true
+ break;
}
surroundFormatsEnabled[formatsWritten++] = formatEnabled;
}
- (*numSurroundFormats)++;
}
return NO_ERROR;
}
@@ -3632,41 +3646,32 @@
status_t AudioPolicyManager::setSurroundFormatEnabled(audio_format_t audioFormat, bool enabled)
{
ALOGV("%s() format 0x%X enabled %d", __func__, audioFormat, enabled);
- // Check if audio format is a surround formats.
const auto& formatIter = mConfig.getSurroundFormats().find(audioFormat);
if (formatIter == mConfig.getSurroundFormats().end()) {
ALOGW("%s() format 0x%X is not a known surround format", __func__, audioFormat);
return BAD_VALUE;
}
- // Should only be called when MANUAL.
- audio_policy_forced_cfg_t forceUse = mEngine->getForceUse(
- AUDIO_POLICY_FORCE_FOR_ENCODED_SURROUND);
- if (forceUse != AUDIO_POLICY_FORCE_ENCODED_SURROUND_MANUAL) {
+ if (mEngine->getForceUse(AUDIO_POLICY_FORCE_FOR_ENCODED_SURROUND) !=
+ AUDIO_POLICY_FORCE_ENCODED_SURROUND_MANUAL) {
ALOGW("%s() not in manual mode for surround sound format selection", __func__);
return INVALID_OPERATION;
}
- if ((mSurroundFormats.count(audioFormat) != 0) == enabled) {
+ if ((mManualSurroundFormats.count(audioFormat) != 0) == enabled) {
return NO_ERROR;
}
- // The operation is valid only when there is HDMI output available.
- if ((mAvailableOutputDevices.types() & AUDIO_DEVICE_OUT_HDMI) == 0) {
- ALOGW("%s() no HDMI out devices found", __func__);
- return INVALID_OPERATION;
- }
-
- std::unordered_set<audio_format_t> surroundFormatsBackup(mSurroundFormats);
+ std::unordered_set<audio_format_t> surroundFormatsBackup(mManualSurroundFormats);
if (enabled) {
- mSurroundFormats.insert(audioFormat);
+ mManualSurroundFormats.insert(audioFormat);
for (const auto& subFormat : formatIter->second) {
- mSurroundFormats.insert(subFormat);
+ mManualSurroundFormats.insert(subFormat);
}
} else {
- mSurroundFormats.erase(audioFormat);
+ mManualSurroundFormats.erase(audioFormat);
for (const auto& subFormat : formatIter->second) {
- mSurroundFormats.erase(subFormat);
+ mManualSurroundFormats.erase(subFormat);
}
}
@@ -3691,6 +3696,7 @@
name.c_str());
profileUpdated |= (status == NO_ERROR);
}
+ // FIXME: Why doing this for input HDMI devices if we don't augment their reported formats?
DeviceVector hdmiInputDevices = mAvailableInputDevices.getDevicesFromTypeMask(
AUDIO_DEVICE_IN_HDMI);
for (size_t i = 0; i < hdmiInputDevices.size(); i++) {
@@ -3713,7 +3719,7 @@
if (!profileUpdated) {
ALOGW("%s() no audio profiles updated, undoing surround formats change", __func__);
- mSurroundFormats = std::move(surroundFormatsBackup);
+ mManualSurroundFormats = std::move(surroundFormatsBackup);
}
return profileUpdated ? NO_ERROR : INVALID_OPERATION;
@@ -4091,7 +4097,7 @@
mInputs.clear();
mHwModules.clear();
mHwModulesAll.clear();
- mSurroundFormats.clear();
+ mManualSurroundFormats.clear();
}
status_t AudioPolicyManager::initCheck()
@@ -4557,7 +4563,7 @@
// MSD patches may have been released to support a non-MSD direct output. Reset MSD patch if
// no direct outputs are open.
- if (getMsdAudioOutDeviceTypes() != AUDIO_DEVICE_NONE) {
+ if (mHwModules.getModuleFromName(AUDIO_HARDWARE_MODULE_ID_MSD) != 0) {
bool directOutputOpen = false;
for (size_t i = 0; i < mOutputs.size(); i++) {
if (mOutputs[i]->mFlags & AUDIO_OUTPUT_FLAG_DIRECT) {
@@ -5792,56 +5798,52 @@
void AudioPolicyManager::modifySurroundFormats(
const sp<DeviceDescriptor>& devDesc, FormatVector *formatsPtr) {
- // Use a set because FormatVector is unsorted.
std::unordered_set<audio_format_t> enforcedSurround(
devDesc->encodedFormats().begin(), devDesc->encodedFormats().end());
+ std::unordered_set<audio_format_t> allSurround; // A flat set of all known surround formats
+ for (const auto& pair : mConfig.getSurroundFormats()) {
+ allSurround.insert(pair.first);
+ for (const auto& subformat : pair.second) allSurround.insert(subformat);
+ }
audio_policy_forced_cfg_t forceUse = mEngine->getForceUse(
AUDIO_POLICY_FORCE_FOR_ENCODED_SURROUND);
ALOGD("%s: forced use = %d", __FUNCTION__, forceUse);
+ // This is the resulting set of formats depending on the surround mode:
+ // 'all surround' = allSurround
+ // 'enforced surround' = enforcedSurround [may include IEC69137 which isn't raw surround fmt]
+ // 'non-surround' = not in 'all surround' and not in 'enforced surround'
+ // 'manual surround' = mManualSurroundFormats
+ // AUTO: formats v 'enforced surround'
+ // ALWAYS: formats v 'all surround' v 'enforced surround'
+ // NEVER: formats ^ 'non-surround'
+ // MANUAL: formats ^ ('non-surround' v 'manual surround' v (IEC69137 ^ 'enforced surround'))
std::unordered_set<audio_format_t> formatSet;
if (forceUse == AUDIO_POLICY_FORCE_ENCODED_SURROUND_MANUAL
|| forceUse == AUDIO_POLICY_FORCE_ENCODED_SURROUND_NEVER) {
- // Only copy non-surround formats to formatSet.
+ // formatSet is (formats ^ 'non-surround')
for (auto formatIter = formatsPtr->begin(); formatIter != formatsPtr->end(); ++formatIter) {
- if (mConfig.getSurroundFormats().count(*formatIter) == 0 &&
- enforcedSurround.count(*formatIter) == 0) {
+ if (allSurround.count(*formatIter) == 0 && enforcedSurround.count(*formatIter) == 0) {
formatSet.insert(*formatIter);
}
}
} else {
formatSet.insert(formatsPtr->begin(), formatsPtr->end());
}
- formatsPtr->clear(); // Re-filled from the formatSet in the end.
+ formatsPtr->clear(); // Re-filled from the formatSet at the end.
- // If MANUAL, keep the supported surround sound formats as current enabled ones.
if (forceUse == AUDIO_POLICY_FORCE_ENCODED_SURROUND_MANUAL) {
- formatSet.insert(mSurroundFormats.begin(), mSurroundFormats.end());
+ formatSet.insert(mManualSurroundFormats.begin(), mManualSurroundFormats.end());
// Enable IEC61937 when in MANUAL mode if it's enforced for this device.
if (enforcedSurround.count(AUDIO_FORMAT_IEC61937) != 0) {
formatSet.insert(AUDIO_FORMAT_IEC61937);
}
- } else { // NEVER, AUTO or ALWAYS
- mSurroundFormats.clear();
- // Modify formats based on surround preferences.
- if (forceUse != AUDIO_POLICY_FORCE_ENCODED_SURROUND_NEVER) { // AUTO or ALWAYS
- // If ALWAYS, add support for raw surround formats if all are missing.
- // This assumes that if any of these formats are reported by the HAL
- // then the report is valid and should not be modified.
- if (forceUse == AUDIO_POLICY_FORCE_ENCODED_SURROUND_ALWAYS) {
- for (const auto& format : mConfig.getSurroundFormats()) {
- formatSet.insert(format.first);
- }
- }
- formatSet.insert(enforcedSurround.begin(), enforcedSurround.end());
-
- for (const auto& format : formatSet) {
- if (mConfig.getSurroundFormats().count(format) != 0) {
- mSurroundFormats.insert(format);
- }
- }
+ } else if (forceUse != AUDIO_POLICY_FORCE_ENCODED_SURROUND_NEVER) { // AUTO or ALWAYS
+ if (forceUse == AUDIO_POLICY_FORCE_ENCODED_SURROUND_ALWAYS) {
+ formatSet.insert(allSurround.begin(), allSurround.end());
}
+ formatSet.insert(enforcedSurround.begin(), enforcedSurround.end());
}
for (const auto& format : formatSet) {
formatsPtr->push(format);
@@ -5878,7 +5880,7 @@
// If not then add 5.1 support.
if (!supports5dot1) {
channelMasks.add(AUDIO_CHANNEL_OUT_5POINT1);
- ALOGI("%s: force ALWAYS, so adding channelMask for 5.1 surround", __FUNCTION__);
+ ALOGI("%s: force MANUAL or ALWAYS, so adding channelMask for 5.1 surround", __func__);
}
}
}
@@ -5902,7 +5904,8 @@
return;
}
FormatVector formats = formatsFromString(reply.string());
- if (device == AUDIO_DEVICE_OUT_HDMI) {
+ if (device == AUDIO_DEVICE_OUT_HDMI
+ || isDeviceOfModule(devDesc, AUDIO_HARDWARE_MODULE_ID_MSD)) {
modifySurroundFormats(devDesc, &formats);
}
profiles.setFormats(formats);
@@ -5935,7 +5938,8 @@
if (repliedParameters.get(
String8(AudioParameter::keyStreamSupportedChannels), reply) == NO_ERROR) {
channelMasks = channelMasksFromString(reply.string());
- if (device == AUDIO_DEVICE_OUT_HDMI) {
+ if (device == AUDIO_DEVICE_OUT_HDMI
+ || isDeviceOfModule(devDesc, AUDIO_HARDWARE_MODULE_ID_MSD)) {
modifySurroundChannelMasks(&channelMasks);
}
}
diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.h b/services/audiopolicy/managerdefault/AudioPolicyManager.h
index 2b89380..8618e0c 100644
--- a/services/audiopolicy/managerdefault/AudioPolicyManager.h
+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.h
@@ -186,7 +186,9 @@
virtual bool isSourceActive(audio_source_t source) const;
- void dump(String8 *dst) const; // helper for dump(int fd)
+ // helpers for dump(int fd)
+ void dumpManualSurroundFormats(String8 *dst) const;
+ void dump(String8 *dst) const;
status_t dump(int fd) override;
@@ -516,6 +518,9 @@
sp<AudioPatch> createTelephonyPatch(bool isRx, audio_devices_t device, uint32_t delayMs);
sp<DeviceDescriptor> findDevice(
const DeviceVector& devices, audio_devices_t device) const;
+ audio_devices_t getModuleDeviceTypes(
+ const DeviceVector& devices, const char *moduleId) const;
+ bool isDeviceOfModule(const sp<DeviceDescriptor>& devDesc, const char *moduleId) const;
status_t startSource(const sp<SwAudioOutputDescriptor>& outputDesc,
const sp<TrackClientDescriptor>& client,
@@ -608,8 +613,9 @@
// Audio Policy Engine Interface.
AudioPolicyManagerInterface *mEngine;
- // Surround formats that are enabled.
- std::unordered_set<audio_format_t> mSurroundFormats;
+ // Surround formats that are enabled manually. Taken into account when
+ // "encoded surround" is forced into "manual" mode.
+ std::unordered_set<audio_format_t> mManualSurroundFormats;
private:
// Add or remove AC3 DTS encodings based on user preferences.
void modifySurroundFormats(const sp<DeviceDescriptor>& devDesc, FormatVector *formatsPtr);
@@ -617,7 +623,6 @@
// Support for Multi-Stream Decoder (MSD) module
sp<DeviceDescriptor> getMsdAudioInDevice() const;
- audio_devices_t getMsdAudioOutDeviceTypes() const;
const AudioPatchCollection getMsdPatches() const;
status_t getBestMsdAudioProfileFor(audio_devices_t outputDevice,
bool hwAvSync,
diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp
index 32b07fa..6003607 100644
--- a/services/camera/libcameraservice/CameraService.cpp
+++ b/services/camera/libcameraservice/CameraService.cpp
@@ -2215,6 +2215,8 @@
sCameraService->removeByClient(this);
sCameraService->logDisconnected(mCameraIdStr, mClientPid,
String8(mClientPackageName));
+ sCameraService->mCameraProviderManager->removeRef(CameraProviderManager::DeviceMode::CAMERA,
+ mCameraIdStr.c_str());
sp<IBinder> remote = getRemote();
if (remote != nullptr) {
diff --git a/services/camera/libcameraservice/common/CameraProviderManager.cpp b/services/camera/libcameraservice/common/CameraProviderManager.cpp
index a82f0f7..a9cbe72 100644
--- a/services/camera/libcameraservice/common/CameraProviderManager.cpp
+++ b/services/camera/libcameraservice/common/CameraProviderManager.cpp
@@ -24,23 +24,37 @@
#include <algorithm>
#include <chrono>
+#include <future>
#include <inttypes.h>
#include <hardware/camera_common.h>
#include <hidl/ServiceManagement.h>
#include <functional>
#include <camera_metadata_hidden.h>
#include <android-base/parseint.h>
+#include <android-base/logging.h>
+#include <cutils/properties.h>
+#include <hwbinder/IPCThreadState.h>
+#include <utils/Trace.h>
namespace android {
using namespace ::android::hardware::camera;
using namespace ::android::hardware::camera::common::V1_0;
+using std::literals::chrono_literals::operator""s;
namespace {
// Hardcoded name for the passthrough HAL implementation, since it can't be discovered via the
// service manager
const std::string kLegacyProviderName("legacy/0");
const std::string kExternalProviderName("external/0");
+const bool kEnableLazyHal(property_get_bool("ro.camera.enableLazyHal", false));
+
+// The extra amount of time to hold a reference to an ICameraProvider after it is no longer needed.
+// Hold the reference for this extra time so that if the camera is unreferenced and then referenced
+// again quickly, we do not let the HAL exit and then need to immediately restart it. An example
+// when this could happen is switching from a front-facing to a rear-facing camera. If the HAL were
+// to exit during the camera switch, the camera could appear janky to the user.
+const std::chrono::system_clock::duration kCameraKeepAliveDelay = 3s;
} // anonymous namespace
@@ -74,6 +88,8 @@
addProviderLocked(kLegacyProviderName, /*expected*/ false);
addProviderLocked(kExternalProviderName, /*expected*/ false);
+ IPCThreadState::self()->flushCommands();
+
return OK;
}
@@ -219,26 +235,15 @@
return OK;
}
-bool CameraProviderManager::supportSetTorchMode(const std::string &id) {
+bool CameraProviderManager::supportSetTorchMode(const std::string &id) const {
std::lock_guard<std::mutex> lock(mInterfaceMutex);
- bool support = false;
for (auto& provider : mProviders) {
auto deviceInfo = findDeviceInfoLocked(id);
if (deviceInfo != nullptr) {
- auto ret = provider->mInterface->isSetTorchModeSupported(
- [&support](auto status, bool supported) {
- if (status == Status::OK) {
- support = supported;
- }
- });
- if (!ret.isOk()) {
- ALOGE("%s: Transaction error checking torch mode support '%s': %s",
- __FUNCTION__, provider->mProviderName.c_str(), ret.description().c_str());
- }
- break;
+ return provider->mSetTorchModeSupported;
}
}
- return support;
+ return false;
}
status_t CameraProviderManager::setTorchMode(const std::string &id, bool enabled) {
@@ -247,6 +252,15 @@
auto deviceInfo = findDeviceInfoLocked(id);
if (deviceInfo == nullptr) return NAME_NOT_FOUND;
+ // Pass the camera ID to start interface so that it will save it to the map of ICameraProviders
+ // that are currently in use.
+ const sp<provider::V2_4::ICameraProvider> interface =
+ deviceInfo->mParentProvider->startProviderInterface();
+ if (interface == nullptr) {
+ return DEAD_OBJECT;
+ }
+ saveRef(DeviceMode::TORCH, deviceInfo->mId, interface);
+
return deviceInfo->setTorchMode(enabled);
}
@@ -254,37 +268,7 @@
sp<VendorTagDescriptorCache> tagCache = new VendorTagDescriptorCache();
for (auto& provider : mProviders) {
- hardware::hidl_vec<VendorTagSection> vts;
- Status status;
- hardware::Return<void> ret;
- ret = provider->mInterface->getVendorTags(
- [&](auto s, const auto& vendorTagSecs) {
- status = s;
- if (s == Status::OK) {
- vts = vendorTagSecs;
- }
- });
- if (!ret.isOk()) {
- ALOGE("%s: Transaction error getting vendor tags from provider '%s': %s",
- __FUNCTION__, provider->mProviderName.c_str(), ret.description().c_str());
- return DEAD_OBJECT;
- }
- if (status != Status::OK) {
- return mapToStatusT(status);
- }
-
- // Read all vendor tag definitions into a descriptor
- sp<VendorTagDescriptor> desc;
- status_t res;
- if ((res = HidlVendorTagDescriptor::createDescriptorFromHidl(vts, /*out*/desc))
- != OK) {
- ALOGE("%s: Could not generate descriptor from vendor tag operations,"
- "received error %s (%d). Camera clients will not be able to use"
- "vendor tags", __FUNCTION__, strerror(res), res);
- return res;
- }
-
- tagCache->addVendorDescriptor(provider->mProviderTagid, desc);
+ tagCache->addVendorDescriptor(provider->mProviderTagid, provider->mVendorTagDescriptor);
}
VendorTagDescriptorCache::setAsGlobalVendorTagCache(tagCache);
@@ -293,9 +277,9 @@
}
status_t CameraProviderManager::openSession(const std::string &id,
- const sp<hardware::camera::device::V3_2::ICameraDeviceCallback>& callback,
+ const sp<device::V3_2::ICameraDeviceCallback>& callback,
/*out*/
- sp<hardware::camera::device::V3_2::ICameraDeviceSession> *session) {
+ sp<device::V3_2::ICameraDeviceSession> *session) {
std::lock_guard<std::mutex> lock(mInterfaceMutex);
@@ -304,10 +288,22 @@
if (deviceInfo == nullptr) return NAME_NOT_FOUND;
auto *deviceInfo3 = static_cast<ProviderInfo::DeviceInfo3*>(deviceInfo);
+ const sp<provider::V2_4::ICameraProvider> provider =
+ deviceInfo->mParentProvider->startProviderInterface();
+ if (provider == nullptr) {
+ return DEAD_OBJECT;
+ }
+ saveRef(DeviceMode::CAMERA, id, provider);
Status status;
hardware::Return<void> ret;
- ret = deviceInfo3->mInterface->open(callback, [&status, &session]
+ auto interface = deviceInfo3->startDeviceInterface<
+ CameraProviderManager::ProviderInfo::DeviceInfo3::InterfaceT>();
+ if (interface == nullptr) {
+ return DEAD_OBJECT;
+ }
+
+ ret = interface->open(callback, [&status, &session]
(Status s, const sp<device::V3_2::ICameraDeviceSession>& cameraSession) {
status = s;
if (status == Status::OK) {
@@ -315,6 +311,7 @@
}
});
if (!ret.isOk()) {
+ removeRef(DeviceMode::CAMERA, id);
ALOGE("%s: Transaction error opening a session for camera device %s: %s",
__FUNCTION__, id.c_str(), ret.description().c_str());
return DEAD_OBJECT;
@@ -323,9 +320,9 @@
}
status_t CameraProviderManager::openSession(const std::string &id,
- const sp<hardware::camera::device::V1_0::ICameraDeviceCallback>& callback,
+ const sp<device::V1_0::ICameraDeviceCallback>& callback,
/*out*/
- sp<hardware::camera::device::V1_0::ICameraDevice> *session) {
+ sp<device::V1_0::ICameraDevice> *session) {
std::lock_guard<std::mutex> lock(mInterfaceMutex);
@@ -334,19 +331,82 @@
if (deviceInfo == nullptr) return NAME_NOT_FOUND;
auto *deviceInfo1 = static_cast<ProviderInfo::DeviceInfo1*>(deviceInfo);
+ const sp<provider::V2_4::ICameraProvider> provider =
+ deviceInfo->mParentProvider->startProviderInterface();
+ if (provider == nullptr) {
+ return DEAD_OBJECT;
+ }
+ saveRef(DeviceMode::CAMERA, id, provider);
- hardware::Return<Status> status = deviceInfo1->mInterface->open(callback);
+ auto interface = deviceInfo1->startDeviceInterface<
+ CameraProviderManager::ProviderInfo::DeviceInfo1::InterfaceT>();
+ if (interface == nullptr) {
+ return DEAD_OBJECT;
+ }
+ hardware::Return<Status> status = interface->open(callback);
if (!status.isOk()) {
+ removeRef(DeviceMode::CAMERA, id);
ALOGE("%s: Transaction error opening a session for camera device %s: %s",
__FUNCTION__, id.c_str(), status.description().c_str());
return DEAD_OBJECT;
}
if (status == Status::OK) {
- *session = deviceInfo1->mInterface;
+ *session = interface;
}
return mapToStatusT(status);
}
+void CameraProviderManager::saveRef(DeviceMode usageType, const std::string &cameraId,
+ sp<provider::V2_4::ICameraProvider> provider) {
+ if (!kEnableLazyHal) {
+ return;
+ }
+ ALOGI("Saving camera provider %s for camera device %s", provider->descriptor, cameraId.c_str());
+ std::lock_guard<std::mutex> lock(mProviderInterfaceMapLock);
+ std::unordered_map<std::string, sp<provider::V2_4::ICameraProvider>> *primaryMap, *alternateMap;
+ if (usageType == DeviceMode::TORCH) {
+ primaryMap = &mTorchProviderByCameraId;
+ alternateMap = &mCameraProviderByCameraId;
+ } else {
+ primaryMap = &mCameraProviderByCameraId;
+ alternateMap = &mTorchProviderByCameraId;
+ }
+ auto id = cameraId.c_str();
+ (*primaryMap)[id] = provider;
+ auto search = alternateMap->find(id);
+ if (search != alternateMap->end()) {
+ ALOGW("%s: Camera device %s is using both torch mode and camera mode simultaneously. "
+ "That should not be possible", __FUNCTION__, id);
+ }
+ ALOGV("%s: Camera device %s connected", __FUNCTION__, id);
+}
+
+void CameraProviderManager::removeRef(DeviceMode usageType, const std::string &cameraId) {
+ if (!kEnableLazyHal) {
+ return;
+ }
+ ALOGI("Removing camera device %s", cameraId.c_str());
+ std::unordered_map<std::string, sp<provider::V2_4::ICameraProvider>> *providerMap;
+ if (usageType == DeviceMode::TORCH) {
+ providerMap = &mTorchProviderByCameraId;
+ } else {
+ providerMap = &mCameraProviderByCameraId;
+ }
+ std::lock_guard<std::mutex> lock(mProviderInterfaceMapLock);
+ auto search = providerMap->find(cameraId.c_str());
+ if (search != providerMap->end()) {
+ auto ptr = search->second;
+ auto future = std::async(std::launch::async, [ptr] {
+ std::this_thread::sleep_for(kCameraKeepAliveDelay);
+ IPCThreadState::self()->flushCommands();
+ });
+ providerMap->erase(cameraId.c_str());
+ } else {
+ ALOGE("%s: Asked to remove reference for camera %s, but no reference to it was found. This "
+ "could mean removeRef was called twice for the same camera ID.", __FUNCTION__,
+ cameraId.c_str());
+ }
+}
hardware::Return<void> CameraProviderManager::onRegistration(
const hardware::hidl_string& /*fqName*/,
@@ -364,6 +424,8 @@
listener->onNewProviderRegistered();
}
+ IPCThreadState::self()->flushCommands();
+
return hardware::Return<void>();
}
@@ -611,9 +673,8 @@
}
}
- sp<ProviderInfo> providerInfo =
- new ProviderInfo(newProvider, interface, this);
- status_t res = providerInfo->initialize();
+ sp<ProviderInfo> providerInfo = new ProviderInfo(newProvider, this);
+ status_t res = providerInfo->initialize(interface);
if (res != OK) {
return res;
}
@@ -665,27 +726,26 @@
CameraProviderManager::ProviderInfo::ProviderInfo(
const std::string &providerName,
- sp<provider::V2_4::ICameraProvider>& interface,
CameraProviderManager *manager) :
mProviderName(providerName),
- mInterface(interface),
mProviderTagid(generateVendorTagId(providerName)),
mUniqueDeviceCount(0),
mManager(manager) {
(void) mManager;
}
-status_t CameraProviderManager::ProviderInfo::initialize() {
+status_t CameraProviderManager::ProviderInfo::initialize(
+ sp<provider::V2_4::ICameraProvider>& interface) {
status_t res = parseProviderName(mProviderName, &mType, &mId);
if (res != OK) {
ALOGE("%s: Invalid provider name, ignoring", __FUNCTION__);
return BAD_VALUE;
}
ALOGI("Connecting to new camera provider: %s, isRemote? %d",
- mProviderName.c_str(), mInterface->isRemote());
+ mProviderName.c_str(), interface->isRemote());
// cameraDeviceStatusChange callbacks may be called (and causing new devices added)
// before setCallback returns
- hardware::Return<Status> status = mInterface->setCallback(this);
+ hardware::Return<Status> status = interface->setCallback(this);
if (!status.isOk()) {
ALOGE("%s: Transaction error setting up callbacks with camera provider '%s': %s",
__FUNCTION__, mProviderName.c_str(), status.description().c_str());
@@ -697,7 +757,7 @@
return mapToStatusT(status);
}
- hardware::Return<bool> linked = mInterface->linkToDeath(this, /*cookie*/ mId);
+ hardware::Return<bool> linked = interface->linkToDeath(this, /*cookie*/ mId);
if (!linked.isOk()) {
ALOGE("%s: Transaction error in linking to camera provider '%s' death: %s",
__FUNCTION__, mProviderName.c_str(), linked.description().c_str());
@@ -709,7 +769,7 @@
// Get initial list of camera devices, if any
std::vector<std::string> devices;
- hardware::Return<void> ret = mInterface->getCameraIdList([&status, this, &devices](
+ hardware::Return<void> ret = interface->getCameraIdList([&status, this, &devices](
Status idStatus,
const hardware::hidl_vec<hardware::hidl_string>& cameraDeviceNames) {
status = idStatus;
@@ -738,11 +798,24 @@
return mapToStatusT(status);
}
+ ret = interface->isSetTorchModeSupported(
+ [this](auto status, bool supported) {
+ if (status == Status::OK) {
+ mSetTorchModeSupported = supported;
+ }
+ });
+ if (!ret.isOk()) {
+ ALOGE("%s: Transaction error checking torch mode support '%s': %s",
+ __FUNCTION__, mProviderName.c_str(), ret.description().c_str());
+ return DEAD_OBJECT;
+ }
+
+ mIsRemote = interface->isRemote();
+
sp<StatusListener> listener = mManager->getStatusListener();
for (auto& device : devices) {
std::string id;
- status_t res = addDevice(device,
- hardware::camera::common::V1_0::CameraDeviceStatus::PRESENT, &id);
+ status_t res = addDevice(device, common::V1_0::CameraDeviceStatus::PRESENT, &id);
if (res != OK) {
ALOGE("%s: Unable to enumerate camera device '%s': %s (%d)",
__FUNCTION__, device.c_str(), strerror(-res), res);
@@ -750,13 +823,53 @@
}
}
+ res = setUpVendorTags();
+ if (res != OK) {
+ ALOGE("%s: Unable to set up vendor tags from provider '%s'",
+ __FUNCTION__, mProviderName.c_str());
+ return res;
+ }
+
ALOGI("Camera provider %s ready with %zu camera devices",
mProviderName.c_str(), mDevices.size());
mInitialized = true;
+ if (!kEnableLazyHal) {
+ // Save HAL reference indefinitely
+ mSavedInterface = interface;
+ }
return OK;
}
+const sp<provider::V2_4::ICameraProvider>
+CameraProviderManager::ProviderInfo::startProviderInterface() {
+ ATRACE_CALL();
+ ALOGI("Request to start camera provider: %s", mProviderName.c_str());
+ if (mSavedInterface != nullptr) {
+ return mSavedInterface;
+ }
+ auto interface = mActiveInterface.promote();
+ if (interface == nullptr) {
+ ALOGI("Could not promote, calling getService(%s)", mProviderName.c_str());
+ interface = mManager->mServiceProxy->getService(mProviderName);
+ interface->setCallback(this);
+ hardware::Return<bool> linked = interface->linkToDeath(this, /*cookie*/ mId);
+ if (!linked.isOk()) {
+ ALOGE("%s: Transaction error in linking to camera provider '%s' death: %s",
+ __FUNCTION__, mProviderName.c_str(), linked.description().c_str());
+ mManager->removeProvider(mProviderName);
+ return nullptr;
+ } else if (!linked) {
+ ALOGW("%s: Unable to link to provider '%s' death notifications",
+ __FUNCTION__, mProviderName.c_str());
+ }
+ mActiveInterface = interface;
+ } else {
+ ALOGI("Camera provider (%s) already in use. Re-using instance.", mProviderName.c_str());
+ }
+ return interface;
+}
+
const std::string& CameraProviderManager::ProviderInfo::getType() const {
return mType;
}
@@ -838,7 +951,7 @@
status_t CameraProviderManager::ProviderInfo::dump(int fd, const Vector<String16>&) const {
dprintf(fd, "== Camera Provider HAL %s (v2.4, %s) static info: %zu devices: ==\n",
- mProviderName.c_str(), mInterface->isRemote() ? "remote" : "passthrough",
+ mProviderName.c_str(), mIsRemote ? "remote" : "passthrough",
mDevices.size());
for (auto& device : mDevices) {
@@ -966,6 +1079,9 @@
torchStatusToString(newStatus));
id = deviceInfo->mId;
known = true;
+ if (TorchModeStatus::AVAILABLE_ON != newStatus) {
+ mManager->removeRef(DeviceMode::TORCH, id);
+ }
break;
}
}
@@ -994,15 +1110,55 @@
mManager->removeProvider(mProviderName);
}
+status_t CameraProviderManager::ProviderInfo::setUpVendorTags() {
+ if (mVendorTagDescriptor != nullptr)
+ return OK;
+
+ hardware::hidl_vec<VendorTagSection> vts;
+ Status status;
+ hardware::Return<void> ret;
+ const sp<provider::V2_4::ICameraProvider> interface = startProviderInterface();
+ if (interface == nullptr) {
+ return DEAD_OBJECT;
+ }
+ ret = interface->getVendorTags(
+ [&](auto s, const auto& vendorTagSecs) {
+ status = s;
+ if (s == Status::OK) {
+ vts = vendorTagSecs;
+ }
+ });
+ if (!ret.isOk()) {
+ ALOGE("%s: Transaction error getting vendor tags from provider '%s': %s",
+ __FUNCTION__, mProviderName.c_str(), ret.description().c_str());
+ return DEAD_OBJECT;
+ }
+ if (status != Status::OK) {
+ return mapToStatusT(status);
+ }
+
+ // Read all vendor tag definitions into a descriptor
+ status_t res;
+ if ((res = HidlVendorTagDescriptor::createDescriptorFromHidl(vts, /*out*/mVendorTagDescriptor))
+ != OK) {
+ ALOGE("%s: Could not generate descriptor from vendor tag operations,"
+ "received error %s (%d). Camera clients will not be able to use"
+ "vendor tags", __FUNCTION__, strerror(res), res);
+ return res;
+ }
+
+ return OK;
+}
+
template<class DeviceInfoT>
std::unique_ptr<CameraProviderManager::ProviderInfo::DeviceInfo>
CameraProviderManager::ProviderInfo::initializeDeviceInfo(
const std::string &name, const metadata_vendor_id_t tagId,
- const std::string &id, uint16_t minorVersion) const {
+ const std::string &id, uint16_t minorVersion) {
Status status;
auto cameraInterface =
- getDeviceInterface<typename DeviceInfoT::InterfaceT>(name);
+ startDeviceInterface<typename DeviceInfoT::InterfaceT>(name);
if (cameraInterface == nullptr) return nullptr;
CameraResourceCost resourceCost;
@@ -1029,13 +1185,13 @@
}
return std::unique_ptr<DeviceInfo>(
- new DeviceInfoT(name, tagId, id, minorVersion, resourceCost,
+ new DeviceInfoT(name, tagId, id, minorVersion, resourceCost, this,
mProviderPublicCameraIds, cameraInterface));
}
template<class InterfaceT>
sp<InterfaceT>
-CameraProviderManager::ProviderInfo::getDeviceInterface(const std::string &name) const {
+CameraProviderManager::ProviderInfo::startDeviceInterface(const std::string &name) {
ALOGE("%s: Device %s: Unknown HIDL device HAL major version %d:", __FUNCTION__,
name.c_str(), InterfaceT::version.get_major());
return nullptr;
@@ -1043,12 +1199,16 @@
template<>
sp<device::V1_0::ICameraDevice>
-CameraProviderManager::ProviderInfo::getDeviceInterface
- <device::V1_0::ICameraDevice>(const std::string &name) const {
+CameraProviderManager::ProviderInfo::startDeviceInterface
+ <device::V1_0::ICameraDevice>(const std::string &name) {
Status status;
sp<device::V1_0::ICameraDevice> cameraInterface;
hardware::Return<void> ret;
- ret = mInterface->getCameraDeviceInterface_V1_x(name, [&status, &cameraInterface](
+ const sp<provider::V2_4::ICameraProvider> interface = startProviderInterface();
+ if (interface == nullptr) {
+ return nullptr;
+ }
+ ret = interface->getCameraDeviceInterface_V1_x(name, [&status, &cameraInterface](
Status s, sp<device::V1_0::ICameraDevice> interface) {
status = s;
cameraInterface = interface;
@@ -1068,12 +1228,16 @@
template<>
sp<device::V3_2::ICameraDevice>
-CameraProviderManager::ProviderInfo::getDeviceInterface
- <device::V3_2::ICameraDevice>(const std::string &name) const {
+CameraProviderManager::ProviderInfo::startDeviceInterface
+ <device::V3_2::ICameraDevice>(const std::string &name) {
Status status;
sp<device::V3_2::ICameraDevice> cameraInterface;
hardware::Return<void> ret;
- ret = mInterface->getCameraDeviceInterface_V3_x(name, [&status, &cameraInterface](
+ const sp<provider::V2_4::ICameraProvider> interface = startProviderInterface();
+ if (interface == nullptr) {
+ return nullptr;
+ }
+ ret = interface->getCameraDeviceInterface_V3_x(name, [&status, &cameraInterface](
Status s, sp<device::V3_2::ICameraDevice> interface) {
status = s;
cameraInterface = interface;
@@ -1094,6 +1258,18 @@
CameraProviderManager::ProviderInfo::DeviceInfo::~DeviceInfo() {}
template<class InterfaceT>
+sp<InterfaceT> CameraProviderManager::ProviderInfo::DeviceInfo::startDeviceInterface() {
+ sp<InterfaceT> device;
+ ATRACE_CALL();
+ if (mSavedInterface == nullptr) {
+ device = mParentProvider->startDeviceInterface<InterfaceT>(mName);
+ } else {
+ device = (InterfaceT *) mSavedInterface.get();
+ }
+ return device;
+}
+
+template<class InterfaceT>
status_t CameraProviderManager::ProviderInfo::DeviceInfo::setTorchMode(InterfaceT& interface,
bool enabled) {
Status s = interface->setTorchMode(enabled ? TorchMode::ON : TorchMode::OFF);
@@ -1104,31 +1280,31 @@
const metadata_vendor_id_t tagId, const std::string &id,
uint16_t minorVersion,
const CameraResourceCost& resourceCost,
+ sp<ProviderInfo> parentProvider,
const std::vector<std::string>& publicCameraIds,
sp<InterfaceT> interface) :
DeviceInfo(name, tagId, id, hardware::hidl_version{1, minorVersion},
- publicCameraIds, resourceCost),
- mInterface(interface) {
+ publicCameraIds, resourceCost, parentProvider) {
// Get default parameters and initialize flash unit availability
// Requires powering on the camera device
- hardware::Return<Status> status = mInterface->open(nullptr);
+ hardware::Return<Status> status = interface->open(nullptr);
if (!status.isOk()) {
ALOGE("%s: Transaction error opening camera device %s to check for a flash unit: %s",
- __FUNCTION__, mId.c_str(), status.description().c_str());
+ __FUNCTION__, id.c_str(), status.description().c_str());
return;
}
if (status != Status::OK) {
ALOGE("%s: Unable to open camera device %s to check for a flash unit: %s", __FUNCTION__,
- mId.c_str(), CameraProviderManager::statusToString(status));
+ id.c_str(), CameraProviderManager::statusToString(status));
return;
}
hardware::Return<void> ret;
- ret = mInterface->getParameters([this](const hardware::hidl_string& parms) {
+ ret = interface->getParameters([this](const hardware::hidl_string& parms) {
mDefaultParameters.unflatten(String8(parms.c_str()));
});
if (!ret.isOk()) {
ALOGE("%s: Transaction error reading camera device %s params to check for a flash unit: %s",
- __FUNCTION__, mId.c_str(), status.description().c_str());
+ __FUNCTION__, id.c_str(), status.description().c_str());
return;
}
const char *flashMode =
@@ -1137,27 +1313,43 @@
mHasFlashUnit = true;
}
- ret = mInterface->close();
+ status_t res = cacheCameraInfo(interface);
+ if (res != OK) {
+ ALOGE("%s: Could not cache CameraInfo", __FUNCTION__);
+ return;
+ }
+
+ ret = interface->close();
if (!ret.isOk()) {
ALOGE("%s: Transaction error closing camera device %s after check for a flash unit: %s",
- __FUNCTION__, mId.c_str(), status.description().c_str());
+ __FUNCTION__, id.c_str(), status.description().c_str());
+ }
+
+ if (!kEnableLazyHal) {
+ // Save HAL reference indefinitely
+ mSavedInterface = interface;
}
}
CameraProviderManager::ProviderInfo::DeviceInfo1::~DeviceInfo1() {}
status_t CameraProviderManager::ProviderInfo::DeviceInfo1::setTorchMode(bool enabled) {
- return DeviceInfo::setTorchMode(mInterface, enabled);
+ return setTorchModeForDevice<InterfaceT>(enabled);
}
status_t CameraProviderManager::ProviderInfo::DeviceInfo1::getCameraInfo(
hardware::CameraInfo *info) const {
if (info == nullptr) return BAD_VALUE;
+ *info = mInfo;
+ return OK;
+}
+status_t CameraProviderManager::ProviderInfo::DeviceInfo1::cacheCameraInfo(
+ sp<CameraProviderManager::ProviderInfo::DeviceInfo1::InterfaceT> interface) {
Status status;
device::V1_0::CameraInfo cInfo;
hardware::Return<void> ret;
- ret = mInterface->getCameraInfo([&status, &cInfo](Status s, device::V1_0::CameraInfo camInfo) {
+ ret = interface->getCameraInfo([&status, &cInfo](Status s, device::V1_0::CameraInfo camInfo) {
status = s;
cInfo = camInfo;
});
@@ -1172,27 +1364,31 @@
switch(cInfo.facing) {
case device::V1_0::CameraFacing::BACK:
- info->facing = hardware::CAMERA_FACING_BACK;
+ mInfo.facing = hardware::CAMERA_FACING_BACK;
break;
case device::V1_0::CameraFacing::EXTERNAL:
// Map external to front for legacy API
case device::V1_0::CameraFacing::FRONT:
- info->facing = hardware::CAMERA_FACING_FRONT;
+ mInfo.facing = hardware::CAMERA_FACING_FRONT;
break;
default:
ALOGW("%s: Device %s: Unknown camera facing: %d",
__FUNCTION__, mId.c_str(), cInfo.facing);
- info->facing = hardware::CAMERA_FACING_BACK;
+ mInfo.facing = hardware::CAMERA_FACING_BACK;
}
- info->orientation = cInfo.orientation;
+ mInfo.orientation = cInfo.orientation;
return OK;
}
-status_t CameraProviderManager::ProviderInfo::DeviceInfo1::dumpState(int fd) const {
+status_t CameraProviderManager::ProviderInfo::DeviceInfo1::dumpState(int fd) {
native_handle_t* handle = native_handle_create(1,0);
handle->data[0] = fd;
- hardware::Return<Status> s = mInterface->dumpState(handle);
+ const sp<InterfaceT> interface = startDeviceInterface<InterfaceT>();
+ if (interface == nullptr) {
+ return DEAD_OBJECT;
+ }
+ hardware::Return<Status> s = interface->dumpState(handle);
native_handle_delete(handle);
if (!s.isOk()) {
return INVALID_OPERATION;
@@ -1204,15 +1400,15 @@
const metadata_vendor_id_t tagId, const std::string &id,
uint16_t minorVersion,
const CameraResourceCost& resourceCost,
+ sp<ProviderInfo> parentProvider,
const std::vector<std::string>& publicCameraIds,
sp<InterfaceT> interface) :
DeviceInfo(name, tagId, id, hardware::hidl_version{3, minorVersion},
- publicCameraIds, resourceCost),
- mInterface(interface) {
+ publicCameraIds, resourceCost, parentProvider) {
// Get camera characteristics and initialize flash unit availability
Status status;
hardware::Return<void> ret;
- ret = mInterface->getCameraCharacteristics([&status, this](Status s,
+ ret = interface->getCameraCharacteristics([&status, this](Status s,
device::V3_2::CameraMetadata metadata) {
status = s;
if (s == Status::OK) {
@@ -1231,13 +1427,13 @@
});
if (!ret.isOk()) {
ALOGE("%s: Transaction error getting camera characteristics for device %s"
- " to check for a flash unit: %s", __FUNCTION__, mId.c_str(),
+ " to check for a flash unit: %s", __FUNCTION__, id.c_str(),
ret.description().c_str());
return;
}
if (status != Status::OK) {
ALOGE("%s: Unable to get camera characteristics for device %s: %s (%d)",
- __FUNCTION__, mId.c_str(), CameraProviderManager::statusToString(status), status);
+ __FUNCTION__, id.c_str(), CameraProviderManager::statusToString(status), status);
return;
}
status_t res = fixupMonochromeTags();
@@ -1257,12 +1453,12 @@
queryPhysicalCameraIds();
// Get physical camera characteristics if applicable
- auto castResult = device::V3_5::ICameraDevice::castFrom(mInterface);
+ auto castResult = device::V3_5::ICameraDevice::castFrom(interface);
if (!castResult.isOk()) {
ALOGV("%s: Unable to convert ICameraDevice instance to version 3.5", __FUNCTION__);
return;
}
- sp<hardware::camera::device::V3_5::ICameraDevice> interface_3_5 = castResult;
+ sp<device::V3_5::ICameraDevice> interface_3_5 = castResult;
if (interface_3_5 == nullptr) {
ALOGE("%s: Converted ICameraDevice instance to nullptr", __FUNCTION__);
return;
@@ -1296,7 +1492,7 @@
if (!ret.isOk()) {
ALOGE("%s: Transaction error getting physical camera %s characteristics for %s: %s",
- __FUNCTION__, id.c_str(), mId.c_str(), ret.description().c_str());
+ __FUNCTION__, id.c_str(), id.c_str(), ret.description().c_str());
return;
}
if (status != Status::OK) {
@@ -1307,12 +1503,17 @@
}
}
}
+
+ if (!kEnableLazyHal) {
+ // Save HAL reference indefinitely
+ mSavedInterface = interface;
+ }
}
CameraProviderManager::ProviderInfo::DeviceInfo3::~DeviceInfo3() {}
status_t CameraProviderManager::ProviderInfo::DeviceInfo3::setTorchMode(bool enabled) {
- return DeviceInfo::setTorchMode(mInterface, enabled);
+ return setTorchModeForDevice<InterfaceT>(enabled);
}
status_t CameraProviderManager::ProviderInfo::DeviceInfo3::getCameraInfo(
@@ -1363,10 +1564,14 @@
return isBackwardCompatible;
}
-status_t CameraProviderManager::ProviderInfo::DeviceInfo3::dumpState(int fd) const {
+status_t CameraProviderManager::ProviderInfo::DeviceInfo3::dumpState(int fd) {
native_handle_t* handle = native_handle_create(1,0);
handle->data[0] = fd;
- auto ret = mInterface->dumpState(handle);
+ const sp<InterfaceT> interface = startDeviceInterface<InterfaceT>();
+ if (interface == nullptr) {
+ return DEAD_OBJECT;
+ }
+ auto ret = interface->dumpState(handle);
native_handle_delete(handle);
if (!ret.isOk()) {
return INVALID_OPERATION;
@@ -1396,8 +1601,14 @@
status_t CameraProviderManager::ProviderInfo::DeviceInfo3::isSessionConfigurationSupported(
const hardware::camera::device::V3_4::StreamConfiguration &configuration,
- bool *status /*out*/) const {
- auto castResult = device::V3_5::ICameraDevice::castFrom(mInterface);
+ bool *status /*out*/) {
+
+ const sp<CameraProviderManager::ProviderInfo::DeviceInfo3::InterfaceT> interface =
+ this->startDeviceInterface<CameraProviderManager::ProviderInfo::DeviceInfo3::InterfaceT>();
+ if (interface == nullptr) {
+ return DEAD_OBJECT;
+ }
+ auto castResult = device::V3_5::ICameraDevice::castFrom(interface);
sp<hardware::camera::device::V3_5::ICameraDevice> interface_3_5 = castResult;
if (interface_3_5 == nullptr) {
return INVALID_OPERATION;
@@ -1673,7 +1884,7 @@
status_t HidlVendorTagDescriptor::createDescriptorFromHidl(
- const hardware::hidl_vec<hardware::camera::common::V1_0::VendorTagSection>& vts,
+ const hardware::hidl_vec<common::V1_0::VendorTagSection>& vts,
/*out*/
sp<VendorTagDescriptor>& descriptor) {
@@ -1701,7 +1912,7 @@
int idx = 0;
for (size_t s = 0; s < vts.size(); s++) {
- const hardware::camera::common::V1_0::VendorTagSection& section = vts[s];
+ const common::V1_0::VendorTagSection& section = vts[s];
const char *sectionName = section.sectionName.c_str();
if (sectionName == NULL) {
ALOGE("%s: no section name defined for vendor tag section %zu.", __FUNCTION__, s);
diff --git a/services/camera/libcameraservice/common/CameraProviderManager.h b/services/camera/libcameraservice/common/CameraProviderManager.h
index 99b87fb..0966743 100644
--- a/services/camera/libcameraservice/common/CameraProviderManager.h
+++ b/services/camera/libcameraservice/common/CameraProviderManager.h
@@ -18,6 +18,7 @@
#define ANDROID_SERVERS_CAMERA_CAMERAPROVIDER_H
#include <vector>
+#include <unordered_map>
#include <unordered_set>
#include <string>
#include <mutex>
@@ -111,6 +112,14 @@
};
/**
+ * Represents the mode a camera device is currently in
+ */
+ enum class DeviceMode {
+ TORCH,
+ CAMERA
+ };
+
+ /**
* Initialize the manager and give it a status listener; optionally accepts a service
* interaction proxy.
*
@@ -182,7 +191,7 @@
/**
* Check if a given camera device support setTorchMode API.
*/
- bool supportSetTorchMode(const std::string &id);
+ bool supportSetTorchMode(const std::string &id) const;
/**
* Turn on or off the flashlight on a given camera device.
@@ -213,6 +222,17 @@
sp<hardware::camera::device::V1_0::ICameraDevice> *session);
/**
+ * Save the ICameraProvider while it is being used by a camera or torch client
+ */
+ void saveRef(DeviceMode usageType, const std::string &cameraId,
+ sp<hardware::camera::provider::V2_4::ICameraProvider> provider);
+
+ /**
+ * Notify that the camera or torch is no longer being used by a camera client
+ */
+ void removeRef(DeviceMode usageType, const std::string &cameraId);
+
+ /**
* IServiceNotification::onRegistration
* Invoked by the hardware service manager when a new camera provider is registered
*/
@@ -259,20 +279,43 @@
static HardwareServiceInteractionProxy sHardwareServiceInteractionProxy;
+ // Mapping from CameraDevice IDs to CameraProviders. This map is used to keep the
+ // ICameraProvider alive while it is in use by the camera with the given ID for camera
+ // capabilities
+ std::unordered_map<std::string, sp<hardware::camera::provider::V2_4::ICameraProvider>>
+ mCameraProviderByCameraId;
+
+ // Mapping from CameraDevice IDs to CameraProviders. This map is used to keep the
+ // ICameraProvider alive while it is in use by the camera with the given ID for torch
+ // capabilities
+ std::unordered_map<std::string, sp<hardware::camera::provider::V2_4::ICameraProvider>>
+ mTorchProviderByCameraId;
+
+ // Lock for accessing mCameraProviderByCameraId and mTorchProviderByCameraId
+ std::mutex mProviderInterfaceMapLock;
+
struct ProviderInfo :
virtual public hardware::camera::provider::V2_4::ICameraProviderCallback,
virtual public hardware::hidl_death_recipient
{
const std::string mProviderName;
- const sp<hardware::camera::provider::V2_4::ICameraProvider> mInterface;
const metadata_vendor_id_t mProviderTagid;
+ sp<VendorTagDescriptor> mVendorTagDescriptor;
+ bool mSetTorchModeSupported;
+ bool mIsRemote;
+
+ // This pointer is used to keep a reference to the ICameraProvider that was last accessed.
+ wp<hardware::camera::provider::V2_4::ICameraProvider> mActiveInterface;
+
+ sp<hardware::camera::provider::V2_4::ICameraProvider> mSavedInterface;
ProviderInfo(const std::string &providerName,
- sp<hardware::camera::provider::V2_4::ICameraProvider>& interface,
CameraProviderManager *manager);
~ProviderInfo();
- status_t initialize();
+ status_t initialize(sp<hardware::camera::provider::V2_4::ICameraProvider>& interface);
+
+ const sp<hardware::camera::provider::V2_4::ICameraProvider> startProviderInterface();
const std::string& getType() const;
@@ -294,6 +337,11 @@
// hidl_death_recipient interface - this locks the parent mInterfaceMutex
virtual void serviceDied(uint64_t cookie, const wp<hidl::base::V1_0::IBase>& who) override;
+ /**
+ * Setup vendor tags for this provider
+ */
+ status_t setUpVendorTags();
+
// Basic device information, common to all camera devices
struct DeviceInfo {
const std::string mName; // Full instance name
@@ -302,16 +350,20 @@
const metadata_vendor_id_t mProviderTagid;
bool mIsLogicalCamera;
std::vector<std::string> mPhysicalIds;
+ hardware::CameraInfo mInfo;
+ sp<IBase> mSavedInterface;
const hardware::camera::common::V1_0::CameraResourceCost mResourceCost;
hardware::camera::common::V1_0::CameraDeviceStatus mStatus;
+ sp<ProviderInfo> mParentProvider;
+
bool hasFlashUnit() const { return mHasFlashUnit; }
virtual status_t setTorchMode(bool enabled) = 0;
virtual status_t getCameraInfo(hardware::CameraInfo *info) const = 0;
virtual bool isAPI1Compatible() const = 0;
- virtual status_t dumpState(int fd) const = 0;
+ virtual status_t dumpState(int fd) = 0;
virtual status_t getCameraCharacteristics(CameraMetadata *characteristics) const {
(void) characteristics;
return INVALID_OPERATION;
@@ -325,19 +377,23 @@
virtual status_t isSessionConfigurationSupported(
const hardware::camera::device::V3_4::StreamConfiguration &/*configuration*/,
- bool * /*status*/)
- const {
+ bool * /*status*/) {
return INVALID_OPERATION;
}
+ template<class InterfaceT>
+ sp<InterfaceT> startDeviceInterface();
+
DeviceInfo(const std::string& name, const metadata_vendor_id_t tagId,
const std::string &id, const hardware::hidl_version& version,
const std::vector<std::string>& publicCameraIds,
- const hardware::camera::common::V1_0::CameraResourceCost& resourceCost) :
+ const hardware::camera::common::V1_0::CameraResourceCost& resourceCost,
+ sp<ProviderInfo> parentProvider) :
mName(name), mId(id), mVersion(version), mProviderTagid(tagId),
mIsLogicalCamera(false), mResourceCost(resourceCost),
mStatus(hardware::camera::common::V1_0::CameraDeviceStatus::PRESENT),
- mHasFlashUnit(false), mPublicCameraIds(publicCameraIds) {}
+ mParentProvider(parentProvider), mHasFlashUnit(false),
+ mPublicCameraIds(publicCameraIds) {}
virtual ~DeviceInfo();
protected:
bool mHasFlashUnit;
@@ -345,6 +401,14 @@
template<class InterfaceT>
static status_t setTorchMode(InterfaceT& interface, bool enabled);
+
+ template<class InterfaceT>
+ status_t setTorchModeForDevice(bool enabled) {
+ // Don't save the ICameraProvider interface here because we assume that this was
+ // called from CameraProviderManager::setTorchMode(), which does save it.
+ const sp<InterfaceT> interface = startDeviceInterface<InterfaceT>();
+ return DeviceInfo::setTorchMode(interface, enabled);
+ }
};
std::vector<std::unique_ptr<DeviceInfo>> mDevices;
std::unordered_set<std::string> mUniqueCameraIds;
@@ -360,32 +424,32 @@
// HALv1-specific camera fields, including the actual device interface
struct DeviceInfo1 : public DeviceInfo {
typedef hardware::camera::device::V1_0::ICameraDevice InterfaceT;
- const sp<InterfaceT> mInterface;
virtual status_t setTorchMode(bool enabled) override;
virtual status_t getCameraInfo(hardware::CameraInfo *info) const override;
//In case of Device1Info assume that we are always API1 compatible
virtual bool isAPI1Compatible() const override { return true; }
- virtual status_t dumpState(int fd) const override;
+ virtual status_t dumpState(int fd) override;
DeviceInfo1(const std::string& name, const metadata_vendor_id_t tagId,
const std::string &id, uint16_t minorVersion,
const hardware::camera::common::V1_0::CameraResourceCost& resourceCost,
+ sp<ProviderInfo> parentProvider,
const std::vector<std::string>& publicCameraIds,
sp<InterfaceT> interface);
virtual ~DeviceInfo1();
private:
CameraParameters2 mDefaultParameters;
+ status_t cacheCameraInfo(sp<InterfaceT> interface);
};
// HALv3-specific camera fields, including the actual device interface
struct DeviceInfo3 : public DeviceInfo {
typedef hardware::camera::device::V3_2::ICameraDevice InterfaceT;
- const sp<InterfaceT> mInterface;
virtual status_t setTorchMode(bool enabled) override;
virtual status_t getCameraInfo(hardware::CameraInfo *info) const override;
virtual bool isAPI1Compatible() const override;
- virtual status_t dumpState(int fd) const override;
+ virtual status_t dumpState(int fd) override;
virtual status_t getCameraCharacteristics(
CameraMetadata *characteristics) const override;
virtual status_t getPhysicalCameraCharacteristics(const std::string& physicalCameraId,
@@ -393,11 +457,12 @@
virtual status_t isSessionConfigurationSupported(
const hardware::camera::device::V3_4::StreamConfiguration &configuration,
bool *status /*out*/)
- const override;
+ override;
DeviceInfo3(const std::string& name, const metadata_vendor_id_t tagId,
const std::string &id, uint16_t minorVersion,
const hardware::camera::common::V1_0::CameraResourceCost& resourceCost,
+ sp<ProviderInfo> parentProvider,
const std::vector<std::string>& publicCameraIds, sp<InterfaceT> interface);
virtual ~DeviceInfo3();
private:
@@ -424,11 +489,11 @@
template<class DeviceInfoT>
std::unique_ptr<DeviceInfo> initializeDeviceInfo(const std::string &name,
const metadata_vendor_id_t tagId, const std::string &id,
- uint16_t minorVersion) const;
+ uint16_t minorVersion);
// Helper for initializeDeviceInfo to use the right CameraProvider get method.
template<class InterfaceT>
- sp<InterfaceT> getDeviceInterface(const std::string &name) const;
+ sp<InterfaceT> startDeviceInterface(const std::string &name);
// Parse provider instance name for type and id
static status_t parseProviderName(const std::string& name,
@@ -462,6 +527,14 @@
std::vector<sp<ProviderInfo>> mProviders;
+ void addProviderToMap(
+ const std::string &cameraId,
+ sp<hardware::camera::provider::V2_4::ICameraProvider> provider,
+ bool isTorchUsage);
+ void removeCameraIdFromMap(
+ std::unordered_map<std::string, sp<hardware::camera::provider::V2_4::ICameraProvider>> &map,
+ const std::string &cameraId);
+
static const char* deviceStatusToString(
const hardware::camera::common::V1_0::CameraDeviceStatus&);
static const char* torchStatusToString(