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

Commit 3f6d83a6 authored by Glenn Kasten's avatar Glenn Kasten
Browse files

Declare more IAudioFlinger methods const 

This is just documentation, as C++ method const-ness doesn't mean anything
for a binder API.  Instead, here const means "no side effects".

Change-Id: Iaa9cd2fe477db10ae9a40cac4f79f0faa9b4e5e6
parent f55bc564

include/media/AudioEffect.h

+2 −1
Original line number Original line Diff line number Diff line
@@ -108,7 +108,8 @@ public: 
     * Returned value

     * Returned value

     *   *descriptor updated with effect descriptor

     *   *descriptor updated with effect descriptor

     */

     */

    static status_t getEffectDescriptor(effect_uuid_t *uuid, effect_descriptor_t *descriptor);

    static status_t getEffectDescriptor(effect_uuid_t *uuid,

                                        effect_descriptor_t *descriptor) /*const*/;









    /*

    /*

include/media/IAudioFlinger.h

+8 −7
Original line number Original line Diff line number Diff line
@@ -103,13 +103,13 @@ public: 
    virtual     bool        getMicMute() const = 0;

    virtual     bool        getMicMute() const = 0;





    virtual     status_t    setParameters(int ioHandle, const String8& keyValuePairs) = 0;

    virtual     status_t    setParameters(int ioHandle, const String8& keyValuePairs) = 0;

    virtual     String8     getParameters(int ioHandle, const String8& keys) = 0;

    virtual     String8     getParameters(int ioHandle, const String8& keys) const = 0;





    // register a current process for audio output change notifications

    // register a current process for audio output change notifications

    virtual void registerClient(const sp<IAudioFlingerClient>& client) = 0;

    virtual void registerClient(const sp<IAudioFlingerClient>& client) = 0;





    // retrieve the audio recording buffer size

    // retrieve the audio recording buffer size

    virtual size_t getInputBufferSize(uint32_t sampleRate, audio_format_t format, int channelCount) = 0;

    virtual size_t getInputBufferSize(uint32_t sampleRate, audio_format_t format, int channelCount) const = 0;





    virtual int openOutput(uint32_t *pDevices,

    virtual int openOutput(uint32_t *pDevices,

                                    uint32_t *pSamplingRate,

                                    uint32_t *pSamplingRate,
@@ -133,20 +133,21 @@ public: 




    virtual status_t setVoiceVolume(float volume) = 0;

    virtual status_t setVoiceVolume(float volume) = 0;





    virtual status_t getRenderPosition(uint32_t *halFrames, uint32_t *dspFrames, int output) = 0;

    virtual status_t getRenderPosition(uint32_t *halFrames, uint32_t *dspFrames, int output) const = 0;





    virtual unsigned int  getInputFramesLost(int ioHandle) = 0;

    virtual unsigned int getInputFramesLost(int ioHandle) const = 0;





    virtual int newAudioSessionId() = 0;

    virtual int newAudioSessionId() = 0;





    virtual void acquireAudioSessionId(int audioSession) = 0;

    virtual void acquireAudioSessionId(int audioSession) = 0;

    virtual void releaseAudioSessionId(int audioSession) = 0;

    virtual void releaseAudioSessionId(int audioSession) = 0;





    virtual status_t queryNumberEffects(uint32_t *numEffects) = 0;

    virtual status_t queryNumberEffects(uint32_t *numEffects) const = 0;





    virtual status_t queryEffect(uint32_t index, effect_descriptor_t *pDescriptor) = 0;

    virtual status_t queryEffect(uint32_t index, effect_descriptor_t *pDescriptor) const = 0;





    virtual status_t getEffectDescriptor(effect_uuid_t *pEffectUUID, effect_descriptor_t *pDescriptor) = 0;

    virtual status_t getEffectDescriptor(effect_uuid_t *pEffectUUID,

                                        effect_descriptor_t *pDescriptor) const = 0;





    virtual sp<IEffect> createEffect(pid_t pid,

    virtual sp<IEffect> createEffect(pid_t pid,

                                    effect_descriptor_t *pDesc,

                                    effect_descriptor_t *pDesc,

media/libmedia/AudioEffect.cpp

+2 −1
Original line number Original line Diff line number Diff line
@@ -412,7 +412,8 @@ status_t AudioEffect::queryEffect(uint32_t index, effect_descriptor_t *descripto 
    return af->queryEffect(index, descriptor);

    return af->queryEffect(index, descriptor);

}

}





status_t AudioEffect::getEffectDescriptor(effect_uuid_t *uuid, effect_descriptor_t *descriptor)

status_t AudioEffect::getEffectDescriptor(effect_uuid_t *uuid,

        effect_descriptor_t *descriptor) /*const*/

