diff options
author | yidongh <yidongh@codeaurora.org> | 2017-10-15 22:18:12 +0800 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-10-25 19:12:12 -0700 |
commit | ddd67d43d5aeeccd78cb4d36469efbb55f22998a (patch) | |
tree | 4948a35329097622e654ea14fd91a0d270548b72 /mm-audio | |
parent | d03a45466676699c9268bfe6f42f0691519c7539 (diff) | |
download | android_hardware_qcom_audio-ddd67d43d5aeeccd78cb4d36469efbb55f22998a.tar.gz android_hardware_qcom_audio-ddd67d43d5aeeccd78cb4d36469efbb55f22998a.tar.bz2 android_hardware_qcom_audio-ddd67d43d5aeeccd78cb4d36469efbb55f22998a.zip |
hal: audio-test: remove code sections referring to audio-alsa
audio-alsa is removed from mm-audio, reomve code sections
referring to audio-alsa.
CRs-Fixed: 2126971
Change-Id: I50bd466a931a39846dc2fc5f136a38a9f64b2148
Diffstat (limited to 'mm-audio')
-rw-r--r-- | mm-audio/aenc-aac/qdsp6/Android.mk | 2 | ||||
-rw-r--r-- | mm-audio/aenc-aac/qdsp6/test/omx_aac_enc_test.c | 50 | ||||
-rw-r--r-- | mm-audio/aenc-amrnb/qdsp6/Android.mk | 2 | ||||
-rw-r--r-- | mm-audio/aenc-amrnb/qdsp6/test/omx_amr_enc_test.c | 49 | ||||
-rw-r--r-- | mm-audio/aenc-evrc/qdsp6/Android.mk | 2 | ||||
-rw-r--r-- | mm-audio/aenc-evrc/qdsp6/test/omx_evrc_enc_test.c | 49 | ||||
-rw-r--r-- | mm-audio/aenc-g711/qdsp6/test/omx_g711_enc_test.c | 8 | ||||
-rw-r--r-- | mm-audio/aenc-qcelp13/qdsp6/Android.mk | 2 | ||||
-rw-r--r-- | mm-audio/aenc-qcelp13/qdsp6/test/omx_qcelp13_enc_test.c | 49 |
9 files changed, 0 insertions, 213 deletions
diff --git a/mm-audio/aenc-aac/qdsp6/Android.mk b/mm-audio/aenc-aac/qdsp6/Android.mk index 40e67447..add61e59 100644 --- a/mm-audio/aenc-aac/qdsp6/Android.mk +++ b/mm-audio/aenc-aac/qdsp6/Android.mk @@ -50,7 +50,6 @@ include $(CLEAR_VARS) mm-aac-enc-test-inc := $(LOCAL_PATH)/inc mm-aac-enc-test-inc += $(LOCAL_PATH)/test -mm-aac-enc-test-inc += $(TARGET_OUT_HEADERS)/mm-audio/audio-alsa mm-aac-enc-test-inc += $(TARGET_OUT_HEADERS)/mm-core/omxcore LOCAL_MODULE := mm-aenc-omxaac-test @@ -60,7 +59,6 @@ LOCAL_C_INCLUDES := $(mm-aac-enc-test-inc) LOCAL_PRELINK_MODULE := false LOCAL_SHARED_LIBRARIES := libmm-omxcore LOCAL_SHARED_LIBRARIES += libOmxAacEnc -LOCAL_SHARED_LIBRARIES += libaudioalsa LOCAL_SRC_FILES := test/omx_aac_enc_test.c include $(BUILD_EXECUTABLE) diff --git a/mm-audio/aenc-aac/qdsp6/test/omx_aac_enc_test.c b/mm-audio/aenc-aac/qdsp6/test/omx_aac_enc_test.c index b4b0be87..5239a8e8 100644 --- a/mm-audio/aenc-aac/qdsp6/test/omx_aac_enc_test.c +++ b/mm-audio/aenc-aac/qdsp6/test/omx_aac_enc_test.c @@ -56,9 +56,6 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include <pthread.h> #include "QOMX_AudioExtensions.h" #include "QOMX_AudioIndexExtensions.h" -#ifdef AUDIOV2 -#include "control.h" -#endif #include <linux/ioctl.h> typedef unsigned char uint8; @@ -82,14 +79,6 @@ void audaac_rec_install_bits void audaac_rec_install_adts_header_variable (uint16 byte_num); void Release_Encoder(); -#ifdef AUDIOV2 -unsigned short session_id; -int device_id; -int control = 0; -const char *device="handset_tx"; -#define DIR_TX 2 -#endif - #define AACHDR_LAYER_SIZE 2 #define AACHDR_CRC_SIZE 1 #define AAC_PROFILE_SIZE 2 @@ -705,22 +694,6 @@ int main(int argc, char **argv) DEBUG_PRINT ("\nOMX_FreeHandle error. Error code: %d\n", result); } /* Deinit OpenMAX */ - if(tunnel) - { - #ifdef AUDIOV2 - if (msm_route_stream(DIR_TX,session_id,device_id, 0)) - { - DEBUG_PRINT("\ncould not set stream routing\n"); - return -1; - } - if (msm_en_device(device_id, 0)) - { - DEBUG_PRINT("\ncould not enable device\n"); - return -1; - } - msm_mixer_close(); - #endif - } OMX_Deinit(); ebd_cnt=0; bOutputEosReached = false; @@ -898,29 +871,6 @@ int Play_Encoder() OMX_SetParameter(aac_enc_handle,OMX_IndexParamAudioAac,&aacparam); OMX_GetExtensionIndex(aac_enc_handle,"OMX.Qualcomm.index.audio.sessionId",&index); OMX_GetParameter(aac_enc_handle,index,&streaminfoparam); - if(tunnel) - { - #ifdef AUDIOV2 - session_id = streaminfoparam.sessionId; - control = msm_mixer_open("/dev/snd/controlC0", 0); - if(control < 0) - printf("ERROR opening the device\n"); - device_id = msm_get_device(device); - DEBUG_PRINT ("\ndevice_id = %d\n",device_id); - DEBUG_PRINT("\nsession_id = %d\n",session_id); - if (msm_en_device(device_id, 1)) - { - perror("could not enable device\n"); - return -1; - } - - if (msm_route_stream(DIR_TX,session_id,device_id, 1)) - { - perror("could not set stream routing\n"); - return -1; - } - #endif - } DEBUG_PRINT ("\nOMX_SendCommand Encoder -> IDLE\n"); OMX_SendCommand(aac_enc_handle, OMX_CommandStateSet, OMX_StateIdle,0); /* wait_for_event(); should not wait here event complete status will diff --git a/mm-audio/aenc-amrnb/qdsp6/Android.mk b/mm-audio/aenc-amrnb/qdsp6/Android.mk index 62124e99..dbc6a5c8 100644 --- a/mm-audio/aenc-amrnb/qdsp6/Android.mk +++ b/mm-audio/aenc-amrnb/qdsp6/Android.mk @@ -52,7 +52,6 @@ mm-amr-enc-test-inc := $(LOCAL_PATH)/inc mm-amr-enc-test-inc += $(LOCAL_PATH)/test mm-amr-enc-test-inc += $(TARGET_OUT_HEADERS)/mm-core/omxcore -mm-amr-enc-test-inc += $(TARGET_OUT_HEADERS)/mm-audio/audio-alsa LOCAL_MODULE := mm-aenc-omxamr-test LOCAL_MODULE_TAGS := optional LOCAL_CFLAGS := $(libOmxAmrEnc-def) @@ -60,7 +59,6 @@ LOCAL_C_INCLUDES := $(mm-amr-enc-test-inc) LOCAL_PRELINK_MODULE := false LOCAL_SHARED_LIBRARIES := libmm-omxcore LOCAL_SHARED_LIBRARIES += libOmxAmrEnc -LOCAL_SHARED_LIBRARIES += libaudioalsa LOCAL_SRC_FILES := test/omx_amr_enc_test.c include $(BUILD_EXECUTABLE) diff --git a/mm-audio/aenc-amrnb/qdsp6/test/omx_amr_enc_test.c b/mm-audio/aenc-amrnb/qdsp6/test/omx_amr_enc_test.c index 58215c4e..9bdf6dc2 100644 --- a/mm-audio/aenc-amrnb/qdsp6/test/omx_amr_enc_test.c +++ b/mm-audio/aenc-amrnb/qdsp6/test/omx_amr_enc_test.c @@ -57,10 +57,6 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include <pthread.h> #include "QOMX_AudioExtensions.h" #include "QOMX_AudioIndexExtensions.h" -#ifdef AUDIOV2 -#include "control.h" -#endif - #include <linux/ioctl.h> @@ -72,14 +68,6 @@ QOMX_AUDIO_STREAM_INFO_DATA streaminfoparam; /* maximum ADTS frame header length */ void Release_Encoder(); -#ifdef AUDIOV2 -unsigned short session_id; -int device_id; -int control = 0; -const char *device="handset_tx"; -#define DIR_TX 2 -#endif - uint32_t samplerate = 8000; uint32_t channels = 1; uint32_t bandmode = 7; @@ -635,22 +623,6 @@ int main(int argc, char **argv) } /* Deinit OpenMAX */ - if(tunnel) - { - #ifdef AUDIOV2 - if (msm_route_stream(DIR_TX,session_id,device_id, 0)) - { - DEBUG_PRINT("\ncould not set stream routing\n"); - return -1; - } - if (msm_en_device(device_id, 0)) - { - DEBUG_PRINT("\ncould not enable device\n"); - return -1; - } - msm_mixer_close(); - #endif - } OMX_Deinit(); ebd_cnt=0; bOutputEosReached = false; @@ -830,27 +802,6 @@ int Play_Encoder() OMX_SetParameter(amr_enc_handle,OMX_IndexParamAudioAmr,&amrparam); OMX_GetExtensionIndex(amr_enc_handle,"OMX.Qualcomm.index.audio.sessionId",&index); OMX_GetParameter(amr_enc_handle,index,&streaminfoparam); - if(tunnel) { - #ifdef AUDIOV2 - session_id = streaminfoparam.sessionId; - control = msm_mixer_open("/dev/snd/controlC0", 0); - if(control < 0) - printf("ERROR opening the device\n"); - device_id = msm_get_device(device); - DEBUG_PRINT ("\ndevice_id = %d\n",device_id); - DEBUG_PRINT("\nsession_id = %d\n",session_id); - if (msm_en_device(device_id, 1)) - { - perror("could not enable device\n"); - return -1; - } - if (msm_route_stream(DIR_TX,session_id,device_id, 1)) - { - perror("could not set stream routing\n"); - return -1; - } - #endif - } DEBUG_PRINT ("\nOMX_SendCommand Encoder -> IDLE\n"); OMX_SendCommand(amr_enc_handle, OMX_CommandStateSet, OMX_StateIdle,0); diff --git a/mm-audio/aenc-evrc/qdsp6/Android.mk b/mm-audio/aenc-evrc/qdsp6/Android.mk index 7d56f5c1..8655fb85 100644 --- a/mm-audio/aenc-evrc/qdsp6/Android.mk +++ b/mm-audio/aenc-evrc/qdsp6/Android.mk @@ -51,7 +51,6 @@ include $(CLEAR_VARS) mm-evrc-enc-test-inc := $(LOCAL_PATH)/inc mm-evrc-enc-test-inc += $(LOCAL_PATH)/test mm-evrc-enc-test-inc += $(TARGET_OUT_HEADERS)/mm-core/omxcore -mm-evrc-enc-test-inc += $(TARGET_OUT_HEADERS)/mm-audio/audio-alsa LOCAL_MODULE := mm-aenc-omxevrc-test LOCAL_MODULE_TAGS := optional LOCAL_CFLAGS := $(libOmxEvrcEnc-def) @@ -59,7 +58,6 @@ LOCAL_C_INCLUDES := $(mm-evrc-enc-test-inc) LOCAL_PRELINK_MODULE := false LOCAL_SHARED_LIBRARIES := libmm-omxcore LOCAL_SHARED_LIBRARIES += libOmxEvrcEnc -LOCAL_SHARED_LIBRARIES += libaudioalsa LOCAL_SRC_FILES := test/omx_evrc_enc_test.c include $(BUILD_EXECUTABLE) diff --git a/mm-audio/aenc-evrc/qdsp6/test/omx_evrc_enc_test.c b/mm-audio/aenc-evrc/qdsp6/test/omx_evrc_enc_test.c index e5f72cc3..f9071dcf 100644 --- a/mm-audio/aenc-evrc/qdsp6/test/omx_evrc_enc_test.c +++ b/mm-audio/aenc-evrc/qdsp6/test/omx_evrc_enc_test.c @@ -57,10 +57,6 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include <pthread.h> #include "QOMX_AudioExtensions.h" #include "QOMX_AudioIndexExtensions.h" -#ifdef AUDIOV2 -#include "control.h" -#endif - #include <linux/ioctl.h> @@ -72,14 +68,6 @@ QOMX_AUDIO_STREAM_INFO_DATA streaminfoparam; /* maximum ADTS frame header length */ void Release_Encoder(); -#ifdef AUDIOV2 -unsigned short session_id; -int device_id; -int control = 0; -const char *device="handset_tx"; -#define DIR_TX 2 -#endif - uint32_t samplerate = 8000; uint32_t channels = 1; uint32_t min_bitrate = 0; @@ -713,22 +701,6 @@ int main(int argc, char **argv) } /* Deinit OpenMAX */ - if(tunnel) - { - #ifdef AUDIOV2 - if (msm_route_stream(DIR_TX,session_id,device_id, 0)) - { - DEBUG_PRINT("\ncould not set stream routing\n"); - return -1; - } - if (msm_en_device(device_id, 0)) - { - DEBUG_PRINT("\ncould not enable device\n"); - return -1; - } - msm_mixer_close(); - #endif - } OMX_Deinit(); ebd_cnt=0; bOutputEosReached = false; @@ -908,27 +880,6 @@ int Play_Encoder() OMX_SetParameter(evrc_enc_handle,OMX_IndexParamAudioEvrc,&evrcparam); OMX_GetExtensionIndex(evrc_enc_handle,"OMX.Qualcomm.index.audio.sessionId",&index); OMX_GetParameter(evrc_enc_handle,index,&streaminfoparam); - if(tunnel) { - #ifdef AUDIOV2 - session_id = streaminfoparam.sessionId; - control = msm_mixer_open("/dev/snd/controlC0", 0); - if(control < 0) - printf("ERROR opening the device\n"); - device_id = msm_get_device(device); - DEBUG_PRINT ("\ndevice_id = %d\n",device_id); - DEBUG_PRINT("\nsession_id = %d\n",session_id); - if (msm_en_device(device_id, 1)) - { - perror("could not enable device\n"); - return -1; - } - if (msm_route_stream(DIR_TX,session_id,device_id, 1)) - { - perror("could not set stream routing\n"); - return -1; - } - #endif - } DEBUG_PRINT ("\nOMX_SendCommand Encoder -> IDLE\n"); OMX_SendCommand(evrc_enc_handle, OMX_CommandStateSet, OMX_StateIdle,0); diff --git a/mm-audio/aenc-g711/qdsp6/test/omx_g711_enc_test.c b/mm-audio/aenc-g711/qdsp6/test/omx_g711_enc_test.c index 8815818c..e5281986 100644 --- a/mm-audio/aenc-g711/qdsp6/test/omx_g711_enc_test.c +++ b/mm-audio/aenc-g711/qdsp6/test/omx_g711_enc_test.c @@ -68,14 +68,6 @@ QOMX_AUDIO_STREAM_INFO_DATA streaminfoparam; void Release_Encoder(); -#ifdef AUDIOV2 -unsigned short session_id; -int device_id; -int control = 0; -const char *device="handset_tx"; -#define DIR_TX 2 -#endif - #define MIN(A,B) (((A) < (B))?(A):(B)) FILE *F1 = NULL; diff --git a/mm-audio/aenc-qcelp13/qdsp6/Android.mk b/mm-audio/aenc-qcelp13/qdsp6/Android.mk index 2664db5e..fe245e0d 100644 --- a/mm-audio/aenc-qcelp13/qdsp6/Android.mk +++ b/mm-audio/aenc-qcelp13/qdsp6/Android.mk @@ -54,7 +54,6 @@ mm-qcelp13-enc-test-inc := $(LOCAL_PATH)/inc mm-qcelp13-enc-test-inc += $(LOCAL_PATH)/test mm-qcelp13-enc-test-inc += $(TARGET_OUT_HEADERS)/mm-core/omxcore -mm-qcelp13-enc-test-inc += $(TARGET_OUT_HEADERS)/mm-audio/audio-alsa LOCAL_MODULE := mm-aenc-omxqcelp13-test LOCAL_MODULE_TAGS := optional LOCAL_CFLAGS := $(libOmxQcelp13Enc-def) @@ -62,7 +61,6 @@ LOCAL_C_INCLUDES := $(mm-qcelp13-enc-test-inc) LOCAL_PRELINK_MODULE := false LOCAL_SHARED_LIBRARIES := libmm-omxcore LOCAL_SHARED_LIBRARIES += libOmxQcelp13Enc -LOCAL_SHARED_LIBRARIES += libaudioalsa LOCAL_SRC_FILES := test/omx_qcelp13_enc_test.c include $(BUILD_EXECUTABLE) diff --git a/mm-audio/aenc-qcelp13/qdsp6/test/omx_qcelp13_enc_test.c b/mm-audio/aenc-qcelp13/qdsp6/test/omx_qcelp13_enc_test.c index a0b39c25..258fd2a1 100644 --- a/mm-audio/aenc-qcelp13/qdsp6/test/omx_qcelp13_enc_test.c +++ b/mm-audio/aenc-qcelp13/qdsp6/test/omx_qcelp13_enc_test.c @@ -57,10 +57,6 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include <pthread.h> #include "QOMX_AudioExtensions.h" #include "QOMX_AudioIndexExtensions.h" -#ifdef AUDIOV2 -#include "control.h" -#endif - #include <linux/ioctl.h> @@ -72,14 +68,6 @@ QOMX_AUDIO_STREAM_INFO_DATA streaminfoparam; /* maximum ADTS frame header length */ void Release_Encoder(); -#ifdef AUDIOV2 -unsigned short session_id; -int device_id; -int control = 0; -const char *device="handset_tx"; -#define DIR_TX 2 -#endif - uint32_t samplerate = 8000; uint32_t channels = 1; uint32_t min_bitrate = 0; @@ -714,22 +702,6 @@ int main(int argc, char **argv) } /* Deinit OpenMAX */ - if(tunnel) - { - #ifdef AUDIOV2 - if (msm_route_stream(DIR_TX,session_id,device_id, 0)) - { - DEBUG_PRINT("\ncould not set stream routing\n"); - return -1; - } - if (msm_en_device(device_id, 0)) - { - DEBUG_PRINT("\ncould not enable device\n"); - return -1; - } - msm_mixer_close(); - #endif - } OMX_Deinit(); ebd_cnt=0; bOutputEosReached = false; @@ -909,27 +881,6 @@ int Play_Encoder() OMX_SetParameter(qcelp13_enc_handle,OMX_IndexParamAudioQcelp13,&qcelp13param); OMX_GetExtensionIndex(qcelp13_enc_handle,"OMX.Qualcomm.index.audio.sessionId",&index); OMX_GetParameter(qcelp13_enc_handle,index,&streaminfoparam); - if(tunnel) { - #ifdef AUDIOV2 - session_id = streaminfoparam.sessionId; - control = msm_mixer_open("/dev/snd/controlC0", 0); - if(control < 0) - printf("ERROR opening the device\n"); - device_id = msm_get_device(device); - DEBUG_PRINT ("\ndevice_id = %d\n",device_id); - DEBUG_PRINT("\nsession_id = %d\n",session_id); - if (msm_en_device(device_id, 1)) - { - perror("could not enable device\n"); - return -1; - } - if (msm_route_stream(DIR_TX,session_id,device_id, 1)) - { - perror("could not set stream routing\n"); - return -1; - } - #endif - } DEBUG_PRINT ("\nOMX_SendCommand Encoder -> IDLE\n"); OMX_SendCommand(qcelp13_enc_handle, OMX_CommandStateSet, OMX_StateIdle,0); |