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

Commit a70eef73 authored by Dean Wheatley's avatar Dean Wheatley Committed by Mikhail Naganov
Browse files

Audio presentation selection for AudioTrack native 



Bug: 63901775
Test: make
Change-Id: I63c9bdef880c7c387fd05f093b8d1094307a2754
Signed-off-by: default avatarPrevir Rangroo <prang@dolby.com>
parent 9ee64f13

media/libaudioclient/AudioTrack.cpp

+12 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include <utils/Log.h>

#include <private/media/AudioTrackShared.h>

#include <media/IAudioFlinger.h>

#include <media/AudioParameter.h>

#include <media/AudioPolicyHelper.h>

#include <media/AudioResamplerPublic.h>

#include <media/MediaAnalyticsItem.h>
@@ -2342,6 +2343,17 @@ status_t AudioTrack::setParameters(const String8& keyValuePairs) 
    return mAudioTrack->setParameters(keyValuePairs);

}



status_t AudioTrack::selectPresentation(int presentationId, int programId)

{

    AutoMutex lock(mLock);

    AudioParameter param = AudioParameter();

    param.addInt(String8(AudioParameter::keyPresentationId), presentationId);

    param.addInt(String8(AudioParameter::keyProgramId), programId);

    ALOGV("PresentationId/ProgramId[%s]",param.toString().string());



    return mAudioTrack->setParameters(param.toString());

}



VolumeShaper::Status AudioTrack::applyVolumeShaper(

        const sp<VolumeShaper::Configuration>& configuration,

        const sp<VolumeShaper::Operation>& operation)

media/libaudioclient/include/media/AudioParameter.h

+6 −0
Original line number Diff line number Diff line
@@ -58,6 +58,12 @@ public: 
    static const char * const keyMonoOutput;

    static const char * const keyStreamHwAvSync;



    //  keys for presentation selection

    //  keyPresentationId: Audio presentation identifier

    //  keyProgramId: Audio presentation program identifier

    static const char * const keyPresentationId;

    static const char * const keyProgramId;



    //  keyStreamConnect / Disconnect: value is an int in audio_devices_t

    static const char * const keyStreamConnect;

    static const char * const keyStreamDisconnect;

media/libaudioclient/include/media/AudioTrack.h

+3 −0
Original line number Diff line number Diff line
@@ -760,6 +760,9 @@ public: 
    /* Gets the volume shaper state */

            sp<media::VolumeShaper::State> getVolumeShaperState(int id);



    /* Selects the presentation (if available) */

            status_t    selectPresentation(int presentationId, int programId);



    /* Get parameters */

            String8     getParameters(const String8& keys);

media/libmedia/AudioParameter.cpp

+2 −0
Original line number Diff line number Diff line
@@ -34,6 +34,8 @@ const char * const AudioParameter::keyInputSource = AUDIO_PARAMETER_STREAM_INPUT 
const char * const AudioParameter::keyScreenState = AUDIO_PARAMETER_KEY_SCREEN_STATE;

const char * const AudioParameter::keyBtNrec = AUDIO_PARAMETER_KEY_BT_NREC;

const char * const AudioParameter::keyHwAvSync = AUDIO_PARAMETER_HW_AV_SYNC;

const char * const AudioParameter::keyPresentationId = AUDIO_PARAMETER_STREAM_PRESENTATION_ID;

const char * const AudioParameter::keyProgramId = AUDIO_PARAMETER_STREAM_PROGRAM_ID;

const char * const AudioParameter::keyMonoOutput = AUDIO_PARAMETER_MONO_OUTPUT;

const char * const AudioParameter::keyStreamHwAvSync = AUDIO_PARAMETER_STREAM_HW_AV_SYNC;

const char * const AudioParameter::keyStreamConnect = AUDIO_PARAMETER_DEVICE_CONNECT;