Merge "mm-audio: Remove omx decoder components from mm-audio folder"

This commit is contained in:
Linux Build Service Account 2014-05-06 16:25:12 -07:00 committed by Gerrit - the friendly Code Review server
commit 136d80a97d
16 changed files with 0 additions and 6293 deletions

View File

@ -1 +0,0 @@
include $(call all-subdir-makefiles)

View File

@ -1,6 +0,0 @@
all:
@echo "invoking adec-aac make"
$(MAKE) -C qdsp6
install:
$(MAKE) -C qdsp6 install

View File

@ -1 +0,0 @@
SUBDIRS = qdsp6

View File

@ -1,58 +0,0 @@
ifneq ($(BUILD_TINY_ANDROID),true)
ifneq ($(BUILD_WITHOUT_PV),true)
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
# ---------------------------------------------------------------------------------
# Common definitons
# ---------------------------------------------------------------------------------
libOmxAacDec-def := -g -O3
libOmxAacDec-def += -DQC_MODIFIED
libOmxAacDec-def += -D_ANDROID_
libOmxAacDec-def += -D_ENABLE_QC_MSG_LOG_
libOmxAacDec-def += -DVERBOSE
libOmxAacDec-def += -D_DEBUG
ifeq ($(BOARD_USES_QCOM_AUDIO_V2), true)
libOmxAacDec-def += -DAUDIOV2
endif
# ---------------------------------------------------------------------------------
# Make the apps-test (mm-adec-omxaac-test)
# ---------------------------------------------------------------------------------
include $(CLEAR_VARS)
ifeq ($(BOARD_USES_QCOM_AUDIO_V2), true)
mm-aac-dec-test-inc += $(TARGET_OUT_HEADERS)/mm-audio/audio-alsa
mm-aac-dec-test-inc += $(TARGET_OUT_HEADERS)/mm-core/omxcore
mm-aac-dec-test-inc += $(PV_TOP)/codecs_v2/omx/omx_mastercore/include \
$(PV_TOP)/codecs_v2/omx/omx_common/include \
$(PV_TOP)/extern_libs_v2/khronos/openmax/include \
$(PV_TOP)/codecs_v2/omx/omx_baseclass/include \
$(PV_TOP)/codecs_v2/omx/omx_aac/include \
$(PV_TOP)/codecs_v2/audio/aac/dec/include \
LOCAL_MODULE := sw-adec-omxaac-test
LOCAL_MODULE_TAGS := optional
LOCAL_CFLAGS := $(libOmxAacDec-def)
LOCAL_C_INCLUDES := $(mm-aac-dec-test-inc)
LOCAL_PRELINK_MODULE := false
LOCAL_SHARED_LIBRARIES := libopencore_common
LOCAL_SHARED_LIBRARIES += libomx_sharedlibrary
LOCAL_SHARED_LIBRARIES += libomx_aacdec_sharedlibrary
LOCAL_SHARED_LIBRARIES += libaudioalsa
LOCAL_SRC_FILES := test/omx_aac_dec_test.c
include $(BUILD_EXECUTABLE)
endif
endif #BUILD_WITHOUT_PV
endif #BUILD_TINY_ANDROID
# ---------------------------------------------------------------------------------
# END
# ---------------------------------------------------------------------------------

File diff suppressed because it is too large Load Diff

View File

@ -1 +0,0 @@
include $(call all-subdir-makefiles)

View File

