Advertisement
Guest User

Untitled

a guest
Nov 23rd, 2014
131
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 2.33 KB | None | 0 0
  1. diff --git a/services/audiopolicy/Android.mk b/services/audiopolicy/Android.mk
  2. index d1b3ec8..ff7d9c8 100644
  3. --- a/services/audiopolicy/Android.mk
  4. +++ b/services/audiopolicy/Android.mk
  5. @@ -37,6 +37,10 @@ LOCAL_SHARED_LIBRARIES += \
  6. libaudiopolicymanager
  7. endif
  8.  
  9. +ifeq ($(BOARD_HAVE_PRE_KITKAT_AUDIO_BLOB),true)
  10. + LOCAL_CFLAGS += -DHAVE_PRE_KITKAT_AUDIO_BLOB
  11. +endif
  12. +
  13. LOCAL_STATIC_LIBRARIES := \
  14. libmedia_helper \
  15. libserviceutility
  16. diff --git a/services/audiopolicy/AudioPolicyClientImplLegacy.cpp b/services/audiopolicy/AudioPolicyClientImplLegacy.cpp
  17. index 97719da..8e66686 100644
  18. --- a/services/audiopolicy/AudioPolicyClientImplLegacy.cpp
  19. +++ b/services/audiopolicy/AudioPolicyClientImplLegacy.cpp
  20. @@ -85,9 +85,14 @@ static audio_io_handle_t open_output(audio_module_handle_t module,
  21. config.sample_rate = *pSamplingRate;
  22. config.format = *pFormat;
  23. config.channel_mask = *pChannelMask;
  24. +
  25. +#ifdef HAVE_PRE_KITKAT_AUDIO_BLOB
  26. + config.offload_info = AUDIO_INFO_INITIALIZER;
  27. +#else
  28. if (offloadInfo != NULL) {
  29. config.offload_info = *offloadInfo;
  30. }
  31. +#endif
  32. audio_io_handle_t output = AUDIO_IO_HANDLE_NONE;
  33. status_t status = af->openOutput(module, &output, &config, pDevices,
  34. String8(""), pLatencyMs, flags);
  35. @@ -95,9 +100,11 @@ static audio_io_handle_t open_output(audio_module_handle_t module,
  36. *pSamplingRate = config.sample_rate;
  37. *pFormat = config.format;
  38. *pChannelMask = config.channel_mask;
  39. +#if !HAVE_PRE_KITKAT_AUDIO_BLOB
  40. if (offloadInfo != NULL) {
  41. *((audio_offload_info_t *)offloadInfo) = config.offload_info;
  42. }
  43. +#endif
  44. }
  45. return output;
  46. }
  47. diff --git a/services/audiopolicy/AudioPolicyInterfaceImplLegacy.cpp b/services/audiopolicy/AudioPolicyInterfaceImplLegacy.cpp
  48. index e1e81e1..fd47256 100644
  49. --- a/services/audiopolicy/AudioPolicyInterfaceImplLegacy.cpp
  50. +++ b/services/audiopolicy/AudioPolicyInterfaceImplLegacy.cpp
  51. @@ -474,6 +474,9 @@ status_t AudioPolicyService::queryDefaultPreProcessing(int audioSession,
  52.  
  53. bool AudioPolicyService::isOffloadSupported(const audio_offload_info_t& info)
  54. {
  55. +#if HAVE_PRE_KITKAT_AUDIO_BLOB
  56. + return false;
  57. +#endif
  58. if (mpAudioPolicy == NULL) {
  59. ALOGV("mpAudioPolicy == NULL");
  60. return false;
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement