Merge "audio_policy: modify few methods to appropriately override base"
diff --git a/hal/audio_extn/utils.c b/hal/audio_extn/utils.c
index 8a46e70..531cf69 100644
--- a/hal/audio_extn/utils.c
+++ b/hal/audio_extn/utils.c
@@ -78,6 +78,7 @@
const struct string_to_enum s_flag_name_to_enum_table[] = {
STRING_TO_ENUM(AUDIO_OUTPUT_FLAG_DIRECT),
+ STRING_TO_ENUM(AUDIO_OUTPUT_FLAG_DIRECT_PCM),
STRING_TO_ENUM(AUDIO_OUTPUT_FLAG_PRIMARY),
STRING_TO_ENUM(AUDIO_OUTPUT_FLAG_FAST),
STRING_TO_ENUM(AUDIO_OUTPUT_FLAG_DEEP_BUFFER),
diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index c55cd13..308a6a8 100755
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -178,6 +178,8 @@
[USECASE_AUDIO_PLAYBACK_OFFLOAD9] = "compress-offload-playback9",
#endif
[USECASE_AUDIO_PLAYBACK_ULL] = "audio-ull-playback",
+ [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",
@@ -222,6 +224,7 @@
USECASE_AUDIO_PLAYBACK_OFFLOAD8,
USECASE_AUDIO_PLAYBACK_OFFLOAD9,
#endif
+ USECASE_AUDIO_DIRECT_PCM_OFFLOAD,
};
#define STRING_TO_ENUM(string) { #string, string }
@@ -291,6 +294,7 @@
format == AUDIO_FORMAT_AAC_ADTS_HE_V2 ||
format == AUDIO_FORMAT_PCM_16_BIT_OFFLOAD ||
format == AUDIO_FORMAT_PCM_24_BIT_OFFLOAD ||
+ format == AUDIO_FORMAT_PCM_16_BIT ||
format == AUDIO_FORMAT_FLAC ||
format == AUDIO_FORMAT_ALAC ||
format == AUDIO_FORMAT_APE ||
@@ -317,6 +321,7 @@
id = SND_AUDIOCODEC_AAC;
break;
case AUDIO_FORMAT_PCM_OFFLOAD:
+ case AUDIO_FORMAT_PCM:
id = SND_AUDIOCODEC_PCM;
break;
case AUDIO_FORMAT_FLAC:
@@ -2841,7 +2846,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;
}
@@ -2911,7 +2916,9 @@
__func__, ret);
goto error_open;
}
- } 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)) {
+
if (config->offload_info.version != AUDIO_INFO_INITIALIZER.version ||
config->offload_info.size != AUDIO_INFO_INITIALIZER.size) {
ALOGE("%s: Unsupported Offload information", __func__);
@@ -2932,7 +2939,7 @@
if (!is_supported_format(config->offload_info.format) &&
!audio_extn_is_dolby_format(config->offload_info.format)) {
- ALOGE("%s: Unsupported audio format", __func__);
+ ALOGE("%s: Unsupported audio format %x " , __func__, config->offload_info.format);
ret = -EINVAL;
goto error_open;
}
@@ -2945,7 +2952,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) {
@@ -2969,7 +2982,9 @@
else
out->compr_config.codec->id =
get_snd_codec_id(config->offload_info.format);
- if ((config->offload_info.format & AUDIO_FORMAT_MAIN_MASK) == AUDIO_FORMAT_PCM_OFFLOAD) {
+
+ 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 if (audio_extn_dolby_is_passthrough_stream(out->flags)) {
@@ -2997,8 +3012,10 @@
out->compr_config.codec->format = SND_AUDIOSTREAMFORMAT_MP4ADTS;
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)
+ 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;
@@ -3145,7 +3162,7 @@
*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]);
if (out->flags & AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD)
audio_extn_dts_notify_playback_state(out->usecase, 0, out->sample_rate,
diff --git a/hal/audio_hw.h b/hal/audio_hw.h
index 59d6a89..85be217 100644
--- a/hal/audio_hw.h
+++ b/hal/audio_hw.h
@@ -96,6 +96,8 @@
#endif
USECASE_AUDIO_PLAYBACK_ULL,
+ USECASE_AUDIO_DIRECT_PCM_OFFLOAD,
+
/* FM usecase */
USECASE_AUDIO_PLAYBACK_FM,
diff --git a/hal/msm8916/platform.c b/hal/msm8916/platform.c
index 240598f..976cfe9 100644
--- a/hal/msm8916/platform.c
+++ b/hal/msm8916/platform.c
@@ -143,7 +143,7 @@
#define AUDIO_PARAMETER_KEY_REC_PLAY_CONC "rec_play_conc_on"
-#define AUDIO_PARAMETER_IS_HW_DECODER_SESSION_ALLOWED "is_hw_dec_session_allowed"
+#define AUDIO_PARAMETER_IS_HW_DECODER_SESSION_AVAILABLE "is_hw_dec_session_available"
#define MAX_DSP_ONLY_DECODERS 6
@@ -282,6 +282,8 @@
[USECASE_AUDIO_PLAYBACK_OFFLOAD9] = {-1, -1},
#endif
[USECASE_AUDIO_PLAYBACK_ULL] = {MULTIMEDIA3_PCM_DEVICE, MULTIMEDIA3_PCM_DEVICE},
+ [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,
@@ -666,6 +668,7 @@
{TO_NAME_INDEX(USECASE_AUDIO_PLAYBACK_OFFLOAD9)},
#endif
{TO_NAME_INDEX(USECASE_AUDIO_PLAYBACK_ULL)},
+ {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)},
@@ -3558,7 +3561,7 @@
}
native_audio_get_params(query, reply, value, sizeof(value));
- ret = str_parms_get_str(query, AUDIO_PARAMETER_IS_HW_DECODER_SESSION_ALLOWED,
+ ret = str_parms_get_str(query, AUDIO_PARAMETER_IS_HW_DECODER_SESSION_AVAILABLE,
value, sizeof(value));
if (ret >= 0) {
int isallowed = 1; /*true*/
@@ -3585,7 +3588,7 @@
}
}
}
- str_parms_add_int(reply, AUDIO_PARAMETER_IS_HW_DECODER_SESSION_ALLOWED, isallowed);
+ str_parms_add_int(reply, AUDIO_PARAMETER_IS_HW_DECODER_SESSION_AVAILABLE, isallowed);
}
@@ -3638,6 +3641,7 @@
case USECASE_AUDIO_PLAYBACK_DEEP_BUFFER:
case USECASE_AUDIO_PLAYBACK_MULTI_CH:
case USECASE_AUDIO_PLAYBACK_OFFLOAD:
+ case USECASE_AUDIO_DIRECT_PCM_OFFLOAD:
needs_event = true;
break;
/* concurrent playback in low latency allowed */
@@ -3701,6 +3705,7 @@
case USECASE_AUDIO_PLAYBACK_DEEP_BUFFER:
case USECASE_AUDIO_PLAYBACK_MULTI_CH:
case USECASE_AUDIO_PLAYBACK_OFFLOAD:
+ case USECASE_AUDIO_DIRECT_PCM_OFFLOAD:
needs_event = true;
break;
/* concurrent playback in low latency allowed */
diff --git a/hal/msm8916/platform.h b/hal/msm8916/platform.h
index 5d0ad2d..7a25b70 100644
--- a/hal/msm8916/platform.h
+++ b/hal/msm8916/platform.h
@@ -248,6 +248,8 @@
#define SPKR_PROT_CALIB_RX_PCM_DEVICE 5
#define SPKR_PROT_CALIB_TX_PCM_DEVICE 26
#define PLAYBACK_OFFLOAD_DEVICE 9
+#define PLAYBACK_OFFLOAD_DEVICE2 24
+
#define COMPRESS_VOIP_CALL_PCM_DEVICE 3
diff --git a/hal/msm8974/platform.c b/hal/msm8974/platform.c
index d519764..6f48828 100644
--- a/hal/msm8974/platform.c
+++ b/hal/msm8974/platform.c
@@ -260,6 +260,9 @@
[USECASE_AUDIO_PLAYBACK_ULL] = {MULTIMEDIA3_PCM_DEVICE,
MULTIMEDIA3_PCM_DEVICE},
+ [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,
@@ -612,6 +615,7 @@
{TO_NAME_INDEX(USECASE_AUDIO_PLAYBACK_OFFLOAD9)},
#endif
{TO_NAME_INDEX(USECASE_AUDIO_PLAYBACK_ULL)},
+ {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 4787b86..fdf3400 100644
--- a/hal/msm8974/platform.h
+++ b/hal/msm8974/platform.h
@@ -265,6 +265,9 @@
#endif
#endif
+// for DIRECT_PCM
+#define PLAYBACK_OFFLOAD_DEVICE2 17
+
#define COMPRESS_VOIP_CALL_PCM_DEVICE 3
#ifdef PLATFORM_MSM8610
diff --git a/hal/voice.c b/hal/voice.c
index 527856f..bc9d5c7 100644
--- a/hal/voice.c
+++ b/hal/voice.c
@@ -131,8 +131,7 @@
}
session->state.current = CALL_INACTIVE;
- if (adev->mode == AUDIO_MODE_NORMAL)
- adev->voice.is_in_call = false;
+ adev->voice.is_in_call = false;
/* Disable sidetone only when no calls are active */
if (!voice_is_call_state_active(adev))
diff --git a/policy_hal/AudioPolicyManager.cpp b/policy_hal/AudioPolicyManager.cpp
index a9bddd2..b69968f 100644
--- a/policy_hal/AudioPolicyManager.cpp
+++ b/policy_hal/AudioPolicyManager.cpp
@@ -1242,6 +1242,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,
@@ -1460,7 +1499,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) {
@@ -1469,6 +1508,16 @@
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)))) {
+ ALOGD("AudioCustomHAL --> Force Direct Flag ..");
+ flags = (audio_output_flags_t)(AUDIO_OUTPUT_FLAG_DIRECT_PCM | 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);
@@ -1638,7 +1687,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 1572d0e..437e3b9 100644
--- a/policy_hal/AudioPolicyManager.h
+++ b/policy_hal/AudioPolicyManager.h
@@ -134,6 +134,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;