@ -1,59 +0,0 @@
ifneq ($(BUILD_TINY_ANDROID),true)
ifneq ($(BUILD_WITHOUT_PV),true)
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
# ---------------------------------------------------------------------------------
# Common definitons
# ---------------------------------------------------------------------------------
libOmxAmrDec-def := -g -O3
libOmxAmrDec-def += -DQC_MODIFIED
libOmxAmrDec-def += -D_ANDROID_
libOmxAmrDec-def += -D_ENABLE_QC_MSG_LOG_
libOmxAmrDec-def += -DVERBOSE
libOmxAmrDec-def += -D_DEBUG
libOmxAmrDec-def += -DAUDIOV2
ifeq ($(BOARD_USES_QCOM_AUDIO_V2), true)
libOmxAmrDec-def += -DAUDIOV2
endif
# ---------------------------------------------------------------------------------
# Make the apps-test (mm-adec-omxamr-test)
# ---------------------------------------------------------------------------------
include $(CLEAR_VARS)
ifeq ($(BOARD_USES_QCOM_AUDIO_V2), true)
mm-amr-dec-test-inc += $(TARGET_OUT_HEADERS)/mm-audio/audio-alsa
mm-amr-dec-test-inc += $(TARGET_OUT_HEADERS)/mm-core/omxcore
mm-amr-dec-test-inc += $(PV_TOP)/codecs_v2/omx/omx_mastercore/include \
$(PV_TOP)/codecs_v2/omx/omx_common/include \
$(PV_TOP)/extern_libs_v2/khronos/openmax/include \
$(PV_TOP)/codecs_v2/omx/omx_baseclass/include \
$(PV_TOP)/codecs_v2/omx/omx_amr/include \
$(PV_TOP)/codecs_v2/audio/amr/dec/include \
LOCAL_MODULE := sw-adec-omxamr-test
LOCAL_MODULE_TAGS := optional
LOCAL_CFLAGS := $(libOmxAmrDec-def)
LOCAL_C_INCLUDES := $(mm-amr-dec-test-inc)
LOCAL_PRELINK_MODULE := false
LOCAL_SHARED_LIBRARIES := libopencore_common
LOCAL_SHARED_LIBRARIES += libomx_sharedlibrary
LOCAL_SHARED_LIBRARIES += libomx_amrdec_sharedlibrary
LOCAL_SHARED_LIBRARIES += libaudioalsa
LOCAL_SRC_FILES := test/omx_amr_dec_test.c
include $(BUILD_EXECUTABLE)
endif
endif #BUILD_WITHOUT_PV
endif #BUILD_TINY_ANDROID
# ---------------------------------------------------------------------------------
# END
# ---------------------------------------------------------------------------------

File diff suppressed because it is too large Load Diff

View File

@ -1 +0,0 @@
include $(call all-subdir-makefiles)

View File

@ -1,58 +0,0 @@
ifneq ($(BUILD_TINY_ANDROID),true)
ifneq ($(BUILD_WITHOUT_PV),true)
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
# ---------------------------------------------------------------------------------
# Common definitons
# ---------------------------------------------------------------------------------
libOmxAmrDec-def := -g -O3
libOmxAmrDec-def += -DQC_MODIFIED
libOmxAmrDec-def += -D_ANDROID_
libOmxAmrDec-def += -D_ENABLE_QC_MSG_LOG_
libOmxAmrDec-def += -DVERBOSE
libOmxAmrDec-def += -D_DEBUG
libOmxAmrDec-def += -DAUDIOV2
ifeq ($(BOARD_USES_QCOM_AUDIO_V2), true)
libOmxAmrDec-def += -DAUDIOV2
endif
# ---------------------------------------------------------------------------------
# Make the apps-test (sw-adec-omxamr-test)
# ---------------------------------------------------------------------------------
include $(CLEAR_VARS)
ifeq ($(BOARD_USES_QCOM_AUDIO_V2), true)
mm-amr-dec-test-inc += $(TARGET_OUT_HEADERS)/mm-audio/audio-alsa
mm-amr-dec-test-inc += $(TARGET_OUT_HEADERS)/mm-core/omxcore
mm-amr-dec-test-inc += $(PV_TOP)/codecs_v2/omx/omx_mastercore/include \
$(PV_TOP)/codecs_v2/omx/omx_common/include \
$(PV_TOP)/extern_libs_v2/khronos/openmax/include \
$(PV_TOP)/codecs_v2/omx/omx_baseclass/include \
$(PV_TOP)/codecs_v2/omx/omx_amr/include \
$(PV_TOP)/codecs_v2/audio/amr/dec/include \
LOCAL_MODULE := sw-adec-omxamrwb-test
LOCAL_MODULE_TAGS := optional
LOCAL_CFLAGS := $(libOmxAmrDec-def)
LOCAL_C_INCLUDES := $(mm-amr-dec-test-inc)
LOCAL_PRELINK_MODULE := false
LOCAL_SHARED_LIBRARIES := libopencore_common
LOCAL_SHARED_LIBRARIES += libomx_sharedlibrary
LOCAL_SHARED_LIBRARIES += libomx_amrdec_sharedlibrary
LOCAL_SHARED_LIBRARIES += libaudioalsa
LOCAL_SRC_FILES := test/omx_amrwb_dec_test.c
include $(BUILD_EXECUTABLE)
endif
endif #BUILD_WITHOUT_PV
endif #BUILD_TINY_ANDROID
# ---------------------------------------------------------------------------------
# END
# ---------------------------------------------------------------------------------

