Merge "audio: Fix compilation error for encoders"

This commit is contained in:
Linux Build Service Account 2018-02-20 18:51:51 -08:00 committed by Gerrit - the friendly Code Review server
commit 5e4472f63a
9 changed files with 15 additions and 2 deletions

View File

@ -22,7 +22,7 @@ AUDIO_FEATURE_ENABLED_ALAC_OFFLOAD := true
AUDIO_FEATURE_ENABLED_APE_OFFLOAD := true
AUDIO_FEATURE_ENABLED_AAC_ADTS_OFFLOAD := true
AUDIO_FEATURE_ENABLED_PROXY_DEVICE := true
AUDIO_FEATURE_ENABLED_SSR := true
AUDIO_FEATURE_ENABLED_SSR := false
AUDIO_FEATURE_ENABLED_DTS_EAGLE := false
BOARD_USES_SRS_TRUEMEDIA := false
DTS_CODEC_M_ := false
@ -31,7 +31,7 @@ AUDIO_FEATURE_ENABLED_HW_ACCELERATED_EFFECTS := false
AUDIO_FEATURE_ENABLED_AUDIOSPHERE := true
AUDIO_FEATURE_ENABLED_USB_TUNNEL_AUDIO := true
AUDIO_FEATURE_ENABLED_SPLIT_A2DP := true
AUDIO_FEATURE_ENABLED_3D_AUDIO := true
AUDIO_FEATURE_ENABLED_3D_AUDIO := false
DOLBY_ENABLE := false
TARGET_USES_QCOM_MM_AUDIO := true
endif

View File

@ -30,6 +30,7 @@ LOCAL_MODULE := libOmxAacEnc
LOCAL_MODULE_TAGS := optional
LOCAL_VENDOR_MODULE := true
LOCAL_CFLAGS := $(libOmxAacEnc-def)
LOCAL_CFLAGS := -Wno-format -Wno-sign-compare -Wno-sign-conversion -Wno-self-assign -Wno-parentheses-equality
LOCAL_C_INCLUDES := $(libOmxAacEnc-inc)
LOCAL_PRELINK_MODULE := false
LOCAL_SHARED_LIBRARIES := libutils liblog
@ -59,6 +60,7 @@ mm-aac-enc-test-inc += $(TARGET_OUT_HEADERS)/mm-core/omxcore
LOCAL_MODULE := mm-aenc-omxaac-test
LOCAL_MODULE_TAGS := optional
LOCAL_CFLAGS := $(libOmxAacEnc-def)
LOCAL_CFLAGS := -Wno-unused-local-typedef -Wno-shorten-64-to-32
LOCAL_C_INCLUDES := $(mm-aac-enc-test-inc)
LOCAL_PRELINK_MODULE := false
LOCAL_SHARED_LIBRARIES := libmm-omxcore

View File

@ -57,6 +57,7 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "QOMX_AudioExtensions.h"
#include "QOMX_AudioIndexExtensions.h"
#include <linux/ioctl.h>
#include <errno.h>
typedef unsigned char uint8;
typedef unsigned char byte;

View File

@ -31,6 +31,7 @@ LOCAL_MODULE := libOmxAmrEnc
LOCAL_MODULE_TAGS := optional
LOCAL_VENDOR_MODULE := true
LOCAL_CFLAGS := $(libOmxAmrEnc-def)
LOCAL_CFLAGS := -Wno-format -Wno-sign-compare -Wno-sign-conversion -Wno-self-assign -Wno-parentheses-equality -Wno-tautological-compare
LOCAL_C_INCLUDES := $(libOmxAmrEnc-inc)
LOCAL_PRELINK_MODULE := false
LOCAL_SHARED_LIBRARIES := libutils liblog
@ -61,6 +62,7 @@ mm-amr-enc-test-inc += $(TARGET_OUT_HEADERS)/mm-core/omxcore
LOCAL_MODULE := mm-aenc-omxamr-test
LOCAL_MODULE_TAGS := optional
LOCAL_CFLAGS := $(libOmxAmrEnc-def)
LOCAL_CFLAGS := -Wno-tautological-compare -Wno-unused-local-typedef
LOCAL_C_INCLUDES := $(mm-amr-enc-test-inc)
LOCAL_PRELINK_MODULE := false
LOCAL_SHARED_LIBRARIES := libmm-omxcore

