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

Commit 4dc68060 authored by Eric Laurent's avatar Eric Laurent
Browse files

audio policy: pass session ID to capture activity methods 

Indicate the audio session ID when calling getInput(),
startInput(), stopInput(), releaseInput().

Bug: 12378680.
Change-Id: I763793752f93e2f4e1445a5ab217c895af011038
parent d530d415

include/media/AudioSystem.h

+6 −3
Original line number Diff line number Diff line
@@ -237,9 +237,12 @@ public: 
                                    int sessionId,

                                    audio_input_flags_t);



    static status_t startInput(audio_io_handle_t input);

    static status_t stopInput(audio_io_handle_t input);

    static void releaseInput(audio_io_handle_t input);

    static status_t startInput(audio_io_handle_t input,

                               audio_session_t session);

    static status_t stopInput(audio_io_handle_t input,

                              audio_session_t session);

    static void releaseInput(audio_io_handle_t input,

                             audio_session_t session);

    static status_t initStreamVolume(audio_stream_type_t stream,

                                      int indexMin,

                                      int indexMax);

include/media/IAudioPolicyService.h

+6 −3
Original line number Diff line number Diff line
@@ -75,9 +75,12 @@ public: 
                                    audio_channel_mask_t channelMask,

                                    int audioSession,

                                    audio_input_flags_t flags) = 0;

    virtual status_t startInput(audio_io_handle_t input) = 0;

    virtual status_t stopInput(audio_io_handle_t input) = 0;

    virtual void releaseInput(audio_io_handle_t input) = 0;

    virtual status_t startInput(audio_io_handle_t input,

                                audio_session_t session) = 0;

    virtual status_t stopInput(audio_io_handle_t input,

                               audio_session_t session) = 0;

    virtual void releaseInput(audio_io_handle_t input,

                              audio_session_t session) = 0;

    virtual status_t initStreamVolume(audio_stream_type_t stream,

                                      int indexMin,

                                      int indexMax) = 0;

media/libmedia/AudioRecord.cpp

+1 −1
Original line number Diff line number Diff line
@@ -572,7 +572,7 @@ status_t AudioRecord::openRecord_l(size_t epoch) 
    }



release:

    AudioSystem::releaseInput(input);

    AudioSystem::releaseInput(input, (audio_session_t)mSessionId);

    if (status == NO_ERROR) {

        status = NO_INIT;

    }

media/libmedia/AudioSystem.cpp

+9 −6
Original line number Diff line number Diff line
@@ -696,25 +696,28 @@ audio_io_handle_t AudioSystem::getInput(audio_source_t inputSource, 
    return aps->getInput(inputSource, samplingRate, format, channelMask, sessionId, flags);

}



status_t AudioSystem::startInput(audio_io_handle_t input)

status_t AudioSystem::startInput(audio_io_handle_t input,

                                 audio_session_t session)

{

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

    if (aps == 0) return PERMISSION_DENIED;

    return aps->startInput(input);

    return aps->startInput(input, session);

}



status_t AudioSystem::stopInput(audio_io_handle_t input)

status_t AudioSystem::stopInput(audio_io_handle_t input,

                                audio_session_t session)

{

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

    if (aps == 0) return PERMISSION_DENIED;

    return aps->stopInput(input);

    return aps->stopInput(input, session);

}



void AudioSystem::releaseInput(audio_io_handle_t input)

void AudioSystem::releaseInput(audio_io_handle_t input,

                               audio_session_t session)

{

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

    if (aps == 0) return;

    aps->releaseInput(input);

    aps->releaseInput(input, session);

}



status_t AudioSystem::initStreamVolume(audio_stream_type_t stream,

media/libmedia/IAudioPolicyService.cpp

+15 −6
Original line number Diff line number Diff line
@@ -240,29 +240,35 @@ public: 
        return static_cast <audio_io_handle_t> (reply.readInt32());

    }



    virtual status_t startInput(audio_io_handle_t input)

    virtual status_t startInput(audio_io_handle_t input,

                                audio_session_t session)

    {

        Parcel data, reply;

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

        data.writeInt32(input);

        data.writeInt32(session);

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

        return static_cast <status_t> (reply.readInt32());

    }



    virtual status_t stopInput(audio_io_handle_t input)

    virtual status_t stopInput(audio_io_handle_t input,

                               audio_session_t session)

    {

        Parcel data, reply;

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

        data.writeInt32(input);

        data.writeInt32(session);

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

        return static_cast <status_t> (reply.readInt32());

    }



    virtual void releaseInput(audio_io_handle_t input)

    virtual void releaseInput(audio_io_handle_t input,

                              audio_session_t session)

    {

        Parcel data, reply;

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

        data.writeInt32(input);

        data.writeInt32(session);

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

    }
@@ -723,21 +729,24 @@ status_t BnAudioPolicyService::onTransact( 
        case START_INPUT: {

            CHECK_INTERFACE(IAudioPolicyService, data, reply);

            audio_io_handle_t input = static_cast <audio_io_handle_t>(data.readInt32());

            reply->writeInt32(static_cast <uint32_t>(startInput(input)));

            audio_session_t session = static_cast <audio_session_t>(data.readInt32());

            reply->writeInt32(static_cast <uint32_t>(startInput(input, session)));

            return NO_ERROR;

        } break;



        case STOP_INPUT: {

            CHECK_INTERFACE(IAudioPolicyService, data, reply);

            audio_io_handle_t input = static_cast <audio_io_handle_t>(data.readInt32());

            reply->writeInt32(static_cast <uint32_t>(stopInput(input)));

            audio_session_t session = static_cast <audio_session_t>(data.readInt32());

            reply->writeInt32(static_cast <uint32_t>(stopInput(input, session)));

            return NO_ERROR;

        } break;



        case RELEASE_INPUT: {

            CHECK_INTERFACE(IAudioPolicyService, data, reply);

            audio_io_handle_t input = static_cast <audio_io_handle_t>(data.readInt32());

            releaseInput(input);

            audio_session_t session = static_cast <audio_session_t>(data.readInt32());

            releaseInput(input, session);

            return NO_ERROR;

        } break;