Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f7136631 authored by Ricardo Cerqueira's avatar Ricardo Cerqueira
Browse files

qcom: Split off caf AUDIO_VARIANT support from QCOM_HARDWARE 

One does not imply the other, add a different flag to allow using
them independently

Change-Id: I7fe0c0391967132a65f86f0c5f4bc0f54d50777d
parent 9f0c5d24

media/libstagefright/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -95,6 +95,7 @@ ifeq ($(TARGET_QCOM_AUDIO_VARIANT),caf) 
    ifeq ($(NO_TUNNEL_MODE_FOR_MULTICHANNEL),true)

        LOCAL_CFLAGS += -DNO_TUNNEL_MODE_FOR_MULTICHANNEL

    endif

    LOCAL_CFLAGS += -DQCOM_ENHANCED_AUDIO

endif



ifeq ($(TARGET_QCOM_MEDIA_VARIANT),caf)

media/libstagefright/AwesomePlayer.cpp

+10 −10
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ 
#include <media/stagefright/foundation/ADebug.h>

#include <media/stagefright/timedtext/TimedTextDriver.h>

#include <media/stagefright/AudioPlayer.h>

#ifdef QCOM_HARDWARE

#ifdef QCOM_ENHANCED_AUDIO

#include <media/stagefright/LPAPlayer.h>

#ifdef USE_TUNNEL_MODE

#include <media/stagefright/TunnelPlayer.h>
@@ -80,7 +80,7 @@ static const int64_t kInitFrameDurationUs = 16000; 
static const int64_t kScheduleLagGapUs = 1000;

static const int64_t kDefaultEventDelayUs = 10000;



#ifdef QCOM_HARDWARE

#ifdef QCOM_ENHANCED_AUDIO

int AwesomePlayer::mTunnelAliveAP = 0;

#endif
@@ -234,7 +234,7 @@ AwesomePlayer::AwesomePlayer() 
    mAudioStatusEventPending = false;



    reset();

#ifdef QCOM_HARDWARE

#ifdef QCOM_ENHANCED_AUDIO

    mIsTunnelAudio = false;

#endif

}
@@ -246,7 +246,7 @@ AwesomePlayer::~AwesomePlayer() { 


    reset();



#ifdef QCOM_HARDWARE

#ifdef QCOM_ENHANCED_AUDIO

    // Disable Tunnel Mode Audio

    if (mIsTunnelAudio) {

        if (mTunnelAliveAP > 0) {
@@ -965,7 +965,7 @@ status_t AwesomePlayer::play() { 
}



status_t AwesomePlayer::play_l() {

#ifdef QCOM_HARDWARE

#ifdef QCOM_ENHANCED_AUDIO

    int tunnelObjectsAlive = 0;

#endif

    modifyFlags(SEEK_PREVIEW, CLEAR);
@@ -995,7 +995,7 @@ status_t AwesomePlayer::play_l() { 
    if (mAudioSource != NULL) {

        if (mAudioPlayer == NULL) {

            if (mAudioSink != NULL) {

#ifdef QCOM_HARDWARE

#ifdef QCOM_ENHANCED_AUDIO

                sp<MetaData> format = mAudioTrack->getFormat();

                const char *mime;

                bool success = format->findCString(kKeyMIMEType, &mime);
@@ -1013,7 +1013,7 @@ status_t AwesomePlayer::play_l() { 
                } else {

                    allowDeepBuffering = false;

                }

#ifdef QCOM_HARDWARE

#ifdef QCOM_ENHANCED_AUDIO

#ifdef USE_TUNNEL_MODE

                // Create tunnel player if tunnel mode is enabled

                ALOGW("Trying to create tunnel player mIsTunnelAudio %d, \
@@ -1093,7 +1093,7 @@ status_t AwesomePlayer::play_l() { 
                    ALOGV("AudioPlayer created, Non-LPA mode mime %s duration %lld\n", mime, mDurationUs);

#endif

                    mAudioPlayer = new AudioPlayer(mAudioSink, allowDeepBuffering, this);

#ifdef QCOM_HARDWARE

#ifdef QCOM_ENHANCED_AUDIO

                }

#endif

                mAudioPlayer->setSource(mAudioSource);
@@ -1114,7 +1114,7 @@ status_t AwesomePlayer::play_l() { 
            // We don't want to post an error notification at this point,

            // the error returned from MediaPlayer::start() will suffice.

            bool sendErrorNotification = false;

#ifdef QCOM_HARDWARE

#ifdef QCOM_ENHANCED_AUDIO

            if(mIsTunnelAudio) {

                // For tunnel Audio error has to be posted to the client

                sendErrorNotification = true;
@@ -1611,7 +1611,7 @@ status_t AwesomePlayer::initAudioDecoder() { 


    const char *mime;

    CHECK(meta->findCString(kKeyMIMEType, &mime));

#ifdef QCOM_HARDWARE

#ifdef QCOM_ENHANCED_AUDIO

    int32_t nchannels = 0;

    int32_t isADTS = 0;

    meta->findInt32( kKeyChannelCount, &nchannels );