File diff suppressed because it is too large Load Diff

View File

@ -1 +0,0 @@
include $(call all-subdir-makefiles)

View File

@ -1,6 +0,0 @@
all:
@echo "invoking omxaudio make"
$(MAKE) -C qdsp6
install:
$(MAKE) -C qdsp6 install

View File

@ -1 +0,0 @@
SUBDIRS = qdsp6

View File

@ -1,59 +0,0 @@
ifneq ($(BUILD_TINY_ANDROID),true)
ifneq ($(BUILD_WITHOUT_PV),true)
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
# ---------------------------------------------------------------------------------
# Common definitons
# ---------------------------------------------------------------------------------
libOmxMp3Dec-def := -g -O3
libOmxMp3Dec-def += -DQC_MODIFIED
libOmxMp3Dec-def += -D_ANDROID_
libOmxMp3Dec-def += -D_ENABLE_QC_MSG_LOG_
libOmxMp3Dec-def += -DVERBOSE
libOmxMp3Dec-def += -D_DEBUG
libOmxMp3Dec-def += -DAUDIOV2
ifeq ($(BOARD_USES_QCOM_AUDIO_V2), true)
libOmxMp3Dec-def += -DAUDIOV2
endif
# ---------------------------------------------------------------------------------
# Make the apps-test (mm-adec-omxmp3-test)
# ---------------------------------------------------------------------------------
include $(CLEAR_VARS)
ifeq ($(BOARD_USES_QCOM_AUDIO_V2), true)
mm-mp3-dec-test-inc += $(TARGET_OUT_HEADERS)/mm-audio/audio-alsa
mm-mp3-dec-test-inc += $(TARGET_OUT_HEADERS)/mm-core/omxcore
mm-mp3-dec-test-inc += $(PV_TOP)/codecs_v2/omx/omx_mastercore/include \
$(PV_TOP)/codecs_v2/omx/omx_common/include \
$(PV_TOP)/extern_libs_v2/khronos/openmax/include \
$(PV_TOP)/codecs_v2/omx/omx_baseclass/include \
$(PV_TOP)/codecs_v2/omx/omx_mp3/include \
$(PV_TOP)/codecs_v2/audio/mp3/dec/include \
LOCAL_MODULE := sw-adec-omxmp3-test
LOCAL_MODULE_TAGS := optional
LOCAL_CFLAGS := $(libOmxMp3Dec-def)
LOCAL_C_INCLUDES := $(mm-mp3-dec-test-inc)
LOCAL_PRELINK_MODULE := false
LOCAL_SHARED_LIBRARIES := libopencore_common
LOCAL_SHARED_LIBRARIES += libomx_sharedlibrary
LOCAL_SHARED_LIBRARIES += libomx_mp3dec_sharedlibrary
LOCAL_SHARED_LIBRARIES += libaudioalsa
LOCAL_SRC_FILES := test/omx_mp3_dec_test.c
include $(BUILD_EXECUTABLE)
endif
endif #BUILD_WITHOUT_PV
endif #BUILD_TINY_ANDROID
# ---------------------------------------------------------------------------------
# END
# ---------------------------------------------------------------------------------

File diff suppressed because it is too large Load Diff