frameworks/av: Fixup after squashed commit of CAF media features
* Fixed makefiles and ifdefs
* Remarked out one line in MPEG4Extractor.cpp due to compile error
Change-Id: I40a8b12f8ca3fe0f372d68b0e3cf02aa33ffe3c3
diff --git a/media/libmedia/Android.mk b/media/libmedia/Android.mk
index fb12e08..8a7f1b3 100644
--- a/media/libmedia/Android.mk
+++ b/media/libmedia/Android.mk
@@ -25,8 +25,6 @@
AudioTrackShared.cpp \
IAudioFlinger.cpp \
IAudioFlingerClient.cpp \
- IDirectTrack.cpp \
- IDirectTrackClient.cpp \
IAudioTrack.cpp \
IAudioRecord.cpp \
ICrypto.cpp \
@@ -78,6 +76,12 @@
LOCAL_CFLAGS += -DUSE_SAMSUNG_SEPARATEDSTREAM
endif
+ifeq ($(BOARD_USES_QCOM_HARDWARE),true)
+LOCAL_SRC_FILES += \
+ IDirectTrack.cpp \
+ IDirectTrackClient.cpp
+endif
+
# for <cutils/atomic-inline.h>
LOCAL_CFLAGS += -DANDROID_SMP=$(if $(findstring true,$(TARGET_CPU_SMP)),1,0)
LOCAL_SRC_FILES += SingleStateQueue.cpp
diff --git a/media/libstagefright/ACodec.cpp b/media/libstagefright/ACodec.cpp
index 1732620..fa45c95 100755
--- a/media/libstagefright/ACodec.cpp
+++ b/media/libstagefright/ACodec.cpp
@@ -982,7 +982,7 @@
"audio_decoder.amrnb", "audio_encoder.amrnb" },
{ MEDIA_MIMETYPE_AUDIO_AMR_WB,
"audio_decoder.amrwb", "audio_encoder.amrwb" },
-#ifdef ENABLE_QC_AV_ENHANCEMENTS
+#ifdef ENABLE_AV_ENHANCEMENTS
{ MEDIA_MIMETYPE_AUDIO_AMR_WB_PLUS,
"audio_decoder.amrwbplus", "audio_encoder.amrwbplus" },
#endif
diff --git a/media/libstagefright/Android.mk b/media/libstagefright/Android.mk
index 9373e33..84c0552 100644
--- a/media/libstagefright/Android.mk
+++ b/media/libstagefright/Android.mk
@@ -1,15 +1,6 @@
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
-ifeq ($(BOARD_USES_ALSA_AUDIO),true)
- ifeq ($(USE_TUNNEL_MODE),true)
- LOCAL_CFLAGS += -DUSE_TUNNEL_MODE
- endif
- ifeq ($(NO_TUNNEL_MODE_FOR_MULTICHANNEL),true)
- LOCAL_CFLAGS += -DNO_TUNNEL_MODE_FOR_MULTICHANNEL
- endif
-endif
-
include frameworks/av/media/libstagefright/codecs/common/Config.mk
ifeq ($(BOARD_HTC_3D_SUPPORT),true)
@@ -34,7 +25,6 @@
FLACExtractor.cpp \
HTTPBase.cpp \
JPEGSource.cpp \
- LPAPlayerALSA.cpp \
MP3Extractor.cpp \
MPEG2TSWriter.cpp \
MPEG4Extractor.cpp \
@@ -64,7 +54,6 @@
ThrottledSource.cpp \
TimeSource.cpp \
TimedEventQueue.cpp \
- TunnelPlayer.cpp \
Utils.cpp \
VBRISeeker.cpp \
WAVExtractor.cpp \
@@ -92,6 +81,22 @@
LOCAL_C_INCLUDES += $(TOP)/frameworks/native/include/media/openmax
endif
+ifeq ($(BOARD_USES_QCOM_HARDWARE),true)
+ ifeq ($(BOARD_USES_ALSA_AUDIO),true)
+ LOCAL_SRC_FILES += LPAPlayerALSA.cpp
+ endif
+ ifeq ($(USE_TUNNEL_MODE),true)
+ LOCAL_SRC_FILES += TunnelPlayer.cpp
+ LOCAL_CFLAGS += -DUSE_TUNNEL_MODE
+ endif
+ ifeq ($(TUNNEL_MODE_SUPPORTS_AMRWB),true)
+ LOCAL_CFLAGS += -DTUNNEL_MODE_SUPPORTS_AMRWB
+ endif
+ ifeq ($(NO_TUNNEL_MODE_FOR_MULTICHANNEL),true)
+ LOCAL_CFLAGS += -DNO_TUNNEL_MODE_FOR_MULTICHANNEL
+ endif
+endif
+
ifneq ($(TARGET_QCOM_MEDIA_VARIANT),)
LOCAL_C_INCLUDES += \
$(TOP)/hardware/qcom/media-$(TARGET_QCOM_MEDIA_VARIANT)/mm-core/inc
@@ -139,9 +144,15 @@
ifeq ($(TARGET_ENABLE_QC_AV_ENHANCEMENTS),true)
LOCAL_CFLAGS += -DENABLE_AV_ENHANCEMENTS
- LOCAL_C_INCLUDES += $(TOP)/hardware/qcom/media/mm-core/inc
LOCAL_SRC_FILES += ExtendedMediaDefs.cpp
LOCAL_SRC_FILES += ExtendedWriter.cpp
+ ifneq ($(TARGET_QCOM_MEDIA_VARIANT),)
+ LOCAL_C_INCLUDES += \
+ $(TOP)/hardware/qcom/media-$(TARGET_QCOM_MEDIA_VARIANT)/mm-core/inc
+ else
+ LOCAL_C_INCLUDES += \
+ $(TOP)/hardware/qcom/media/mm-core/inc
+ endif
endif #TARGET_ENABLE_AV_ENHANCEMENTS
LOCAL_SRC_FILES += \
diff --git a/media/libstagefright/AudioSource.cpp b/media/libstagefright/AudioSource.cpp
index 4e9699e..23d6364 100644
--- a/media/libstagefright/AudioSource.cpp
+++ b/media/libstagefright/AudioSource.cpp
@@ -27,7 +27,7 @@
#include <media/stagefright/foundation/ALooper.h>
#include <cutils/properties.h>
#include <stdlib.h>
-#ifdef ENABLE_QC_AV_ENHANCEMENTS
+#ifdef ENABLE_AV_ENHANCEMENTS
#include <QCMediaDefs.h>
#endif
#include <system/audio.h>
@@ -131,7 +131,7 @@
frameSize = AMR_FRAMESIZE;
mMaxBufferSize = AMR_FRAMESIZE*10;
}
-#ifdef ENABLE_QC_AV_ENHANCEMENTS
+#ifdef ENABLE_AV_ENHANCEMENTS
else if ( !strcasecmp( mime, MEDIA_MIMETYPE_AUDIO_QCELP ) ) {
mFormat = AUDIO_FORMAT_QCELP;
frameSize = QCELP_FRAMESIZE;
diff --git a/media/libstagefright/AwesomePlayer.cpp b/media/libstagefright/AwesomePlayer.cpp
index 1ea742a..a8a4094 100644
--- a/media/libstagefright/AwesomePlayer.cpp
+++ b/media/libstagefright/AwesomePlayer.cpp
@@ -3282,7 +3282,7 @@
MEDIA_MIMETYPE_AUDIO_AAC,
#ifdef TUNNEL_MODE_SUPPORTS_AMRWB
MEDIA_MIMETYPE_AUDIO_AMR_WB,
- #ifdef ENABLE_QC_AV_ENHANCEMENTS
+ #ifdef ENABLE_AV_ENHANCEMENTS
MEDIA_MIMETYPE_AUDIO_AMR_WB_PLUS
#endif
#endif
diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp
index fcb47d1..3994f1e 100644
--- a/media/libstagefright/MPEG4Extractor.cpp
+++ b/media/libstagefright/MPEG4Extractor.cpp
@@ -37,7 +37,7 @@
#include <media/stagefright/MediaSource.h>
#include <media/stagefright/MetaData.h>
#include <utils/String8.h>
-#ifdef ENABLE_QC_AV_ENHANCEMENTS
+#ifdef ENABLE_AV_ENHANCEMENTS
#include <QCMediaDefs.h>
#include "include/ExtendedUtils.h"
#endif
@@ -330,7 +330,7 @@
case FOURCC('a', 'v', 'c', '1'):
return MEDIA_MIMETYPE_VIDEO_AVC;
-#ifdef ENABLE_QC_AV_ENHANCEMENTS
+#ifdef ENABLE_AV_ENHANCEMENTS
case FOURCC('s', 'q', 'c', 'p'):
return MEDIA_MIMETYPE_AUDIO_QCELP;
case FOURCC('s', 'e', 'v', 'c'):
@@ -2302,7 +2302,7 @@
return ERROR_MALFORMED;
}
-#ifdef ENABLE_QC_AV_ENHANCEMENTS
+#ifdef ENABLE_AV_ENHANCEMENTS
if (objectTypeIndication == 0xA0) {
mLastTrack->meta->setCString(kKeyMIMEType, MEDIA_MIMETYPE_AUDIO_EVRC);
return OK;
@@ -3230,8 +3230,8 @@
return ERROR_IO;
}
-#ifdef ENABLE_QC_AV_ENHANCEMENTS
- ExtendedUtils::helper_mpeg4extractor_checkAC3EAC3(mBuffer, mFormat, size);
+#ifdef ENABLE_AV_ENHANCEMENTS
+// ExtendedUtils::helper_mpeg4extractor_checkAC3EAC3(mBuffer, mFormat, size);
#endif
CHECK(mBuffer != NULL);
mBuffer->set_range(0, size);
diff --git a/media/libstagefright/Utils.cpp b/media/libstagefright/Utils.cpp
index e589fdc..c6b94bd 100755
--- a/media/libstagefright/Utils.cpp
+++ b/media/libstagefright/Utils.cpp
@@ -34,7 +34,7 @@
#include <media/AudioParameter.h>
#include <media/stagefright/ExtendedCodec.h>
-#ifdef ENABLE_QC_AV_ENHANCEMENTS
+#ifdef ENABLE_AV_ENHANCEMENTS
#include "QCMetaData.h"
#endif
@@ -134,7 +134,7 @@
msg->setInt32("is-adts", true);
}
-#ifdef ENABLE_QC_AV_ENHANCEMENTS
+#ifdef ENABLE_AV_ENHANCEMENTS
uint32_t type;
const void *data;
size_t size;