View File

@ -31,6 +31,7 @@ LOCAL_MODULE := libOmxEvrcEnc
LOCAL_MODULE_TAGS := optional
LOCAL_VENDOR_MODULE := true
LOCAL_CFLAGS := $(libOmxEvrcEnc-def)
LOCAL_CFLAGS := -Wno-format -Wno-sign-compare -Wno-sign-conversion -Wno-self-assign -Wno-parentheses-equality
LOCAL_C_INCLUDES := $(libOmxEvrcEnc-inc)
LOCAL_PRELINK_MODULE := false
LOCAL_SHARED_LIBRARIES := libutils liblog
@ -60,6 +61,7 @@ mm-evrc-enc-test-inc += $(TARGET_OUT_HEADERS)/mm-core/omxcore
LOCAL_MODULE := mm-aenc-omxevrc-test
LOCAL_MODULE_TAGS := optional
LOCAL_CFLAGS := $(libOmxEvrcEnc-def)
LOCAL_CFLAGS := -Wno-unused-local-typedef -Wno-shorten-64-to-32
LOCAL_C_INCLUDES := $(mm-evrc-enc-test-inc)
LOCAL_PRELINK_MODULE := false
LOCAL_SHARED_LIBRARIES := libmm-omxcore

View File

@ -57,6 +57,7 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <pthread.h>
#include "QOMX_AudioExtensions.h"
#include "QOMX_AudioIndexExtensions.h"
#include <errno.h>
#include <linux/ioctl.h>

View File

@ -31,6 +31,7 @@ LOCAL_MODULE := libOmxG711Enc
LOCAL_MODULE_TAGS := optional
LOCAL_VENDOR_MODULE := true
LOCAL_CFLAGS := $(libOmxG711Enc-def)
LOCAL_CFLAGS := -Wno-format -Wno-sign-compare -Wno-sign-conversion -Wno-self-assign -Wno-parentheses-equality
LOCAL_C_INCLUDES := $(libOmxG711Enc-inc)
LOCAL_PRELINK_MODULE := false
LOCAL_SHARED_LIBRARIES := libutils liblog libcutils
@ -64,6 +65,7 @@ mm-g711-enc-test-inc += $(TARGET_OUT_HEADERS)/mm-core/omxcore
LOCAL_MODULE := mm-aenc-omxg711-test
LOCAL_MODULE_TAGS := optional
LOCAL_CFLAGS := $(libOmxG711Enc-def)
LOCAL_CFLAGS := -Wno-tautological-compare -Wno-unused-local-typedef
LOCAL_C_INCLUDES := $(mm-g711-enc-test-inc)
LOCAL_PRELINK_MODULE := false
LOCAL_SHARED_LIBRARIES := libmm-omxcore

View File

@ -31,6 +31,7 @@ LOCAL_MODULE := libOmxQcelp13Enc
LOCAL_MODULE_TAGS := optional
LOCAL_VENDOR_MODULE := true
LOCAL_CFLAGS := $(libOmxQcelp13Enc-def)
LOCAL_CFLAGS := -Wno-format -Wno-sign-compare -Wno-sign-conversion -Wno-self-assign -Wno-parentheses-equality
LOCAL_C_INCLUDES := $(libOmxQcelp13Enc-inc)
LOCAL_PRELINK_MODULE := false
LOCAL_SHARED_LIBRARIES := libutils liblog
@ -63,6 +64,7 @@ mm-qcelp13-enc-test-inc += $(TARGET_OUT_HEADERS)/mm-core/omxcore
LOCAL_MODULE := mm-aenc-omxqcelp13-test
LOCAL_MODULE_TAGS := optional
LOCAL_CFLAGS := $(libOmxQcelp13Enc-def)
LOCAL_CFLAGS := -Wno-unused-local-typedef -Wno-shorten-64-to-32
LOCAL_C_INCLUDES := $(mm-qcelp13-enc-test-inc)
LOCAL_PRELINK_MODULE := false
LOCAL_SHARED_LIBRARIES := libmm-omxcore

View File

@ -57,6 +57,7 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <pthread.h>
#include "QOMX_AudioExtensions.h"
#include "QOMX_AudioIndexExtensions.h"
#include <errno.h>
#include <linux/ioctl.h>