{

{

    const sp<IAudioFlinger>& af = AudioSystem::get_audio_flinger();

    const sp<IAudioFlinger>& af = AudioSystem::get_audio_flinger();

    if (af == 0) return PERMISSION_DENIED;

    if (af == 0) return PERMISSION_DENIED;

media/libmedia/IAudioFlinger.cpp

+8 −7
Original line number Original line Diff line number Diff line
@@ -325,7 +325,7 @@ public: 
        return reply.readInt32();

        return reply.readInt32();

    }

    }





    virtual String8 getParameters(int ioHandle, const String8& keys)

    virtual String8 getParameters(int ioHandle, const String8& keys) const

    {

    {

        Parcel data, reply;

        Parcel data, reply;

        data.writeInterfaceToken(IAudioFlinger::getInterfaceDescriptor());

        data.writeInterfaceToken(IAudioFlinger::getInterfaceDescriptor());
@@ -343,7 +343,7 @@ public: 
        remote()->transact(REGISTER_CLIENT, data, &reply);

        remote()->transact(REGISTER_CLIENT, data, &reply);

    }

    }





    virtual size_t getInputBufferSize(uint32_t sampleRate, audio_format_t format, int channelCount)

    virtual size_t getInputBufferSize(uint32_t sampleRate, audio_format_t format, int channelCount) const

    {

    {

        Parcel data, reply;

        Parcel data, reply;

        data.writeInterfaceToken(IAudioFlinger::getInterfaceDescriptor());

        data.writeInterfaceToken(IAudioFlinger::getInterfaceDescriptor());
@@ -487,7 +487,7 @@ public: 
        return reply.readInt32();

        return reply.readInt32();

    }

    }





    virtual status_t getRenderPosition(uint32_t *halFrames, uint32_t *dspFrames, int output)

    virtual status_t getRenderPosition(uint32_t *halFrames, uint32_t *dspFrames, int output) const

    {

    {

        Parcel data, reply;

        Parcel data, reply;

        data.writeInterfaceToken(IAudioFlinger::getInterfaceDescriptor());

        data.writeInterfaceToken(IAudioFlinger::getInterfaceDescriptor());
@@ -507,7 +507,7 @@ public: 
        return status;

        return status;

    }

    }





    virtual unsigned int getInputFramesLost(int ioHandle)

    virtual unsigned int getInputFramesLost(int ioHandle) const

    {

    {

        Parcel data, reply;

        Parcel data, reply;

        data.writeInterfaceToken(IAudioFlinger::getInterfaceDescriptor());

        data.writeInterfaceToken(IAudioFlinger::getInterfaceDescriptor());
@@ -544,7 +544,7 @@ public: 
        remote()->transact(RELEASE_AUDIO_SESSION_ID, data, &reply);

        remote()->transact(RELEASE_AUDIO_SESSION_ID, data, &reply);

    }

    }





    virtual status_t queryNumberEffects(uint32_t *numEffects)

    virtual status_t queryNumberEffects(uint32_t *numEffects) const

    {

    {

        Parcel data, reply;

        Parcel data, reply;

        data.writeInterfaceToken(IAudioFlinger::getInterfaceDescriptor());

        data.writeInterfaceToken(IAudioFlinger::getInterfaceDescriptor());
@@ -562,7 +562,7 @@ public: 
        return NO_ERROR;

        return NO_ERROR;

    }

    }





    virtual status_t queryEffect(uint32_t index, effect_descriptor_t *pDescriptor)

    virtual status_t queryEffect(uint32_t index, effect_descriptor_t *pDescriptor) const

    {

    {

        if (pDescriptor == NULL) {

        if (pDescriptor == NULL) {

            return BAD_VALUE;

            return BAD_VALUE;
@@ -582,7 +582,8 @@ public: 
        return NO_ERROR;

        return NO_ERROR;

    }

    }





    virtual status_t getEffectDescriptor(effect_uuid_t *pUuid, effect_descriptor_t *pDescriptor)

    virtual status_t getEffectDescriptor(effect_uuid_t *pUuid,

            effect_descriptor_t *pDescriptor) const

    {

    {

        if (pUuid == NULL || pDescriptor == NULL) {

        if (pUuid == NULL || pDescriptor == NULL) {

            return BAD_VALUE;

            return BAD_VALUE;

services/audioflinger/AudioFlinger.cpp

+8 −7
Original line number Original line Diff line number Diff line
@@ -816,7 +816,7 @@ status_t AudioFlinger::setParameters(int ioHandle, const String8& keyValuePairs) 
    return BAD_VALUE;

    return BAD_VALUE;

}

}





String8 AudioFlinger::getParameters(int ioHandle, const String8& keys)

String8 AudioFlinger::getParameters(int ioHandle, const String8& keys) const

{

{

//    ALOGV("getParameters() io %d, keys %s, tid %d, calling tid %d",

//    ALOGV("getParameters() io %d, keys %s, tid %d, calling tid %d",

//            ioHandle, keys.string(), gettid(), IPCThreadState::self()->getCallingPid());

//            ioHandle, keys.string(), gettid(), IPCThreadState::self()->getCallingPid());
@@ -846,7 +846,7 @@ String8 AudioFlinger::getParameters(int ioHandle, const String8& keys) 
    return String8("");

    return String8("");

}

}





size_t AudioFlinger::getInputBufferSize(uint32_t sampleRate, audio_format_t format, int channelCount)

size_t AudioFlinger::getInputBufferSize(uint32_t sampleRate, audio_format_t format, int channelCount) const

{

{

    status_t ret = initCheck();

    status_t ret = initCheck();

    if (ret != NO_ERROR) {

    if (ret != NO_ERROR) {
@@ -856,7 +856,7 @@ size_t AudioFlinger::getInputBufferSize(uint32_t sampleRate, audio_format_t form 
    return mPrimaryHardwareDev->get_input_buffer_size(mPrimaryHardwareDev, sampleRate, format, channelCount);

    return mPrimaryHardwareDev->get_input_buffer_size(mPrimaryHardwareDev, sampleRate, format, channelCount);

}

}





unsigned int AudioFlinger::getInputFramesLost(int ioHandle)

unsigned int AudioFlinger::getInputFramesLost(int ioHandle) const

{

{

    if (ioHandle == 0) {

    if (ioHandle == 0) {

        return 0;

        return 0;
@@ -891,7 +891,7 @@ status_t AudioFlinger::setVoiceVolume(float value) 
    return ret;

    return ret;

}

}





status_t AudioFlinger::getRenderPosition(uint32_t *halFrames, uint32_t *dspFrames, int output)

status_t AudioFlinger::getRenderPosition(uint32_t *halFrames, uint32_t *dspFrames, int output) const

{

{

    status_t status;

    status_t status;
@@ -5413,19 +5413,20 @@ uint32_t AudioFlinger::primaryOutputDevice_l() 
// ----------------------------------------------------------------------------

// ----------------------------------------------------------------------------









status_t AudioFlinger::queryNumberEffects(uint32_t *numEffects)

status_t AudioFlinger::queryNumberEffects(uint32_t *numEffects) const

{

{

    Mutex::Autolock _l(mLock);

    Mutex::Autolock _l(mLock);

    return EffectQueryNumberEffects(numEffects);

    return EffectQueryNumberEffects(numEffects);

}

}





status_t AudioFlinger::queryEffect(uint32_t index, effect_descriptor_t *descriptor)

status_t AudioFlinger::queryEffect(uint32_t index, effect_descriptor_t *descriptor) const

{

{

    Mutex::Autolock _l(mLock);

    Mutex::Autolock _l(mLock);

    return EffectQueryEffect(index, descriptor);

    return EffectQueryEffect(index, descriptor);

}

}





status_t AudioFlinger::getEffectDescriptor(effect_uuid_t *pUuid, effect_descriptor_t *descriptor)

status_t AudioFlinger::getEffectDescriptor(effect_uuid_t *pUuid,

        effect_descriptor_t *descriptor) const

{

{

    Mutex::Autolock _l(mLock);

    Mutex::Autolock _l(mLock);

    return EffectGetDescriptor(pUuid, descriptor);

    return EffectGetDescriptor(pUuid, descriptor);