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

Commit 28b269f3 authored by Glenn Kasten's avatar Glenn Kasten
Browse files

Use audio_policy_output_flags_t consistently 

This affects:
 - IAudioFlinger::openOutput
 - AudioTrack::AudioTrack
 - AudioTrack::set
 - apps that call these

Change-Id: I26fb281bac6cb87593d17697bc9cb37a835af205
parent df0d3ab4

core/jni/android_media_AudioTrack.cpp

+2 −2
Original line number Diff line number Diff line
@@ -279,7 +279,7 @@ android_media_AudioTrack_native_setup(JNIEnv *env, jobject thiz, jobject weak_th 
            format,// word length, PCM

            nativeChannelMask,

            frameCount,

            0,// flags

            AUDIO_POLICY_OUTPUT_FLAG_NONE,

            audioCallback, &(lpJniStorage->mCallbackData),//callback, callback data (user)

            0,// notificationFrames == 0 since not using EVENT_MORE_DATA to feed the AudioTrack

            0,// shared mem
@@ -300,7 +300,7 @@ android_media_AudioTrack_native_setup(JNIEnv *env, jobject thiz, jobject weak_th 
            format,// word length, PCM

            nativeChannelMask,

            frameCount,

            0,// flags

            AUDIO_POLICY_OUTPUT_FLAG_NONE,

            audioCallback, &(lpJniStorage->mCallbackData),//callback, callback data (user));

            0,// notificationFrames == 0 since not using EVENT_MORE_DATA to feed the AudioTrack 

            lpJniStorage->mMemBase,// shared mem

include/media/AudioTrack.h

+6 −6
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ public: 
                                    audio_format_t format = AUDIO_FORMAT_DEFAULT,

                                    int channelMask      = 0,

                                    int frameCount       = 0,

                                    uint32_t flags       = 0,

                                    audio_policy_output_flags_t flags = AUDIO_POLICY_OUTPUT_FLAG_NONE,

                                    callback_t cbf       = NULL,

                                    void* user           = NULL,

                                    int notificationFrames = 0,
@@ -165,7 +165,7 @@ public: 
                                    int format = AUDIO_FORMAT_DEFAULT,

                                    int channelMask      = 0,

                                    int frameCount       = 0,

                                    uint32_t flags       = 0,

                                    uint32_t flags       = (uint32_t) AUDIO_POLICY_OUTPUT_FLAG_NONE,

                                    callback_t cbf       = 0,

                                    void* user           = 0,

                                    int notificationFrames = 0,
@@ -185,7 +185,7 @@ public: 
                                    audio_format_t format = AUDIO_FORMAT_DEFAULT,

                                    int channelMask     = 0,

                                    const sp<IMemory>& sharedBuffer = 0,

                                    uint32_t flags      = 0,

                                    audio_policy_output_flags_t flags = AUDIO_POLICY_OUTPUT_FLAG_NONE,

                                    callback_t cbf      = NULL,

                                    void* user          = NULL,

                                    int notificationFrames = 0,
@@ -209,7 +209,7 @@ public: 
                            audio_format_t format = AUDIO_FORMAT_DEFAULT,

                            int channelMask     = 0,

                            int frameCount      = 0,

                            uint32_t flags      = 0,

                            audio_policy_output_flags_t flags = AUDIO_POLICY_OUTPUT_FLAG_NONE,

                            callback_t cbf      = NULL,

                            void* user          = NULL,

                            int notificationFrames = 0,
@@ -473,7 +473,7 @@ protected: 
                                 audio_format_t format,

                                 uint32_t channelMask,

                                 int frameCount,

                                 uint32_t flags,

                                 audio_policy_output_flags_t flags,

                                 const sp<IMemory>& sharedBuffer,

                                 audio_io_handle_t output,

                                 bool enforceFrameCount);
@@ -515,7 +515,7 @@ protected: 
    uint32_t                mNewPosition;

    uint32_t                mUpdatePeriod;

    bool                    mFlushed; // FIXME will be made obsolete by making flush() synchronous

    uint32_t                mFlags;

    audio_policy_output_flags_t mFlags;

    int                     mSessionId;

    int                     mAuxEffectId;

    mutable Mutex           mLock;

include/media/IAudioFlinger.h

+2 −1
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include <media/IAudioRecord.h>

#include <media/IAudioFlingerClient.h>

#include <system/audio.h>

#include <system/audio_policy.h>

#include <hardware/audio_effect.h>

#include <media/IEffect.h>

#include <media/IEffectClient.h>
@@ -121,7 +122,7 @@ public: 
                                    audio_format_t *pFormat,

                                    uint32_t *pChannels,

                                    uint32_t *pLatencyMs,

                                    uint32_t flags) = 0;

                                    audio_policy_output_flags_t flags) = 0;

    virtual audio_io_handle_t openDuplicateOutput(audio_io_handle_t output1,

                                    audio_io_handle_t output2) = 0;

    virtual status_t closeOutput(audio_io_handle_t output) = 0;

