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

Commit 8c7e6dac authored by Eric Laurent's avatar Eric Laurent
Browse files

audio policy: session routes continued. 

- Clear session routes when client process dies.
- Enforce the route only when the requesting session is active.
- Fix requested route not working if an output mix change is required
(e.g forcing to SPEAKER when the default route is USB or A2DP).
- Make sure all sessions sharing the strategy with a rerouted session
have the same route (needed for volume control consistency)

Change-Id: I0ab347a8fb97e73e2c5965374544c5f4fe509ef1
parent f62a067a

include/media/AudioSystem.h

+2 −0
Original line number Diff line number Diff line
@@ -224,6 +224,7 @@ public: 
                                     audio_io_handle_t *output,

                                     audio_session_t session,

                                     audio_stream_type_t *stream,

                                     uid_t uid,

                                     uint32_t samplingRate = 0,

                                     audio_format_t format = AUDIO_FORMAT_DEFAULT,

                                     audio_channel_mask_t channelMask = AUDIO_CHANNEL_OUT_STEREO,
@@ -245,6 +246,7 @@ public: 
    static status_t getInputForAttr(const audio_attributes_t *attr,

                                    audio_io_handle_t *input,

                                    audio_session_t session,

                                    uid_t uid,

                                    uint32_t samplingRate,

                                    audio_format_t format,

                                    audio_channel_mask_t channelMask,

include/media/IAudioPolicyService.h

+2 −0
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ public: 
                                        audio_io_handle_t *output,

                                        audio_session_t session,

                                        audio_stream_type_t *stream,

                                        uid_t uid,

                                        uint32_t samplingRate = 0,

                                        audio_format_t format = AUDIO_FORMAT_DEFAULT,

                                        audio_channel_mask_t channelMask = 0,
@@ -80,6 +81,7 @@ public: 
    virtual status_t  getInputForAttr(const audio_attributes_t *attr,

                              audio_io_handle_t *input,

                              audio_session_t session,

                              uid_t uid,

                              uint32_t samplingRate,

                              audio_format_t format,

                              audio_channel_mask_t channelMask,

media/libmedia/AudioRecord.cpp

+1 −0
Original line number Diff line number Diff line
@@ -478,6 +478,7 @@ status_t AudioRecord::openRecord_l(size_t epoch) 
    audio_io_handle_t input;

    status_t status = AudioSystem::getInputForAttr(&mAttributes, &input,

                                        (audio_session_t)mSessionId,

                                        IPCThreadState::self()->getCallingUid(),

                                        mSampleRate, mFormat, mChannelMask,

                                        mFlags, mSelectedDeviceId);

media/libmedia/AudioSystem.cpp

+4 −2
Original line number Diff line number Diff line
@@ -653,6 +653,7 @@ status_t AudioSystem::getOutputForAttr(const audio_attributes_t *attr, 
                                        audio_io_handle_t *output,

                                        audio_session_t session,

                                        audio_stream_type_t *stream,

                                        uid_t uid,

                                        uint32_t samplingRate,

                                        audio_format_t format,

                                        audio_channel_mask_t channelMask,
@@ -662,7 +663,7 @@ status_t AudioSystem::getOutputForAttr(const audio_attributes_t *attr, 
{

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

    if (aps == 0) return NO_INIT;

    return aps->getOutputForAttr(attr, output, session, stream,

    return aps->getOutputForAttr(attr, output, session, stream, uid,

                                 samplingRate, format, channelMask,

                                 flags, selectedDeviceId, offloadInfo);

}
@@ -697,6 +698,7 @@ void AudioSystem::releaseOutput(audio_io_handle_t output, 
status_t AudioSystem::getInputForAttr(const audio_attributes_t *attr,

                                audio_io_handle_t *input,

                                audio_session_t session,

                                uid_t uid,

                                uint32_t samplingRate,

                                audio_format_t format,

                                audio_channel_mask_t channelMask,
@@ -706,7 +708,7 @@ status_t AudioSystem::getInputForAttr(const audio_attributes_t *attr, 
    const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();

    if (aps == 0) return NO_INIT;

    return aps->getInputForAttr(

            attr, input, session, samplingRate, format, channelMask, flags, selectedDeviceId);

            attr, input, session, uid, samplingRate, format, channelMask, flags, selectedDeviceId);

}



status_t AudioSystem::startInput(audio_io_handle_t input,

media/libmedia/AudioTrack.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1063,7 +1063,7 @@ status_t AudioTrack::createTrack_l() 


    status_t status;

    status = AudioSystem::getOutputForAttr(attr, &output,

                                           (audio_session_t)mSessionId, &streamType,

                                           (audio_session_t)mSessionId, &streamType, mClientUid,

                                           mSampleRate, mFormat, mChannelMask,

                                           mFlags, mSelectedDeviceId, mOffloadInfo);