stagefright: Clean up the ifdefs
* This should get everything in line for now.
Change-Id: I3e8eaddeab34dbacb7138f9106f53ada404f7b4d
diff --git a/include/media/stagefright/MediaCodecList.h b/include/media/stagefright/MediaCodecList.h
index 05ed696..947f123 100644
--- a/include/media/stagefright/MediaCodecList.h
+++ b/include/media/stagefright/MediaCodecList.h
@@ -100,9 +100,7 @@
status_t addTypeFromAttributes(const char **attrs);
void addType(const char *name);
-#ifdef QCOM_HARDWARE
friend class ExtendedUtils;
-#endif
DISALLOW_EVIL_CONSTRUCTORS(MediaCodecList);
};
diff --git a/media/libstagefright/Android.mk b/media/libstagefright/Android.mk
index 0a303e8..e10e825 100644
--- a/media/libstagefright/Android.mk
+++ b/media/libstagefright/Android.mk
@@ -56,6 +56,7 @@
Utils.cpp \
VBRISeeker.cpp \
WAVExtractor.cpp \
+ WAVEWriter.cpp \
WVMExtractor.cpp \
XINGSeeker.cpp \
avc_utils.cpp \
@@ -77,14 +78,6 @@
LOCAL_C_INCLUDES += $(TOP)/frameworks/native/include/media/openmax
endif
-ifeq ($(BOARD_USES_QCOM_HARDWARE),true)
- LOCAL_SRC_FILES += \
- ExtendedCodec.cpp \
- ExtendedExtractor.cpp \
- ExtendedUtils.cpp \
- WAVEWriter.cpp
-endif
-
ifneq ($(filter caf bfam,$(TARGET_QCOM_AUDIO_VARIANT)),)
ifeq ($(BOARD_USES_ALSA_AUDIO),true)
LOCAL_SRC_FILES += LPAPlayerALSA.cpp
@@ -152,10 +145,16 @@
libFLAC \
libmedia_helper
+
+LOCAL_SRC_FILES += ExtendedUtils.cpp
+
ifeq ($(TARGET_ENABLE_QC_AV_ENHANCEMENTS),true)
LOCAL_CFLAGS += -DENABLE_AV_ENHANCEMENTS
- LOCAL_SRC_FILES += ExtendedMediaDefs.cpp
- LOCAL_SRC_FILES += ExtendedWriter.cpp
+ LOCAL_SRC_FILES += ExtendedCodec.cpp \
+ ExtendedExtractor.cpp \
+ ExtendedMediaDefs.cpp \
+ ExtendedWriter.cpp
+
ifneq ($(TARGET_QCOM_MEDIA_VARIANT),)
LOCAL_C_INCLUDES += \
$(TOP)/hardware/qcom/media-$(TARGET_QCOM_MEDIA_VARIANT)/mm-core/inc
diff --git a/media/libstagefright/AwesomePlayer.cpp b/media/libstagefright/AwesomePlayer.cpp
index 9fdb3b8..e177ab8 100644
--- a/media/libstagefright/AwesomePlayer.cpp
+++ b/media/libstagefright/AwesomePlayer.cpp
@@ -60,9 +60,7 @@
#include <media/stagefright/MediaSource.h>
#include <media/stagefright/MetaData.h>
#include <media/stagefright/OMXCodec.h>
-#ifdef QCOM_HARDWARE
#include "include/ExtendedUtils.h"
-#endif
#include <media/stagefright/Utils.h>
#include <gui/IGraphicBufferProducer.h>
diff --git a/media/libstagefright/MPEG4Writer.cpp b/media/libstagefright/MPEG4Writer.cpp
index 06a7beb..057cf4e 100644
--- a/media/libstagefright/MPEG4Writer.cpp
+++ b/media/libstagefright/MPEG4Writer.cpp
@@ -40,9 +40,7 @@
#include "include/ESDS.h"
-#ifdef QCOM_HARDWARE
#include "include/ExtendedUtils.h"
-#endif
namespace android {
@@ -2268,11 +2266,9 @@
meta_data->findInt32(kKeyIsSyncFrame, &isSync);
CHECK(meta_data->findInt64(kKeyTime, ×tampUs));
-#ifdef QCOM_HARDWARE
if (!mIsAudio) {
ExtendedUtils::HFR::reCalculateTimeStamp(mMeta, timestampUs);
}
-#endif
////////////////////////////////////////////////////////////////////////////////
if (mStszTableEntries->count() == 0) {
@@ -2304,9 +2300,7 @@
int64_t tmpCttsOffsetTimeUs;
int64_t decodingTimeUs;
CHECK(meta_data->findInt64(kKeyDecodingTime, &decodingTimeUs));
-#ifdef QCOM_HARDWARE
ExtendedUtils::HFR::reCalculateTimeStamp(mMeta, decodingTimeUs);
-#endif
decodingTimeUs -= previousPausedDurationUs;
cttsOffsetTimeUs =
diff --git a/media/libstagefright/include/AwesomePlayer.h b/media/libstagefright/include/AwesomePlayer.h
index 2973986..61dba35 100644
--- a/media/libstagefright/include/AwesomePlayer.h
+++ b/media/libstagefright/include/AwesomePlayer.h
@@ -104,9 +104,7 @@
void postAudioEOS(int64_t delayUs = 0ll);
void postAudioSeekComplete();
void postAudioTearDown();
-#ifdef QCOM_HARDWARE
void printFileName(int fd);
-#endif
status_t dump(int fd, const Vector<String16> &args) const;
private:
@@ -209,7 +207,7 @@
bool mWatchForAudioSeekComplete;
bool mWatchForAudioEOS;
-#ifdef QCOM_HARDWARE
+#ifdef QCOM_ENHANCED_AUDIO
static int mTunnelAliveAP;
#endif
@@ -322,8 +320,9 @@
ASSIGN
};
void modifyFlags(unsigned value, FlagMode mode);
-#ifdef QCOM_HARDWARE
+#ifdef QCOM_ENHANCED_AUDIO
void checkTunnelExceptions();
+#endif
void logFirstFrame();
void logCatchUp(int64_t ts, int64_t clock, int64_t delta);
void logLate(int64_t ts, int64_t clock, int64_t delta);
@@ -332,7 +331,6 @@
int64_t getTimeOfDayUs();
bool mStatistics;
int64_t mLateAVSyncMargin;
-#endif
struct TrackStat {
String8 mMIME;
@@ -359,7 +357,6 @@
uint32_t mFlags;
Vector<TrackStat> mTracks;
-#ifdef QCOM_HARDWARE
int64_t mConsecutiveFramesDropped;
uint32_t mCatchupTimeStart;
uint32_t mNumTimesSyncLoss;
@@ -376,7 +373,6 @@
int64_t mLastSeekToTimeMs;
int64_t mResumeDelayStartUs;
int64_t mSeekDelayStartUs;
-#endif
} mStats;
bool mOffloadAudio;
@@ -396,7 +392,7 @@
size_t countTracks() const;
-#ifdef QCOM_HARDWARE
+#ifdef QCOM_ENHANCED_AUDIO
bool inSupportedTunnelFormats(const char * mime);
//Flag to check if tunnel mode audio is enabled
bool mIsTunnelAudio;
diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp
index a00e42e..7bc1c7d 100644
--- a/services/audioflinger/AudioFlinger.cpp
+++ b/services/audioflinger/AudioFlinger.cpp
@@ -191,9 +191,11 @@
Mutex::Autolock _l(mLock);
/* TODO: move all this work into an Init() function */
+#ifdef QCOM_HARDWARE
mLPASessionId = -2; // -2 is invalid session ID
mIsEffectConfigChanged = false;
mLPAEffectChain = NULL;
+#endif
char val_str[PROPERTY_VALUE_MAX] = { 0 };
if (property_get("ro.audio.flinger_standbytime_ms", val_str, NULL) >= 0) {
uint32_t int_val;