media/jni/soundpool/SoundPool.cpp

+3 −2
Original line number Diff line number Diff line
@@ -608,10 +608,11 @@ void SoundChannel::play(const sp<Sample>& sample, int nextChannelID, float leftV 
        // do not create a new audio track if current track is compatible with sample parameters

#ifdef USE_SHARED_MEM_BUFFER

        newTrack = new AudioTrack(streamType, sampleRate, sample->format(),

                channels, sample->getIMemory(), 0, callback, userData);

                channels, sample->getIMemory(), AUDIO_POLICY_OUTPUT_FLAG_NONE, callback, userData);

#else

        newTrack = new AudioTrack(streamType, sampleRate, sample->format(),

                channels, frameCount, 0, callback, userData, bufferFrames);

                channels, frameCount, AUDIO_POLICY_OUTPUT_FLAG_NONE, callback, userData,

                bufferFrames);

#endif

        oldTrack = mAudioTrack;

        status = newTrack->initCheck();

media/libmedia/AudioTrack.cpp

+9 −8
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ AudioTrack::AudioTrack( 
        audio_format_t format,

        int channelMask,

        int frameCount,

        uint32_t flags,

        audio_policy_output_flags_t flags,

        callback_t cbf,

        void* user,

        int notificationFrames,
@@ -119,10 +119,11 @@ AudioTrack::AudioTrack( 
        int notificationFrames,

        int sessionId)

    : mStatus(NO_INIT),

      mIsTimed(false),

      mPreviousPriority(ANDROID_PRIORITY_NORMAL), mPreviousSchedulingGroup(ANDROID_TGROUP_DEFAULT)

{

    mStatus = set((audio_stream_type_t)streamType, sampleRate, (audio_format_t)format, channelMask,

            frameCount, flags, cbf, user, notificationFrames,

            frameCount, (audio_policy_output_flags_t)flags, cbf, user, notificationFrames,

            0, false, sessionId);

}
@@ -132,7 +133,7 @@ AudioTrack::AudioTrack( 
        audio_format_t format,

        int channelMask,

        const sp<IMemory>& sharedBuffer,

        uint32_t flags,

        audio_policy_output_flags_t flags,

        callback_t cbf,

        void* user,

        int notificationFrames,
@@ -172,7 +173,7 @@ status_t AudioTrack::set( 
        audio_format_t format,

        int channelMask,

        int frameCount,

        uint32_t flags,

        audio_policy_output_flags_t flags,

        callback_t cbf,

        void* user,

        int notificationFrames,
@@ -221,7 +222,7 @@ status_t AudioTrack::set( 


    // force direct flag if format is not linear PCM

    if (!audio_is_linear_pcm(format)) {

        flags |= AUDIO_POLICY_OUTPUT_FLAG_DIRECT;

        flags = (audio_policy_output_flags_t) (flags | AUDIO_POLICY_OUTPUT_FLAG_DIRECT);

    }



    if (!audio_is_output_channel(channelMask)) {
@@ -233,7 +234,7 @@ status_t AudioTrack::set( 
    audio_io_handle_t output = AudioSystem::getOutput(

                                    streamType,

                                    sampleRate, format, channelMask,

                                    (audio_policy_output_flags_t)flags);

                                    flags);



    if (output == 0) {

        ALOGE("Could not get audio output for stream type %d", streamType);
@@ -707,7 +708,7 @@ audio_io_handle_t AudioTrack::getOutput() 
audio_io_handle_t AudioTrack::getOutput_l()

{

    return AudioSystem::getOutput(mStreamType,

            mCblk->sampleRate, mFormat, mChannelMask, (audio_policy_output_flags_t)mFlags);

            mCblk->sampleRate, mFormat, mChannelMask, mFlags);

}



int AudioTrack::getSessionId() const
@@ -734,7 +735,7 @@ status_t AudioTrack::createTrack_l( 
        audio_format_t format,

        uint32_t channelMask,

        int frameCount,

        uint32_t flags,

        audio_policy_output_flags_t flags,

        const sp<IMemory>& sharedBuffer,

        audio_io_handle_t output,

        bool enforceFrameCount)