Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/services/audiopolicy/Android.mk b/services/audiopolicy/Android.mk
- index d1b3ec8..ff7d9c8 100644
- --- a/services/audiopolicy/Android.mk
- +++ b/services/audiopolicy/Android.mk
- @@ -37,6 +37,10 @@ LOCAL_SHARED_LIBRARIES += \
- libaudiopolicymanager
- endif
- +ifeq ($(BOARD_HAVE_PRE_KITKAT_AUDIO_BLOB),true)
- + LOCAL_CFLAGS += -DHAVE_PRE_KITKAT_AUDIO_BLOB
- +endif
- +
- LOCAL_STATIC_LIBRARIES := \
- libmedia_helper \
- libserviceutility
- diff --git a/services/audiopolicy/AudioPolicyClientImplLegacy.cpp b/services/audiopolicy/AudioPolicyClientImplLegacy.cpp
- index 97719da..8e66686 100644
- --- a/services/audiopolicy/AudioPolicyClientImplLegacy.cpp
- +++ b/services/audiopolicy/AudioPolicyClientImplLegacy.cpp
- @@ -85,9 +85,14 @@ static audio_io_handle_t open_output(audio_module_handle_t module,
- config.sample_rate = *pSamplingRate;
- config.format = *pFormat;
- config.channel_mask = *pChannelMask;
- +
- +#ifdef HAVE_PRE_KITKAT_AUDIO_BLOB
- + config.offload_info = AUDIO_INFO_INITIALIZER;
- +#else
- if (offloadInfo != NULL) {
- config.offload_info = *offloadInfo;
- }
- +#endif
- audio_io_handle_t output = AUDIO_IO_HANDLE_NONE;
- status_t status = af->openOutput(module, &output, &config, pDevices,
- String8(""), pLatencyMs, flags);
- @@ -95,9 +100,11 @@ static audio_io_handle_t open_output(audio_module_handle_t module,
- *pSamplingRate = config.sample_rate;
- *pFormat = config.format;
- *pChannelMask = config.channel_mask;
- +#if !HAVE_PRE_KITKAT_AUDIO_BLOB
- if (offloadInfo != NULL) {
- *((audio_offload_info_t *)offloadInfo) = config.offload_info;
- }
- +#endif
- }
- return output;
- }
- diff --git a/services/audiopolicy/AudioPolicyInterfaceImplLegacy.cpp b/services/audiopolicy/AudioPolicyInterfaceImplLegacy.cpp
- index e1e81e1..fd47256 100644
- --- a/services/audiopolicy/AudioPolicyInterfaceImplLegacy.cpp
- +++ b/services/audiopolicy/AudioPolicyInterfaceImplLegacy.cpp
- @@ -474,6 +474,9 @@ status_t AudioPolicyService::queryDefaultPreProcessing(int audioSession,
- bool AudioPolicyService::isOffloadSupported(const audio_offload_info_t& info)
- {
- +#if HAVE_PRE_KITKAT_AUDIO_BLOB
- + return false;
- +#endif
- if (mpAudioPolicy == NULL) {
- ALOGV("mpAudioPolicy == NULL");
- return false;
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement