audio: Make compressed playback support a build option

Allow building with or without compressed support. To enable support
the device configuration must define

TINYHAL_COMPRESS_PLAYBACK := true

Change-Id: I72375f2727ad3aaa818185defecfc5f8c947964a
Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com>

Author: rfvirgil

audio/Android.mk

@@ -72,6 +72,9 @@ ifeq ($(strip $(TINYCOMPRESS_TSTAMP_IS_LONG)),true)
 LOCAL_CFLAGS += -DTINYCOMPRESS_TSTAMP_IS_LONG
 endif
 
+ifeq ($(strip $(TINYHAL_COMPRESS_PLAYBACK)),true)
+LOCAL_CFLAGS += -DTINYHAL_COMPRESS_PLAYBACK
+endif
 
 include $(BUILD_SHARED_LIBRARY)
 

audio/audio_hw.c

@@ -40,9 +40,12 @@
 #include <system/audio.h>
 
 #include <tinyalsa/asoundlib.h>
+
+#ifdef TINYHAL_COMPRESS_PLAYBACK
 #include <sound/compress_params.h>
 #include <sound/compress_offload.h>
 #include <tinycompress/tinycompress.h>
+#endif
 
 #include <audio_utils/resampler.h>
 
@@ -54,8 +57,6 @@
 #include <vendor/cirrus/scchal/scc_audio.h>
 #endif
 
-#define TINYHAL_COMPRESS_PLAYBACK
-
 /* These values are defined in _frames_ (not bytes) to match the ALSA API */
 #define OUT_PERIOD_SIZE_DEFAULT 256
 #define OUT_PERIOD_COUNT_DEFAULT 4
@@ -2091,15 +2092,15 @@ static int adev_open_output_stream(struct audio_hw_device *dev,
         goto err_open;
     }
 
-#ifdef TINYHAL_COMPRESS_PLAYBACK
     if (hw->type == e_stream_out_pcm) {
         ret = do_init_out_pcm(out.pcm, config);
     } else {
+#ifdef TINYHAL_COMPRESS_PLAYBACK
         ret = do_init_out_compress(out.compress, config);
-    }
 #else
-    ret = do_init_out_pcm(out.pcm, config);
+        ret = -ENOTSUP;
 #endif
+    }
 
     if (ret < 0) {
         goto err_open;