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

Commit 092b4647 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 4793185 from c2d0641b to pi-release 

Change-Id: Ibc79fccf7b984506cfbd52d554977a26d8dbcba4
parents f258d4f2 c2d0641b

media/libaudioclient/include/media/AudioParameter.h

+5 −0
Original line number Diff line number Diff line
@@ -81,6 +81,11 @@ public: 


    static const char * const valueListSeparator;



    // keyReconfigA2dp: Ask HwModule to reconfigure A2DP offloaded codec

    // keyReconfigA2dpSupported: Query if HwModule supports A2DP offload codec config

    static const char * const keyReconfigA2dp;

    static const char * const keyReconfigA2dpSupported;



    String8 toString() const { return toStringImpl(true); }

    String8 keysToString() const { return toStringImpl(false); }

media/libeffects/config/Android.bp

+1 −1
Original line number Diff line number Diff line 
// Effect configuration

cc_library_shared {

cc_library {

    name: "libeffectsconfig",

    vendor_available: true,

media/libmedia/AudioParameter.cpp

+2 −0
Original line number Diff line number Diff line
@@ -47,6 +47,8 @@ const char * const AudioParameter::keyStreamSupportedSamplingRates = 
const char * const AudioParameter::valueOn = AUDIO_PARAMETER_VALUE_ON;

const char * const AudioParameter::valueOff = AUDIO_PARAMETER_VALUE_OFF;

const char * const AudioParameter::valueListSeparator = AUDIO_PARAMETER_VALUE_LIST_SEPARATOR;

const char * const AudioParameter::keyReconfigA2dp = AUDIO_PARAMETER_RECONFIG_A2DP;

const char * const AudioParameter::keyReconfigA2dpSupported = AUDIO_PARAMETER_A2DP_RECONFIG_SUPPORTED;



AudioParameter::AudioParameter(const String8& keyValuePairs)

{

media/libmediaplayerservice/nuplayer/NuPlayer.cpp

+32 −9
Original line number Diff line number Diff line
@@ -1447,6 +1447,29 @@ void NuPlayer::onMessageReceived(const sp<AMessage> &msg) { 
            break;

        }



        case kWhatGetStats:

        {

            ALOGV("kWhatGetStats");



            Vector<sp<AMessage>> *trackStats;

            CHECK(msg->findPointer("trackstats", (void**)&trackStats));



            trackStats->clear();

            if (mVideoDecoder != NULL) {

                trackStats->push_back(mVideoDecoder->getStats());

            }

            if (mAudioDecoder != NULL) {

                trackStats->push_back(mAudioDecoder->getStats());

            }



            // respond for synchronization

            sp<AMessage> response = new AMessage;

            sp<AReplyToken> replyID;

            CHECK(msg->senderAwaitsResponse(&replyID));

            response->postReply(replyID);

            break;

        }



        default:

            TRESPASS();

            break;
@@ -2210,16 +2233,16 @@ status_t NuPlayer::getCurrentPosition(int64_t *mediaUs) { 
    return renderer->getCurrentPosition(mediaUs);

}



void NuPlayer::getStats(Vector<sp<AMessage> > *mTrackStats) {

    CHECK(mTrackStats != NULL);

void NuPlayer::getStats(Vector<sp<AMessage> > *trackStats) {

    CHECK(trackStats != NULL);



    mTrackStats->clear();

    if (mVideoDecoder != NULL) {

        mTrackStats->push_back(mVideoDecoder->getStats());

    }

    if (mAudioDecoder != NULL) {

        mTrackStats->push_back(mAudioDecoder->getStats());

    }

    ALOGV("NuPlayer::getStats()");

    sp<AMessage> msg = new AMessage(kWhatGetStats, this);

    msg->setPointer("trackstats", trackStats);



    sp<AMessage> response;

    (void) msg->postAndAwaitResponse(&response);

    // response is for synchronization, ignore contents

}



sp<MetaData> NuPlayer::getFileMeta() {

media/libmediaplayerservice/nuplayer/NuPlayer.h

+2 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ struct NuPlayer : public AHandler { 
    status_t getSelectedTrack(int32_t type, Parcel* reply) const;

    status_t selectTrack(size_t trackIndex, bool select, int64_t timeUs);

    status_t getCurrentPosition(int64_t *mediaUs);

    void getStats(Vector<sp<AMessage> > *mTrackStats);

    void getStats(Vector<sp<AMessage> > *trackStats);



    sp<MetaData> getFileMeta();

    float getFrameRate();
@@ -159,6 +159,7 @@ private: 
        kWhatPrepareDrm                 = 'pDrm',

        kWhatReleaseDrm                 = 'rDrm',

        kWhatMediaClockNotify           = 'mckN',

        kWhatGetStats                   = 'gSts',

    };



    wp<NuPlayerDriver> mDriver;