modify for AMLTV Nougat bringup

Change-Id: I22a78f0c9d0b87ab98bc327eefbc0101ea04ccc2

8 files changed, 42 insertions, 42 deletions

diff --git a/libTVaudio/Android.mk b/libTVaudio/Android.mk
index 4300cec..88eee9e 100644
--- a/libTVaudio/Android.mk
+++ b/libTVaudio/Android.mk
@@ -5,7 +5,8 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := libTVaudio
 
 LOCAL_SHARED_LIBRARIES := libcutils libutils libtinyalsa libdl \
-    libmedia libbinder libstagefright
+    libmedia libbinder libstagefright libstagefright_foundation
+
 ifneq (0, $(shell expr $(PLATFORM_VERSION) \>= 5.0))
 LOCAL_SHARED_LIBRARIES += libsystemcontrolservice
 else
diff --git a/libTVaudio/audio/DDP_media_source.cpp b/libTVaudio/audio/DDP_media_source.cpp
index 83c6516..7de39b2 100644
--- a/libTVaudio/audio/DDP_media_source.cpp
+++ b/libTVaudio/audio/DDP_media_source.cpp
@@ -1,3 +1,5 @@
+#define LOG_TAG "DDP_Media_Source"
+
 #include <stdio.h>
 #include <stdarg.h>
 #include <string.h>
@@ -23,6 +25,7 @@
 #endif
 // code end
 #endif
+#include <media/stagefright/SimpleDecodingSource.h>
 
 #include "DDP_media_source.h"
 #include "aml_audio.h"
