hal: Enable Compress passthrough
Enable Compress passthrough
Add Dolby and DTS formats which got removed mistakenly before.
CRs-Fixed: 1110685
Change-Id: I20f42b14bafb9b1a36bf471037f4e462e8cbd3cb
diff --git a/configure.ac b/configure.ac
index ed81b41..7966d47 100644
--- a/configure.ac
+++ b/configure.ac
@@ -103,6 +103,8 @@
AM_CONDITIONAL([AFE_PROXY], [test x$AUDIO_FEATURE_ENABLED_PROXY_DEVICE = xtrue])
AM_CONDITIONAL([HW_ACC_EFFECT], [test x$AUDIO_FEATURE_ENABLED_HW_ACCELERATED_EFFECTS = xtrue])
AM_CONDITIONAL([AUDIOSPHERE], [test x$AUDIO_FEATURE_ENABLED_AUDIOSPHERE = xtrue])
+AM_CONDITIONAL([COMPRESS_PASSTHROUGH], [test x$AUDIO_FEATURE_ENABLED_HDMI_PASSTHROUGH = xtrue])
+AM_CONDITIONAL([KEEP_ALIVE], [test x$AUDIO_FEATURE_ENABLED_KEEP_ALIVE = xtrue])
AC_CONFIG_FILES([ \
Makefile \
diff --git a/hal/Makefile.am b/hal/Makefile.am
index 9f5214a..b859e0e 100644
--- a/hal/Makefile.am
+++ b/hal/Makefile.am
@@ -128,6 +128,16 @@
c_sources += audio_extn/compress_in.c
endif
+if COMPRESS_PASSTHROUGH
+AM_CFLAGS += -DHDMI_PASSTHROUGH_ENABLED
+c_sources += audio_extn/passthru.c
+endif
+
+if KEEP_ALIVE
+AM_CFLAGS += -DKEEP_ALIVE_ENABLED
+c_sources += audio_extn/keep_alive.c
+endif
+
if AUDIO_HW_EXTN_API
AM_CFLAGS += -DAUDIO_HW_EXTN_API_ENABLED
c_sources += audio_hw_extn_api.c
diff --git a/hal/audio_extn/utils.c b/hal/audio_extn/utils.c
index 367e9a8..0ff921d 100644
--- a/hal/audio_extn/utils.c
+++ b/hal/audio_extn/utils.c
@@ -1139,6 +1139,17 @@
case AUDIO_FORMAT_MP2:
id = SND_AUDIOCODEC_MP2;
break;
+ case AUDIO_FORMAT_AC3:
+ id = SND_AUDIOCODEC_AC3;
+ break;
+ case AUDIO_FORMAT_E_AC3:
+ case AUDIO_FORMAT_E_AC3_JOC:
+ id = SND_AUDIOCODEC_EAC3;
+ break;
+ case AUDIO_FORMAT_DTS:
+ case AUDIO_FORMAT_DTS_HD:
+ id = SND_AUDIOCODEC_DTS;
+ break;
default:
ALOGE("%s: Unsupported audio format :%x", __func__, format);
}