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

Commit 57a08c15 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6586393 from 19d51164 to rvc-release 

Change-Id: If84e7847784cf83d3fb726804a2ea312a71fde20
parents 8f5bea3f 19d51164

media/codec2/sfplugin/CCodecBufferChannel.cpp

+6 −5
Original line number Diff line number Diff line
@@ -618,13 +618,14 @@ void CCodecBufferChannel::feedInputBufferIfAvailable() { 
}



void CCodecBufferChannel::feedInputBufferIfAvailableInternal() {

    if (mInputMetEos ||

           mOutput.lock()->buffers->hasPending() ||

           mPipelineWatcher.lock()->pipelineFull()) {

    if (mInputMetEos || mPipelineWatcher.lock()->pipelineFull()) {

        return;

    } else {

    }

    {

        Mutexed<Output>::Locked output(mOutput);

        if (!output->buffers || output->buffers->numClientBuffers() >= output->numSlots) {

        if (!output->buffers ||

                output->buffers->hasPending() ||

                output->buffers->numClientBuffers() >= output->numSlots) {

            return;

        }

    }

media/libaudioclient/AudioRecord.cpp

+2 −6
Original line number Diff line number Diff line
@@ -742,8 +742,6 @@ status_t AudioRecord::createRecord_l(const Modulo<uint32_t> &epoch, const String 
    void *iMemPointer;

    audio_track_cblk_t* cblk;

    status_t status;

    std::string flagsAsString;

    std::string originalFlagsAsString;



    if (audioFlinger == 0) {

        ALOGE("%s(%d): Could not get audioflinger", __func__, mPortId);
@@ -922,15 +920,13 @@ status_t AudioRecord::createRecord_l(const Modulo<uint32_t> &epoch, const String 
    mDeathNotifier = new DeathNotifier(this);

    IInterface::asBinder(mAudioRecord)->linkToDeath(mDeathNotifier, this);



    InputFlagConverter::toString(mFlags, flagsAsString);

    InputFlagConverter::toString(mOrigFlags, originalFlagsAsString);

    mMetricsId = std::string(AMEDIAMETRICS_KEY_PREFIX_AUDIO_RECORD) + std::to_string(mPortId);

    mediametrics::LogItem(mMetricsId)

        .set(AMEDIAMETRICS_PROP_EVENT, AMEDIAMETRICS_PROP_EVENT_VALUE_CREATE)

        .set(AMEDIAMETRICS_PROP_EXECUTIONTIMENS, (int64_t)(systemTime() - beginNs))

        // the following are immutable (at least until restore)

        .set(AMEDIAMETRICS_PROP_FLAGS, flagsAsString.c_str())

        .set(AMEDIAMETRICS_PROP_ORIGINALFLAGS, originalFlagsAsString.c_str())

        .set(AMEDIAMETRICS_PROP_FLAGS, toString(mFlags).c_str())

        .set(AMEDIAMETRICS_PROP_ORIGINALFLAGS, toString(mOrigFlags).c_str())

        .set(AMEDIAMETRICS_PROP_SESSIONID, (int32_t)mSessionId)

        .set(AMEDIAMETRICS_PROP_TRACKID, mPortId)

        .set(AMEDIAMETRICS_PROP_SOURCE, toString(mAttributes.source).c_str())

media/libaudioclient/AudioTrack.cpp

+2 −6
Original line number Diff line number Diff line
@@ -1713,16 +1713,12 @@ status_t AudioTrack::createTrack_l() 
    // is the first log of the AudioTrack and must be present before

    // any AudioTrack client logs will be accepted.



    std::string flagsAsString;

    OutputFlagConverter::toString(mFlags, flagsAsString);

    std::string originalFlagsAsString;

    OutputFlagConverter::toString(mOrigFlags, originalFlagsAsString);

    mMetricsId = std::string(AMEDIAMETRICS_KEY_PREFIX_AUDIO_TRACK) + std::to_string(mPortId);

    mediametrics::LogItem(mMetricsId)

        .set(AMEDIAMETRICS_PROP_EVENT, AMEDIAMETRICS_PROP_EVENT_VALUE_CREATE)

        // the following are immutable

        .set(AMEDIAMETRICS_PROP_FLAGS, flagsAsString.c_str())

        .set(AMEDIAMETRICS_PROP_ORIGINALFLAGS, originalFlagsAsString.c_str())

        .set(AMEDIAMETRICS_PROP_FLAGS, toString(mFlags).c_str())

        .set(AMEDIAMETRICS_PROP_ORIGINALFLAGS, toString(mOrigFlags).c_str())

        .set(AMEDIAMETRICS_PROP_SESSIONID, (int32_t)mSessionId)

        .set(AMEDIAMETRICS_PROP_TRACKID, mPortId) // dup from key

        .set(AMEDIAMETRICS_PROP_CONTENTTYPE, toString(mAttributes.content_type).c_str())

media/libmediametrics/include/MediaMetricsConstants.h

+1 −0
Original line number Diff line number Diff line
@@ -147,6 +147,7 @@ 
#define AMEDIAMETRICS_PROP_THREADID       "threadId"       // int32 value io handle

#define AMEDIAMETRICS_PROP_THROTTLEMS     "throttleMs"     // double

#define AMEDIAMETRICS_PROP_TRACKID        "trackId"        // int32 port id of track/record

#define AMEDIAMETRICS_PROP_TRAITS         "traits"         // string

#define AMEDIAMETRICS_PROP_TYPE           "type"           // string (thread type)

#define AMEDIAMETRICS_PROP_UNDERRUN       "underrun"       // int32

#define AMEDIAMETRICS_PROP_UNDERRUNFRAMES "underrunFrames" // int64_t from Thread

services/audioflinger/TrackMetrics.h

+3 −1
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ public: 
    }



    void logConstructor(pid_t creatorPid, uid_t creatorUid,

            const std::string& traits = {},

            audio_stream_type_t streamType = AUDIO_STREAM_DEFAULT) const {

        // Once this item is logged by the server, the client can add properties.

        // no lock required, all local or const variables.
@@ -76,7 +77,8 @@ public: 
            .setUid(creatorUid)

            .set(AMEDIAMETRICS_PROP_ALLOWUID, (int32_t)creatorUid)

            .set(AMEDIAMETRICS_PROP_EVENT,

                    AMEDIAMETRICS_PROP_PREFIX_SERVER AMEDIAMETRICS_PROP_EVENT_VALUE_CTOR);

                    AMEDIAMETRICS_PROP_PREFIX_SERVER AMEDIAMETRICS_PROP_EVENT_VALUE_CTOR)

            .set(AMEDIAMETRICS_PROP_TRAITS, traits);

        // log streamType from the service, since client doesn't know chosen streamType.

        if (streamType != AUDIO_STREAM_DEFAULT) {

            item.set(AMEDIAMETRICS_PROP_STREAMTYPE, toString(streamType).c_str());