@@ -32,7 +35,6 @@ extern struct circle_buffer DD_out_buffer;
 extern int spdif_audio_type;
 namespace android {
 
-#define LOG_TAG "DDP_Media_Source"
 
 #ifdef USE_SYS_WRITE_SERVICE
 //code here for system write service
@@ -42,7 +44,7 @@ class DeathNotifier: public IBinder::DeathRecipient
         DeathNotifier() {
         }
 
-        void binderDied(const wp<IBinder>& who) {
+        void binderDied(__unused const wp<IBinder>& who) {
             ALOGW("system_write died!");
         }
 };
@@ -128,7 +130,7 @@ static DDPerr ddbs_unprj(DDP_BSTRM *p_bstrm, DDPshort *p_data,  DDPshort numbits
 static int Get_DD_Parameters(void *buf, int *sample_rate, int *frame_size, int *ChNum)
 {
     int numch=0;
-    DDP_BSTRM bstrm={0};
+    DDP_BSTRM bstrm={NULL, 0, 0};
     DDP_BSTRM *p_bstrm=&bstrm;
     short tmp=0,acmod,lfeon,fscod,frmsizecod;
     ddbs_init((short*)buf,0,p_bstrm);
@@ -204,7 +206,7 @@ static int Get_DD_Parameters(void *buf, int *sample_rate, int *frame_size, int *
 static int Get_DDP_Parameters(void *buf, int *sample_rate, int *frame_size,int *ChNum)
 {
     int numch = 0;
-    DDP_BSTRM bstrm={0};
+    DDP_BSTRM bstrm={NULL, 0, 0};
     DDP_BSTRM *p_bstrm=&bstrm;
     short tmp=0,acmod,lfeon,strmtyp;
     ddbs_init((short*)buf,0,p_bstrm);
@@ -277,7 +279,7 @@ static DDPerr ddbs_getbsid(DDP_BSTRM *p_inbstrm,    DDPshort *p_bsid)
 
 static int Get_Parameters(void *buf, int *sample_rate, int *frame_size,int *ChNum)
  {
-    DDP_BSTRM bstrm={0};
+    DDP_BSTRM bstrm={NULL, 0, 0};
     DDP_BSTRM *p_bstrm=&bstrm;
     DDPshort    bsid;
     int chnum = 0;
@@ -357,7 +359,7 @@ sp<MetaData> DDP_Media_Source::getFormat() {
     return mMeta;
 }
 
-status_t DDP_Media_Source::start(MetaData *params) {
+status_t DDP_Media_Source::start(__unused MetaData *params) {
     ALOGI("[DDP_Media_Source::%s: %d]\n", __FUNCTION__, __LINE__);
     mGroup = new MediaBufferGroup;
     mGroup->add_buffer(new MediaBuffer(4096));
@@ -396,7 +398,7 @@ int DDP_Media_Source::MediaSourceRead_buffer(unsigned char *buffer, int size) {
     return readcnt;
 }
 
-status_t DDP_Media_Source::read(MediaBuffer **out, const ReadOptions *options) {
+status_t DDP_Media_Source::read(MediaBuffer **out, __unused const ReadOptions *options) {
     *out = NULL;
     unsigned char ptr_head[PTR_HEAD_SIZE] = { 0 };
     int readedbytes;
@@ -524,8 +526,7 @@ Aml_OMX_Codec::Aml_OMX_Codec(void) {
         m_OMXMediaSource = new DDP_Media_Source();
         sp < MetaData > metadata = m_OMXMediaSource->getFormat();
         metadata->setCString(kKeyMIMEType, mine_type);
-        m_codec = OMXCodec::Create(m_OMXClient.interface(), metadata, false, // createEncoder
-                m_OMXMediaSource, 0, 0);
+        m_codec = SimpleDecodingSource::Create(m_OMXMediaSource, 0, 0);
 
         if (m_codec != NULL) {
             ALOGI("OMXCodec::Create success %s %d \n", __FUNCTION__, __LINE__);
@@ -703,7 +704,7 @@ int omx_codec_get_Nch() {
 
 //--------------------------------------Decoder ThreadLoop--------------------------------------------
 
-void *decode_threadloop(void *args) {
+void *decode_threadloop(__unused void *args) {
     unsigned int outlen = 0;
     unsigned int outlen_raw = 0;
     unsigned int outlen_pcm = 0;
diff --git a/libTVaudio/audio/DDP_media_source.h b/libTVaudio/audio/DDP_media_source.h
index 8df117d..8ab2b6e 100644
--- a/libTVaudio/audio/DDP_media_source.h
+++ b/libTVaudio/audio/DDP_media_source.h
@@ -1,14 +1,13 @@
 #ifndef __DDP_MEDIA_SOURCE_H__
 #define __DDP_MEDIA_SOURCE_H__
 
-#include  "MediaSource.h"
-#include  "DataSource.h"
-#include  "MediaBufferGroup.h"
-#include  "MetaData.h"
-#include  "OMXCodec.h"
-#include  "OMX_Index.h"
-#include  "OMX_Core.h"
-#include  "OMXClient.h"
+#include  <MediaSource.h>
+#include  <DataSource.h>
+#include  <MediaBufferGroup.h>
+#include  <MetaData.h>
+#include  <OMX_Index.h>
+#include  <OMX_Core.h>
+#include  <OMXClient.h>
 
 namespace android {
 
diff --git a/libTVaudio/audio/DTSHD_media_source.cpp b/libTVaudio/audio/DTSHD_media_source.cpp
index dc31927..8127e1a 100644
--- a/libTVaudio/audio/DTSHD_media_source.cpp
+++ b/libTVaudio/audio/DTSHD_media_source.cpp
@@ -1,3 +1,5 @@
+#define LOG_TAG "DTSHD_Media_Source"
+
 #include <stdio.h>
 #include <stdarg.h>
 #include <string.h>
@@ -23,6 +25,7 @@
 #endif
 // code end
 #endif
+#include <media/stagefright/SimpleDecodingSource.h>
 
 #include "DTSHD_media_source.h"
 #include "aml_audio.h"
@@ -32,8 +35,6 @@ extern struct circle_buffer DD_out_buffer;
 extern int spdif_audio_type;
 namespace android {
 
-#define LOG_TAG "DTSHD_Media_Source"
-
 #ifdef USE_SYS_WRITE_SERVICE
 //code here for system write service
 class DeathNotifier: public IBinder::DeathRecipient
@@ -42,7 +43,7 @@ class DeathNotifier: public IBinder::DeathRecipient
         DeathNotifier() {
         }
 
-        void binderDied(const wp<IBinder>& who) {
+        void binderDied(__unused const wp<IBinder>& who) {
             ALOGW("system_write died!");
         }
 };
@@ -155,7 +156,7 @@ sp<MetaData> Dtshd_Media_Source::getFormat() {
     return mMeta;
 }
 
-status_t Dtshd_Media_Source::start(MetaData *params) {
+status_t Dtshd_Media_Source::start(__unused MetaData *params) {
     ALOGI("[Dtshd_Media_Source::%s: %d]\n", __FUNCTION__, __LINE__);
     mGroup = new MediaBufferGroup;
     mGroup->add_buffer(new MediaBuffer(4096*2));
@@ -194,7 +195,7 @@ int Dtshd_Media_Source::MediaSourceRead_buffer(unsigned char *buffer, int size)
     }
     return readcnt;
 }
-status_t Dtshd_Media_Source::read(MediaBuffer **out, const ReadOptions *options) {
+status_t Dtshd_Media_Source::read(MediaBuffer **out, __unused const ReadOptions *options) {
     *out = NULL;
     unsigned char ptr_head[4] = { 0 };
     unsigned char ptr_head2[IEC61937_DTS_HEAD_PTR -4] = { 0 };
@@ -309,8 +310,7 @@ Aml_OMX_DtsCodec::Aml_OMX_DtsCodec(void) {
         m_OMXMediaSource = new Dtshd_Media_Source();
         sp < MetaData > metadata = m_OMXMediaSource->getFormat();
         metadata->setCString(kKeyMIMEType, mine_type);
-        m_codec = OMXCodec::Create(m_OMXClient.interface(), metadata, false, // createEncoder
-                m_OMXMediaSource, 0, 0);
+        m_codec = SimpleDecodingSource::Create(m_OMXMediaSource, 0, 0);
 
         if (m_codec != NULL) {
             ALOGI("OMXCodec::Create success %s %d \n", __FUNCTION__, __LINE__);
@@ -487,7 +487,7 @@ int omx_dts_codec_get_Nch() {
 
 //--------------------------------------Decoder ThreadLoop--------------------------------------------
 
-void *dts_decode_threadloop(void *args) {
+void *dts_decode_threadloop(__unused void *args) {
     unsigned int outlen = 0;
     unsigned int outlen_raw = 0;
     unsigned int outlen_pcm = 0;
diff --git a/libTVaudio/audio/DTSHD_media_source.h b/libTVaudio/audio/DTSHD_media_source.h
index bd6ae0d..91eee9a 100644
--- a/libTVaudio/audio/DTSHD_media_source.h
+++ b/libTVaudio/audio/DTSHD_media_source.h
@@ -1,14 +1,13 @@
 #ifndef MEDIA_DTSHD_MEDIASOURCE_H_
 #define MEDIA_DTSHD_MEDIASOURCE_H_
 
-#include  "MediaSource.h"
-#include  "DataSource.h"
-#include  "MediaBufferGroup.h"
-#include  "MetaData.h"
-#include  "OMXCodec.h"
-#include  "OMX_Index.h"
-#include  "OMX_Core.h"
-#include  "OMXClient.h"
+#include  <MediaSource.h>
+#include  <DataSource.h>
+#include  <MediaBufferGroup.h>
+#include  <MetaData.h>
+#include  <OMX_Index.h>
+#include  <OMX_Core.h>
+#include  <OMXClient.h>
 namespace android
 {
 
diff --git a/libTVaudio/audio/android_out.cpp b/libTVaudio/audio/android_out.cpp
index a20ca72..23e7087 100644
--- a/libTVaudio/audio/android_out.cpp
+++ b/libTVaudio/audio/android_out.cpp
@@ -217,7 +217,7 @@ static int RawAudioTrackInit(audio_format_t aformat,int sr)
             AUDIO_CHANNEL_OUT_STEREO, 0, (audio_output_flags_t)(AUDIO_OUTPUT_FLAG_DIRECT
             | AUDIO_OUTPUT_FLAG_IEC958_NONAUDIO)
             ,
-            RawAudioTrackCallback/*NULL*/, NULL, 0, 0, false, 0);
+            RawAudioTrackCallback/*NULL*/, NULL, 0, 0, false, (audio_session_t)0);
     if (Status != NO_ERROR) {
         ALOGE("%s, AudioTrack raw set failed.\n", __FUNCTION__);
         if (gmpAudioTracker_raw != NULL ) {
@@ -264,7 +264,7 @@ static int AudioTrackInit(void) {
 
     Status = glpTracker->set(AUDIO_STREAM_MUSIC, 48000, AUDIO_FORMAT_PCM_16_BIT,
             AUDIO_CHANNEL_OUT_STEREO, 0, AUDIO_OUTPUT_FLAG_NONE,
-            AudioTrackCallback, NULL, 0, 0, false, 0);
+            AudioTrackCallback, NULL, 0, 0, false, (audio_session_t)0);
 
     if (Status != NO_ERROR) {
         ALOGE("%s, AudioTrack set failed.\n", __FUNCTION__);
diff --git a/libTVaudio/audio/audio_effect_control.c b/libTVaudio/audio/audio_effect_control.c
index c6c546f..d6c9af6 100644
--- a/libTVaudio/audio/audio_effect_control.c
+++ b/libTVaudio/audio/audio_effect_control.c
@@ -1,6 +1,8 @@
 /*
  audio_effect_control.c
  */
+#define LOG_TAG "effect_ctl"
+
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
@@ -12,8 +14,6 @@
 #include "aml_audio.h"
 #include "audio_effect_control.h"
 
-#define LOG_TAG "effect_ctl"
-
 //------------------------------------EQ control------------------------------------------------
 int (*EQ_process)(short *in, short *out, int framecount);
 int (*EQ_init)(void);
@@ -493,4 +493,4 @@ int load_aml_IIR_lib(void) {
 Error:
     unload_aml_IIR_lib();
     return -1;
-}
\ No newline at end of file
+}
diff --git a/libTVaudio/audio/audio_usb_check.cpp b/libTVaudio/audio/audio_usb_check.cpp
index 2867acc..1c7dd04 100755..100644
--- a/libTVaudio/audio/audio_usb_check.cpp
+++ b/libTVaudio/audio/audio_usb_check.cpp
@@ -1,3 +1,5 @@
+#define LOG_TAG "aml_audio"
+
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
@@ -12,8 +14,6 @@
 #include "audio_usb_check.h"
 #include "aml_audio.h"
 
-#define LOG_TAG "aml_audio"
-
 namespace android {
 
 unsigned int deviceID = 0;