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

Commit e336f911 authored by Jean-Michel Trivi's avatar Jean-Michel Trivi
Browse files

Add support for querying if a stream is active remotely 

Bug 7485803

Change-Id: I0744374f130fd2dd0714102354cffed2fa915361
parent 51a92030

include/media/AudioSystem.h

+6 −1
Original line number Diff line number Diff line
@@ -67,9 +67,14 @@ public: 
    // set audio mode in audio hardware

    static status_t setMode(audio_mode_t mode);



    // returns true in *state if tracks are active on the specified stream or has been active

    // returns true in *state if tracks are active on the specified stream or have been active

    // in the past inPastMs milliseconds

    static status_t isStreamActive(audio_stream_type_t stream, bool *state, uint32_t inPastMs = 0);

    // returns true in *state if tracks are active for what qualifies as remote playback

    // on the specified stream or have been active in the past inPastMs milliseconds. Remote

    // playback isn't mutually exclusive with local playback.

    static status_t isStreamActiveRemotely(audio_stream_type_t stream, bool *state,

            uint32_t inPastMs = 0);

    // returns true in *state if a recorder is currently recording with the specified source

    static status_t isSourceActive(audio_source_t source, bool *state);

include/media/IAudioPolicyService.h

+2 −0
Original line number Diff line number Diff line
@@ -89,6 +89,8 @@ public: 
    virtual status_t unregisterEffect(int id) = 0;

    virtual status_t setEffectEnabled(int id, bool enabled) = 0;

    virtual bool     isStreamActive(audio_stream_type_t stream, uint32_t inPastMs = 0) const = 0;

    virtual bool     isStreamActiveRemotely(audio_stream_type_t stream, uint32_t inPastMs = 0)

                             const = 0;

    virtual bool     isSourceActive(audio_source_t source) const = 0;

    virtual status_t queryDefaultPreProcessing(int audioSession,

                                              effect_descriptor_t *descriptors,

media/libmedia/AudioSystem.cpp

+10 −0
Original line number Diff line number Diff line
@@ -731,6 +731,16 @@ status_t AudioSystem::isStreamActive(audio_stream_type_t stream, bool* state, ui 
    return NO_ERROR;

}



status_t AudioSystem::isStreamActiveRemotely(audio_stream_type_t stream, bool* state,

        uint32_t inPastMs)

{

    const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();

    if (aps == 0) return PERMISSION_DENIED;

    if (state == NULL) return BAD_VALUE;

    *state = aps->isStreamActiveRemotely(stream, inPastMs);

    return NO_ERROR;

}



status_t AudioSystem::isSourceActive(audio_source_t stream, bool* state)

{

    const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();

media/libmedia/IAudioPolicyService.cpp

+20 −1
Original line number Diff line number Diff line
@@ -55,7 +55,8 @@ enum { 
    IS_SOURCE_ACTIVE,

    GET_DEVICES_FOR_STREAM,

    QUERY_DEFAULT_PRE_PROCESSING,

    SET_EFFECT_ENABLED

    SET_EFFECT_ENABLED,

    IS_STREAM_ACTIVE_REMOTELY

};



class BpAudioPolicyService : public BpInterface<IAudioPolicyService>
@@ -330,6 +331,16 @@ public: 
        return reply.readInt32();

    }



    virtual bool isStreamActiveRemotely(audio_stream_type_t stream, uint32_t inPastMs) const

    {

        Parcel data, reply;

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

        data.writeInt32((int32_t) stream);

        data.writeInt32(inPastMs);

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

        return reply.readInt32();

    }



    virtual bool isSourceActive(audio_source_t source) const

    {

        Parcel data, reply;
@@ -605,6 +616,14 @@ status_t BnAudioPolicyService::onTransact( 
            return NO_ERROR;

        } break;



        case IS_STREAM_ACTIVE_REMOTELY: {

            CHECK_INTERFACE(IAudioPolicyService, data, reply);

            audio_stream_type_t stream = (audio_stream_type_t) data.readInt32();

            uint32_t inPastMs = (uint32_t)data.readInt32();

            reply->writeInt32( isStreamActiveRemotely((audio_stream_type_t) stream, inPastMs) );

            return NO_ERROR;

        } break;



        case IS_SOURCE_ACTIVE: {

            CHECK_INTERFACE(IAudioPolicyService, data, reply);

            audio_source_t source = (audio_source_t) data.readInt32();

services/audioflinger/AudioPolicyService.cpp

+9 −0
Original line number Diff line number Diff line
@@ -484,6 +484,15 @@ bool AudioPolicyService::isStreamActive(audio_stream_type_t stream, uint32_t inP 
    return mpAudioPolicy->is_stream_active(mpAudioPolicy, stream, inPastMs);

}



bool AudioPolicyService::isStreamActiveRemotely(audio_stream_type_t stream, uint32_t inPastMs) const

{

    if (mpAudioPolicy == NULL) {

        return 0;

    }

    Mutex::Autolock _l(mLock);

    return mpAudioPolicy->is_stream_active_remotely(mpAudioPolicy, stream, inPastMs);

}



bool AudioPolicyService::isSourceActive(audio_source_t source) const

{

    if (mpAudioPolicy == NULL) {