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

Commit dec93485 authored by Steve Kondik's avatar Steve Kondik Committed by Ricardo Cerqueira
Browse files

libmedia: Add some ifdefs for QCOM-specific features 

Change-Id: Ia811205e7dc2d331a084b4d7230bf35c14882158
parent 07b75c84

media/libmedia/AudioTrack.cpp

+4 −0
Original line number Diff line number Diff line
@@ -359,6 +359,7 @@ status_t AudioTrack::set( 
        flags = (audio_output_flags_t)(flags &~AUDIO_OUTPUT_FLAG_DEEP_BUFFER);

    }



#ifdef QCOM_HARDWARE

    if ((mStreamType == AUDIO_STREAM_VOICE_CALL) &&

        (mChannelCount == 1) &&

        (mSampleRate == 8000 || mSampleRate == 16000)) {
@@ -406,6 +407,7 @@ status_t AudioTrack::set( 
            }

        }

    }

#endif



    if (flags & AUDIO_OUTPUT_FLAG_DIRECT) {

        if (audio_is_linear_pcm(format)) {
@@ -2178,10 +2180,12 @@ void AudioTrack::setAttributesFromStreamType(audio_stream_type_t streamType) { 
    switch(streamType) {

    case AUDIO_STREAM_DEFAULT:

    case AUDIO_STREAM_MUSIC:

#ifdef QCOM_HARDWARE

    case AUDIO_STREAM_INCALL_MUSIC:

        mAttributes.content_type = AUDIO_CONTENT_TYPE_MUSIC;

        mAttributes.usage = AUDIO_USAGE_MEDIA;

        break;

#endif

    case AUDIO_STREAM_VOICE_CALL:

        mAttributes.content_type = AUDIO_CONTENT_TYPE_SPEECH;

        mAttributes.usage = AUDIO_USAGE_VOICE_COMMUNICATION;

media/libmedia/ToneGenerator.cpp

+2 −0
Original line number Diff line number Diff line
@@ -1059,10 +1059,12 @@ void ToneGenerator::stopTone() { 
bool ToneGenerator::initAudioTrack() {



    audio_output_flags_t flags = AUDIO_OUTPUT_FLAG_FAST;

#ifdef QCOM_HARDWARE

    // Set AUDIO_OUTPUT_FLAG_DIRECT and AUDIO_OUTPUT_FLAG_INCALL_MUSIC for incall music delivery

    if (mStreamType == AUDIO_STREAM_INCALL_MUSIC) {

        flags = (audio_output_flags_t)(AUDIO_OUTPUT_FLAG_DIRECT | AUDIO_OUTPUT_FLAG_INCALL_MUSIC);

    }

#endif



    // Open audio track in mono, PCM 16bit, default sampling rate, default buffer size

    mpAudioTrack = new AudioTrack();

services/audiopolicy/AudioPolicyManager.cpp

+2 −0
Original line number Diff line number Diff line
@@ -5659,12 +5659,14 @@ const AudioPolicyManager::VolumeCurvePoint 
        sDefaultMediaVolumeCurve, // DEVICE_CATEGORY_EARPIECE

        sDefaultMediaVolumeCurve  // DEVICE_CATEGORY_EXT_MEDIA

    },

#ifdef QCOM_HARDWARE

    { // AUDIO_STREAM_INCALL_MUSIC

        sDefaultMediaVolumeCurve, // DEVICE_CATEGORY_HEADSET

        sSpeakerMediaVolumeCurve, // DEVICE_CATEGORY_SPEAKER

        sDefaultMediaVolumeCurve,  // DEVICE_CATEGORY_EARPIECE

        sDefaultMediaVolumeCurve  // DEVICE_CATEGORY_EXT_MEDIA

    },

#endif

};



void AudioPolicyManager::initializeVolumeCurves()