audio: fix compile error after revert AOSP change [2/2]

PD# NONE

1) fix libtvaudio compile error
2) fix audio hal compile error

Change-Id: I3c514310a4149e6ed0ab40ed13f89c59adc35c24

8 files changed, 44 insertions, 23 deletions

diff --git a/audio_hw.c b/audio_hw.c
index 572a828..3830e9a 100644
--- a/audio_hw.c
+++ b/audio_hw.c
@@ -482,7 +482,7 @@ static int start_output_stream_direct(struct aml_stream_out *out)
         //out->raw_61937_frame_size = 16;
         break;
     case AUDIO_FORMAT_DTS_HD:
-    case AUDIO_FORMAT_TRUEHD:
+    case AUDIO_FORMAT_DOLBY_TRUEHD:
         out->config.period_size = PERIOD_SIZE * 4 * 2;
         out->write_threshold = PLAYBACK_PERIOD_COUNT * PERIOD_SIZE * 4 * 2;
         out->config.start_threshold = PLAYBACK_PERIOD_COUNT * PERIOD_SIZE * 4 * 2;
@@ -717,7 +717,7 @@ static size_t out_get_buffer_size(const struct audio_stream *stream)
         }
         break;
     case AUDIO_FORMAT_DTS_HD:
-    case AUDIO_FORMAT_TRUEHD:
+    case AUDIO_FORMAT_DOLBY_TRUEHD:
         if (out->flags & AUDIO_OUTPUT_FLAG_IEC958_NONAUDIO) {
             size = 16 * PERIOD_SIZE * PLAYBACK_PERIOD_COUNT;
         } else {
diff --git a/audio_hw.h b/audio_hw.h
index 2044270..ba95ebc 100644
--- a/audio_hw.h
+++ b/audio_hw.h
@@ -33,6 +33,18 @@ static unsigned int DEFAULT_OUT_SAMPLING_RATE = 48000;
 /* sampling rate when using VX port for narrow band */
 #define VX_NB_SAMPLING_RATE 8000
 
+#define AUDIO_PARAMETER_STREAM_EQ "audioeffect_eq"
+#define AUDIO_PARAMETER_STREAM_SRS "audioeffect_srs_param"
+#define AUDIO_PARAMETER_STREAM_SRS_GAIN "audioeffect_srs_gain"
+#define AUDIO_PARAMETER_STREAM_SRS_SWITCH "audioeffect_srs_switch"
+
+/* Get a new HW synchronization source identifier.
+ * Return a valid source (positive integer) or AUDIO_HW_SYNC_INVALID if an error occurs
+ * or no HW sync is available. */
+#define AUDIO_PARAMETER_HW_AV_SYNC "hw_av_sync"
+
+#define AUDIO_PARAMETER_HW_AV_EAC3_SYNC "HwAvSyncEAC3Supported"
+
 enum {
     TYPE_PCM = 0,
     TYPE_AC3 = 2,
diff --git a/audio_hw_utils.c b/audio_hw_utils.c
index 39441af..17febea 100644
--- a/audio_hw_utils.c
+++ b/audio_hw_utils.c
@@ -142,7 +142,7 @@ int get_codec_type(int format)
         return TYPE_DTS;
     case AUDIO_FORMAT_DTS_HD:
         return TYPE_DTS_HD_MA;
-    case AUDIO_FORMAT_TRUEHD:
+    case AUDIO_FORMAT_DOLBY_TRUEHD:
         return TYPE_TRUE_HD;
     case AUDIO_FORMAT_PCM:
         return TYPE_PCM;
diff --git a/libTVaudio/Android.mk b/libTVaudio/Android.mk
index 714515e..3b17b1b 100644
--- a/libTVaudio/Android.mk
+++ b/libTVaudio/Android.mk
@@ -7,7 +7,8 @@ ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo OK),OK)
 	LOCAL_PROPRIETARY_MODULE := true
 endif
 LOCAL_SHARED_LIBRARIES := libcutils libutils libtinyalsa libdl \
-    libmedia libbinder libstagefright libstagefright_foundation
+    libmedia libbinder libstagefright libstagefright_foundation  libaaudio  liblog libaudioclient \
+    libmedia_helper
 
 ifneq (0, $(shell expr $(PLATFORM_VERSION) \>= 5.0))
 LOCAL_SHARED_LIBRARIES += libsystemcontrolservice
@@ -36,11 +37,10 @@ LOCAL_SRC_FILES := \
     audio/audio_amaudio.cpp \
     audio/audio_usb_check.cpp \
     audio/amaudio_main.cpp \
-    audio/DDP_media_source.cpp \
     audio/aml_shelf.c \
-    audio/DTSHD_media_source.cpp \
     ../audio_virtual_effect.c
-
+    #audio/DDP_media_source.cpp \
+    #audio/DTSHD_media_source.cpp 
 LOCAL_STATIC_LIBRARIES += libmusicbundle
 
 LOCAL_CFLAGS := -DANDROID_PLATFORM_SDK_VERSION=$(PLATFORM_SDK_VERSION)  -DUSE_SYS_WRITE_SERVICE=1
