policy_hal: hal: add support to enable Direct PCM
- add support for direct pcm output
- add support for direct pcm in hal
if output flag is direct_pcm choose compress offload path
- add support for direct pcm in custom audio policy manager
force add direct flag when we detect pcm track in music and
game use case
Change-Id: Ie69c988ef9cd0477efa77611ceddccdd6b17a163
diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index aa31f64..8bc0572 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -161,6 +161,8 @@
[USECASE_AUDIO_PLAYBACK_OFFLOAD8] = "compress-offload-playback8",
[USECASE_AUDIO_PLAYBACK_OFFLOAD9] = "compress-offload-playback9",
#endif
+ [USECASE_AUDIO_DIRECT_PCM_OFFLOAD] = "compress-offload-playback2",
+
[USECASE_AUDIO_RECORD] = "audio-record",
[USECASE_AUDIO_RECORD_COMPRESS] = "audio-record-compress",
[USECASE_AUDIO_RECORD_LOW_LATENCY] = "low-latency-record",
@@ -207,6 +209,7 @@
USECASE_AUDIO_PLAYBACK_OFFLOAD9,
#endif
#endif
+ USECASE_AUDIO_DIRECT_PCM_OFFLOAD,
};
#define STRING_TO_ENUM(string) { #string, string }
@@ -380,6 +383,7 @@
case AUDIO_FORMAT_MP3:
case AUDIO_FORMAT_PCM_16_BIT_OFFLOAD:
case AUDIO_FORMAT_PCM_24_BIT_OFFLOAD:
+ case AUDIO_FORMAT_PCM_16_BIT:
#ifdef FLAC_OFFLOAD_ENABLED
case AUDIO_FORMAT_FLAC:
#endif
@@ -413,6 +417,7 @@
id = SND_AUDIOCODEC_AAC;
break;
case AUDIO_FORMAT_PCM_OFFLOAD:
+ case AUDIO_FORMAT_PCM:
id = SND_AUDIOCODEC_PCM;
break;
#ifdef FLAC_OFFLOAD_ENABLED
@@ -2766,7 +2771,7 @@
if ((flags & AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD) &&
(SND_CARD_STATE_OFFLINE == get_snd_card_state(adev))) {
- ALOGE(" sound card is not active rejecting compress output open request");
+ ALOGE("sound card is not active rejecting compress output open request");
return -EINVAL;
}
@@ -2840,7 +2845,8 @@
goto error_open;
}
#endif
- } else if (out->flags & AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD) {
+ } else if ((out->flags & AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD) ||
+ (out->flags & AUDIO_OUTPUT_FLAG_DIRECT_PCM)) {
ALOGD("%s: copl(%x): sample_rate(%d) channel_mask(%#x) devices(%#x) flags(%#x)",
__func__, (unsigned int)out, config->sample_rate, config->channel_mask, devices, flags);
@@ -2852,7 +2858,7 @@
}
if (!is_supported_format(config->offload_info.format) &&
!audio_extn_is_dolby_format(config->offload_info.format)) {
- ALOGE("%s: Unsupported offload audio format %x", __func__, config->offload_info.format);
+ ALOGE("%s: Unsupported audio format %x " , __func__, config->offload_info.format);
ret = -EINVAL;
goto error_open;
}
@@ -2865,7 +2871,13 @@
goto error_open;
}
- out->usecase = get_offload_usecase(adev);
+ if (out->flags & AUDIO_OUTPUT_FLAG_DIRECT_PCM) {
+ ALOGV("%s:: inserting DIRECT_PCM _USECASE", __func__);
+ out->usecase = USECASE_AUDIO_DIRECT_PCM_OFFLOAD;
+ } else {
+ ALOGV("%s:: inserting OFFLOAD_USECASE", __func__);
+ out->usecase = get_offload_usecase(adev);
+ }
if (config->offload_info.channel_mask)
out->channel_mask = config->offload_info.channel_mask;
else if (config->channel_mask) {
@@ -2890,7 +2902,8 @@
out->compr_config.codec->id =
get_snd_codec_id(config->offload_info.format);
- if (audio_is_offload_pcm(config->offload_info.format)) {
+ if (((config->offload_info.format & AUDIO_FORMAT_MAIN_MASK) == AUDIO_FORMAT_PCM_OFFLOAD)||
+ ((config->offload_info.format & AUDIO_FORMAT_MAIN_MASK) == AUDIO_FORMAT_PCM)) {
out->compr_config.fragment_size =
platform_get_pcm_offload_buffer_size(&config->offload_info);
} else {
@@ -2915,9 +2928,10 @@
out->compr_config.codec->format = SND_AUDIOSTREAMFORMAT_RAW;
if (config->offload_info.format == AUDIO_FORMAT_PCM_16_BIT_OFFLOAD)
out->compr_config.codec->format = SNDRV_PCM_FORMAT_S16_LE;
-
if (config->offload_info.format == AUDIO_FORMAT_PCM_24_BIT_OFFLOAD)
out->compr_config.codec->format = SNDRV_PCM_FORMAT_S24_LE;
+ if (config->offload_info.format == AUDIO_FORMAT_PCM_16_BIT)
+ out->compr_config.codec->format = SNDRV_PCM_FORMAT_S16_LE;
if (out->bit_width == 24)
out->compr_config.codec->format = SNDRV_PCM_FORMAT_S24_LE;
@@ -3080,7 +3094,8 @@
*stream_out = &out->stream;
ALOGD("%s: Stream (%p) picks up usecase (%s)", __func__, &out->stream,
- use_case_table[out->usecase]);
+ use_case_table[out->usecase]);
+
ALOGV("%s: exit", __func__);
return 0;
diff --git a/hal/audio_hw.h b/hal/audio_hw.h
index 54141e0..1b92a5f 100644
--- a/hal/audio_hw.h
+++ b/hal/audio_hw.h
@@ -79,6 +79,8 @@
USECASE_AUDIO_PLAYBACK_OFFLOAD9,
#endif
+ USECASE_AUDIO_DIRECT_PCM_OFFLOAD,
+
/* FM usecase */
USECASE_AUDIO_PLAYBACK_FM,
diff --git a/hal/msm8974/platform.c b/hal/msm8974/platform.c
index 8101fe5..175db55 100644
--- a/hal/msm8974/platform.c
+++ b/hal/msm8974/platform.c
@@ -185,6 +185,8 @@
{PLAYBACK_OFFLOAD_DEVICE9, PLAYBACK_OFFLOAD_DEVICE9},
#endif
#endif
+ [USECASE_AUDIO_DIRECT_PCM_OFFLOAD] =
+ {PLAYBACK_OFFLOAD_DEVICE2, PLAYBACK_OFFLOAD_DEVICE2},
[USECASE_AUDIO_RECORD] = {AUDIO_RECORD_PCM_DEVICE, AUDIO_RECORD_PCM_DEVICE},
[USECASE_AUDIO_RECORD_COMPRESS] = {COMPRESS_CAPTURE_DEVICE, COMPRESS_CAPTURE_DEVICE},
[USECASE_AUDIO_RECORD_LOW_LATENCY] = {LOWLATENCY_PCM_DEVICE,
@@ -490,6 +492,7 @@
{TO_NAME_INDEX(USECASE_AUDIO_PLAYBACK_OFFLOAD9)},
#endif
#endif
+ {TO_NAME_INDEX(USECASE_AUDIO_DIRECT_PCM_OFFLOAD)},
{TO_NAME_INDEX(USECASE_AUDIO_RECORD)},
{TO_NAME_INDEX(USECASE_AUDIO_RECORD_LOW_LATENCY)},
{TO_NAME_INDEX(USECASE_VOICE_CALL)},
diff --git a/hal/msm8974/platform.h b/hal/msm8974/platform.h
index d463b03..2c9d527 100644
--- a/hal/msm8974/platform.h
+++ b/hal/msm8974/platform.h
@@ -227,6 +227,9 @@
#endif
#endif
+// for DIRECT_PCM
+#define PLAYBACK_OFFLOAD_DEVICE2 17
+
#define COMPRESS_VOIP_CALL_PCM_DEVICE 3
#ifdef PLATFORM_MSM8610
diff --git a/policy_hal/AudioPolicyManager.cpp b/policy_hal/AudioPolicyManager.cpp
index f4c0722..3b307f8 100755
--- a/policy_hal/AudioPolicyManager.cpp
+++ b/policy_hal/AudioPolicyManager.cpp
@@ -983,6 +983,45 @@
}
return false;
}
+
+status_t AudioPolicyManagerCustom::getOutputForAttr(const audio_attributes_t *attr,
+ audio_io_handle_t *output,
+ audio_session_t session,
+ audio_stream_type_t *stream,
+ uid_t uid,
+ uint32_t samplingRate,
+ audio_format_t format,
+ audio_channel_mask_t channelMask,
+ audio_output_flags_t flags,
+ audio_port_handle_t selectedDeviceId,
+ const audio_offload_info_t *offloadInfo)
+{
+ audio_offload_info_t tOffloadInfo = AUDIO_INFO_INITIALIZER;
+
+ bool pcmOffloadEnabled = property_get_bool("audio.offload.track.enable", false);
+
+ if (offloadInfo == NULL && pcmOffloadEnabled) {
+ tOffloadInfo.sample_rate = samplingRate;
+ tOffloadInfo.channel_mask = channelMask;
+ tOffloadInfo.format = format;
+ tOffloadInfo.stream_type = *stream;
+ tOffloadInfo.bit_width = 16; //hard coded for PCM_16
+ if (attr != NULL) {
+ ALOGV("found attribute .. setting usage %d ", attr->usage);
+ tOffloadInfo.usage = attr->usage;
+ } else {
+ ALOGD("%s:: attribute is NULL .. no usage set", __func__);
+ }
+ offloadInfo = &tOffloadInfo;
+ }
+
+ return AudioPolicyManager::getOutputForAttr(attr, output, session, stream,
+ (uid_t)uid, (uint32_t)samplingRate,
+ format, (audio_channel_mask_t)channelMask,
+ flags, (audio_port_handle_t)selectedDeviceId,
+ offloadInfo);
+}
+
audio_io_handle_t AudioPolicyManagerCustom::getOutputForDevice(
audio_devices_t device,
audio_session_t session __unused,
@@ -1112,7 +1151,7 @@
}
#endif
// open a direct output if required by specified parameters
- //force direct flag if offload flag is set: offloading implies a direct output stream
+ // force direct flag if offload flag is set: offloading implies a direct output stream
// and all common behaviors are driven by checking only the direct flag
// this should normally be set appropriately in the policy configuration file
if ((flags & AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD) != 0) {
@@ -1121,6 +1160,18 @@
if ((flags & AUDIO_OUTPUT_FLAG_HW_AV_SYNC) != 0) {
flags = (audio_output_flags_t)(flags | AUDIO_OUTPUT_FLAG_DIRECT);
}
+
+ // Do offload magic here
+ if ((flags == AUDIO_OUTPUT_FLAG_NONE) && (stream == AUDIO_STREAM_MUSIC) &&
+ (offloadInfo != NULL) &&
+ ((offloadInfo->usage == AUDIO_USAGE_MEDIA ||
+ (offloadInfo->usage == AUDIO_USAGE_GAME)))) {
+ if ((flags & AUDIO_OUTPUT_FLAG_DIRECT) == 0) {
+ ALOGD("AudioCustomHAL --> Force Direct Flag ..");
+ flags = (audio_output_flags_t)(flags | AUDIO_OUTPUT_FLAG_DIRECT);
+ }
+ }
+
// only allow deep buffering for music stream type
if (stream != AUDIO_STREAM_MUSIC) {
flags = (audio_output_flags_t)(flags &~AUDIO_OUTPUT_FLAG_DEEP_BUFFER);
@@ -1272,7 +1323,7 @@
ALOGW_IF((output == 0), "getOutput() could not find output for stream %d, samplingRate %d,"
"format %d, channels %x, flags %x", stream, samplingRate, format, channelMask, flags);
- ALOGV(" getOutputForDevice() returns output %d", output);
+ ALOGV("getOutputForDevice() returns output %d", output);
return output;
}
diff --git a/policy_hal/AudioPolicyManager.h b/policy_hal/AudioPolicyManager.h
index 91b7e39..2e5951c 100644
--- a/policy_hal/AudioPolicyManager.h
+++ b/policy_hal/AudioPolicyManager.h
@@ -91,6 +91,7 @@
status_t stopSource(sp<AudioOutputDescriptor> outputDesc,
audio_stream_type_t stream,
bool forceDeviceUpdate);
+
// event is one of STARTING_OUTPUT, STARTING_BEACON, STOPPING_OUTPUT, STOPPING_BEACON 313
// returns 0 if no mute/unmute event happened, the largest latency of the device where 314
// the mute/unmute happened 315
@@ -123,6 +124,18 @@
audio_channel_mask_t channelMask,
audio_output_flags_t flags,
const audio_offload_info_t *offloadInfo);
+ // internal method to fill offload info in case of Direct PCM
+ status_t getOutputForAttr(const audio_attributes_t *attr,
+ audio_io_handle_t *output,
+ audio_session_t session,
+ audio_stream_type_t *stream,
+ uid_t uid,
+ uint32_t samplingRate,
+ audio_format_t format,
+ audio_channel_mask_t channelMask,
+ audio_output_flags_t flags,
+ audio_port_handle_t selectedDeviceId,
+ const audio_offload_info_t *offloadInfo);
// Used for voip + voice concurrency usecase
int mPrevPhoneState;
int mvoice_call_state;