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

Commit f0c86072 authored by Steve Kondik's avatar Steve Kondik Committed by Gerrit Code Review
Browse files

Merge "libstagefright: Set session id to one for LPA playback" into ics

parents fc561d1d e991a3ae

media/libstagefright/LPAPlayerALSA.cpp

+3 −1
Original line number Original line Diff line number Diff line
@@ -61,6 +61,7 @@ static const char mName[] = "LPAPlayer"; 
#define SIGNAL_EVENT_THREAD 2

#define SIGNAL_EVENT_THREAD 2

#define PCM_FORMAT 2

#define PCM_FORMAT 2

#define NUM_FDS 2

#define NUM_FDS 2

#define LPA_SESSION_ID 1

namespace android {

namespace android {

int LPAPlayer::objectsAlive = 0;

int LPAPlayer::objectsAlive = 0;
@@ -115,6 +116,7 @@ AudioPlayer(audioSink,observer) { 
    a2dpThreadStarted = true;

    a2dpThreadStarted = true;

    asyncReset = false;

    asyncReset = false;





    sessionId = LPA_SESSION_ID;

    bEffectConfigChanged = false;

    bEffectConfigChanged = false;

    initCheck = true;

    initCheck = true;
@@ -378,7 +380,7 @@ status_t LPAPlayer::start(bool sourceAlreadyStarted) { 
    if (!bIsA2DPEnabled) {

    if (!bIsA2DPEnabled) {

        LOGV("Opening a routing session for audio playback: sessionId = %d mSampleRate %d numChannels %d",

        LOGV("Opening a routing session for audio playback: sessionId = %d mSampleRate %d numChannels %d",

             sessionId, mSampleRate, numChannels);

             sessionId, mSampleRate, numChannels);

        status_t err = mAudioSink->openSession(AUDIO_FORMAT_PCM_16_BIT, 1, mSampleRate, numChannels);

        status_t err = mAudioSink->openSession(AUDIO_FORMAT_PCM_16_BIT, sessionId, mSampleRate, numChannels);

        if (err != OK) {

        if (err != OK) {

            if (mFirstBuffer != NULL) {

            if (mFirstBuffer != NULL) {

                mFirstBuffer->release();

                mFirstBuffer->release();