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

Commit ddac24fe authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Promotion of av-aosp.lnx.2.0-00015. 

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
1064299   Ic8e03d40d60af13d98badb14a8e8d37dab38c001   MediaPlayerService: Fix binder dereference while connect
1071845   Ibf099732f89eec35efeb6ca9cbf55a0d070f6173   APM: Avoid invalidation of music stream if not required.
1077377   I697abbe33c5adbcde7ee10a9c74829fafdae934c   audiopolicy: Add support for 384kHz audio playback

Change-Id: If20a20cfdca7861b525a7f22ba5eea72a169ec2f
CRs-Fixed: 1064299, 1077377, 1071845
parents f4657152 03c2663a

media/libmediaplayerservice/MediaPlayerService.cpp

+10 −0
Original line number Diff line number Diff line
@@ -685,10 +685,20 @@ sp<MediaPlayerBase> MediaPlayerService::Client::setDataSource_pre( 


    sp<IServiceManager> sm = defaultServiceManager();

    sp<IBinder> binder = sm->getService(String16("media.extractor"));

    if (binder == NULL) {

        ALOGE("Unable to connect to media extractor service");

        return NULL;

    }



    mExtractorDeathListener = new ServiceDeathNotifier(binder, p, MEDIAEXTRACTOR_PROCESS_DEATH);

    binder->linkToDeath(mExtractorDeathListener);



    binder = sm->getService(String16("media.codec"));

    if (binder == NULL) {

        ALOGE("Unable to connect to media codec service");

        return NULL;

    }



    mCodecDeathListener = new ServiceDeathNotifier(binder, p, MEDIACODEC_PROCESS_DEATH);

    binder->linkToDeath(mCodecDeathListener);

services/audiopolicy/common/include/policy.h

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ static const audio_format_t gDynamicFormat = AUDIO_FORMAT_DEFAULT; 


// For mixed output and inputs, the policy will use max mixer sampling rates.

// Do not limit sampling rate otherwise

#define SAMPLE_RATE_HZ_MAX 192000

#define SAMPLE_RATE_HZ_MAX 384000



// Used when a client opens a capture stream, without specifying a desired sample rate.

#define SAMPLE_RATE_HZ_DEFAULT 48000

services/audiopolicy/managerdefault/AudioPolicyManager.h

+1 −1
Original line number Diff line number Diff line
@@ -382,7 +382,7 @@ protected: 
        // must be called every time a condition that affects the output choice for a given strategy

        // changes: connected device, phone state, force use...

        // Must be called before updateDevicesAndOutputs()

        void checkOutputForStrategy(routing_strategy strategy);

        virtual void checkOutputForStrategy(routing_strategy strategy);



        // Same as checkOutputForStrategy() but for a all strategies in order of priority

        void checkOutputForAllStrategies();