diff --git a/libTVaudio/audio/Android.mk b/libTVaudio/audio/Android.mk
index 4949e0c..6f2752a 100644
--- a/libTVaudio/audio/Android.mk
+++ b/libTVaudio/audio/Android.mk
@@ -7,7 +7,8 @@ ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo OK),OK)
 	LOCAL_PROPRIETARY_MODULE := true
 endif
 LOCAL_SHARED_LIBRARIES := libcutils libutils libtinyalsa libdl \
-    libmedia libbinder libusbhost libstagefright
+    libmedia libbinder libusbhost libstagefright   libaaudio  liblog libaudioclient \
+    libmedia_helper
 
 LOCAL_C_INCLUDES := \
     external/tinyalsa/include \
@@ -22,8 +23,8 @@ LOCAL_SRC_FILES := \
     audio_amaudio.cpp \
     audio_usb_check.cpp \
     amaudio_main.cpp \
-    DDP_media_source.cpp \
-    DTSHD_media_source.cpp \
+#    DDP_media_source.cpp \
+#    DTSHD_media_source.cpp \
 LOCAL_CFLAGS := -DANDROID_PLATFORM_SDK_VERSION=$(PLATFORM_SDK_VERSION)
 
 LOCAL_MODULE_TAGS := optional
diff --git a/libTVaudio/audio/aml_audio.c b/libTVaudio/audio/aml_audio.c
index ccb2b47..69e7ac6 100644
--- a/libTVaudio/audio/aml_audio.c
+++ b/libTVaudio/audio/aml_audio.c
@@ -1331,7 +1331,7 @@ static int aml_device_init(struct aml_dev *device) {
         device->has_Virtualizer = 0;
     }
 
-    audio_IIR_init();
+    //audio_IIR_init();
     audio_effect_load_para(device);
     ALOGD("%s, exiting...\n", __FUNCTION__);
     return 0;
@@ -1373,8 +1373,8 @@ static int aml_device_close(struct aml_dev *device) {
         free(in->delay_buf.start_add);
     }
 
-    omx_codec_close();
-    omx_codec_dts_close();
+    //omx_codec_close();
+    //omx_codec_dts_close();
     omx_started = 0;
 
     if (out->output_device == CC_OUT_USE_ALSA) {
@@ -1525,17 +1525,19 @@ err_exit:
     set_output_deviceID(MODERAW);
     out->output_device = CC_OUT_USE_ANDROID;
     set_Hardware_resample(4);
-    if (audioin_type == AC3 || audioin_type == EAC3)
-        omx_codec_init();
-    if (audioin_type == DTS || audioin_type == DTSHD)
-        omx_codec_dts_init();
+    if (audioin_type == AC3 || audioin_type == EAC3) {
+        //omx_codec_init();
+    }
+    if (audioin_type == DTS || audioin_type == DTSHD) {
+        //omx_codec_dts_init();
+    }
     return 0;
 }
 
 static int set_rawdata_in_disable(struct aml_stream_out *out) {
 
-    omx_codec_close();
-    omx_codec_dts_close();
+    //omx_codec_close();
+    //omx_codec_dts_close();
 
     if ((gUSBCheckFlag & AUDIO_DEVICE_OUT_SPEAKER) != 0) {
         if (out->user_set_device == CC_OUT_USE_AMAUDIO) {
@@ -1584,7 +1586,8 @@ static int check_audio_type(struct aml_stream_out *out) {
     if (audioin_type == LPCM && omx_started == 1) {
         pcm_data_counter++;
     }
-    if (raw_data_counter >= 1 && omx_started == 0) {
+    //temp disable raw stream check as the dts/dolby decoder is not ready
+    if (0 && raw_data_counter >= 1 && omx_started == 0) {
         ALOGI("%s, audio type is changed to RAW data input!,type %d\n", __FUNCTION__,audioin_type);
         set_rawdata_in_enable(out);
         omx_started = 1;
diff --git a/libTVaudio/audio/android_out.cpp b/libTVaudio/audio/android_out.cpp
index fa0e519..4d9c9dd 100644
--- a/libTVaudio/audio/android_out.cpp
+++ b/libTVaudio/audio/android_out.cpp
@@ -8,14 +8,13 @@
 #include <errno.h>
 #include <strings.h>
 #include <sys/ioctl.h>
-#include <cutils/log.h>
 #include <cutils/properties.h>
 #include <media/AudioTrack.h>
-
+#include <utils/Log.h>
 #include "audio_usb_check.h"
 #include "android_out.h"
 #include "aml_audio.h"
-#include "DDP_media_source.h"
+//#include "DDP_media_source.h"
 
 using namespace android;
 
diff --git a/libTVaudio/audio_amaudio.h b/libTVaudio/audio_amaudio.h
index 486a986..63c1e10 100644
--- a/libTVaudio/audio_amaudio.h
+++ b/libTVaudio/audio_amaudio.h
@@ -3,6 +3,12 @@
 
 #include "audio/aml_audio.h"
 
+#define AUDIO_PARAMETER_STREAM_EQ "audioeffect_eq"
+#define AUDIO_PARAMETER_STREAM_SRS "audioeffect_srs_param"
+#define AUDIO_PARAMETER_STREAM_SRS_GAIN "audioeffect_srs_gain"
+#define AUDIO_PARAMETER_STREAM_SRS_SWITCH "audioeffect_srs_switch"
+
+
 int amSetAudioDelay(int delay_ms);
 int amGetAudioDelay(void);
 int amAudioOpen(unsigned int sr, int input_device, int output_device);