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

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

Snap for 6493843 from 09bb2395 to mainline-release 

Change-Id: I64021598e2af9814e5f627a945c56c4d7d88f842
parents 8eed1397 09bb2395

drm/TEST_MAPPING

0 → 100644
+27 −0
Original line number Diff line number Diff line 
{

  "presubmit": [

    // The following tests validate codec and drm path.

    {

      "name": "GtsMediaTestCases",

      "options" : [

        {

          "include-annotation": "android.platform.test.annotations.Presubmit"

        },

        {

          "include-filter": "com.google.android.media.gts.WidevineGenericOpsTests"

        }

      ]

    },

    {

      "name": "GtsExoPlayerTestCases",

      "options" : [

        {

          "include-annotation": "android.platform.test.annotations.SocPresubmit"

        },

        {

          "include-filter": "com.google.android.exoplayer.gts.DashTest#testWidevine23FpsH264Fixed"

        }

      ]

    }

  ]

}

media/extractors/TEST_MAPPING

0 → 100644
+17 −0
Original line number Diff line number Diff line 
{

  "presubmit": [

    // TODO(b/153661591) enable test once the bug is fixed

    // This tests the extractor path

    // {

    //    "name": "GtsYouTubeTestCases",

    //    "options" : [

    //      {

    //        "include-annotation": "android.platform.test.annotations.Presubmit"

    //      },

    //      {

    //        "include-filter": "com.google.android.youtube.gts.SimultaneousClearAndProtectedDecodeTest#testSimultaneousClearAndProtectedDecode"

    //      }

    //    ]

    //  }

  ]

}

media/libaudioclient/AudioRecord.cpp

+10 −6
Original line number Diff line number Diff line
@@ -405,7 +405,7 @@ status_t AudioRecord::start(AudioSystem::sync_event_t event, audio_session_t tri 
                    ? AMEDIAMETRICS_PROP_CALLERNAME_VALUE_UNKNOWN

                    : mCallerName.c_str())

            .set(AMEDIAMETRICS_PROP_EVENT, AMEDIAMETRICS_PROP_EVENT_VALUE_START)

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

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

            .set(AMEDIAMETRICS_PROP_STATE, stateToString(mActive))

            .set(AMEDIAMETRICS_PROP_STATUS, (int32_t)status)

            .record(); });
@@ -481,7 +481,7 @@ void AudioRecord::stop() 
    mediametrics::Defer defer([&] {

        mediametrics::LogItem(mMetricsId)

            .set(AMEDIAMETRICS_PROP_EVENT, AMEDIAMETRICS_PROP_EVENT_VALUE_STOP)

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

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

            .set(AMEDIAMETRICS_PROP_STATE, stateToString(mActive))

            .record(); });
@@ -742,6 +742,8 @@ 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);
@@ -920,13 +922,15 @@ 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_DURATIONNS, (int64_t)(systemTime() - beginNs))

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

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

        .set(AMEDIAMETRICS_PROP_FLAGS, (int32_t)mFlags)

        .set(AMEDIAMETRICS_PROP_ORIGINALFLAGS, (int32_t)mOrigFlags)

        .set(AMEDIAMETRICS_PROP_FLAGS, flagsAsString.c_str())

        .set(AMEDIAMETRICS_PROP_ORIGINALFLAGS, originalFlagsAsString.c_str())

        .set(AMEDIAMETRICS_PROP_SESSIONID, (int32_t)mSessionId)

        .set(AMEDIAMETRICS_PROP_TRACKID, mPortId)

        .set(AMEDIAMETRICS_PROP_SOURCE, toString(mAttributes.source).c_str())
@@ -1387,7 +1391,7 @@ status_t AudioRecord::restoreRecord_l(const char *from) 
    mediametrics::Defer defer([&] {

        mediametrics::LogItem(mMetricsId)

            .set(AMEDIAMETRICS_PROP_EVENT, AMEDIAMETRICS_PROP_EVENT_VALUE_RESTORE)

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

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

            .set(AMEDIAMETRICS_PROP_STATE, stateToString(mActive))

            .set(AMEDIAMETRICS_PROP_STATUS, (int32_t)result)

            .set(AMEDIAMETRICS_PROP_WHERE, from)

media/libaudioclient/AudioTrack.cpp

+12 −8
Original line number Diff line number Diff line
@@ -650,7 +650,7 @@ status_t AudioTrack::start() 
                    ? AMEDIAMETRICS_PROP_CALLERNAME_VALUE_UNKNOWN

                    : mCallerName.c_str())

            .set(AMEDIAMETRICS_PROP_EVENT, AMEDIAMETRICS_PROP_EVENT_VALUE_START)

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

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

            .set(AMEDIAMETRICS_PROP_STATE, stateToString(mState))

            .set(AMEDIAMETRICS_PROP_STATUS, (int32_t)status)

            .record(); });
@@ -783,7 +783,7 @@ void AudioTrack::stop() 
    mediametrics::Defer defer([&]() {

        mediametrics::LogItem(mMetricsId)

            .set(AMEDIAMETRICS_PROP_EVENT, AMEDIAMETRICS_PROP_EVENT_VALUE_STOP)

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

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

            .set(AMEDIAMETRICS_PROP_STATE, stateToString(mState))

            .record();

        logBufferSizeUnderruns();
@@ -845,7 +845,7 @@ void AudioTrack::flush() 
    mediametrics::Defer defer([&]() {

        mediametrics::LogItem(mMetricsId)

            .set(AMEDIAMETRICS_PROP_EVENT, AMEDIAMETRICS_PROP_EVENT_VALUE_FLUSH)

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

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

            .set(AMEDIAMETRICS_PROP_STATE, stateToString(mState))

            .record(); });
@@ -886,7 +886,7 @@ void AudioTrack::pause() 
    mediametrics::Defer defer([&]() {

        mediametrics::LogItem(mMetricsId)

            .set(AMEDIAMETRICS_PROP_EVENT, AMEDIAMETRICS_PROP_EVENT_VALUE_PAUSE)

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

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

            .set(AMEDIAMETRICS_PROP_STATE, stateToString(mState))

            .record(); });
@@ -1715,15 +1715,19 @@ status_t AudioTrack::createTrack_l() 
    // The creation of the audio track by AudioFlinger (in the code above)

    // 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, (int32_t)mFlags)

        .set(AMEDIAMETRICS_PROP_ORIGINALFLAGS, (int32_t)mOrigFlags)

        .set(AMEDIAMETRICS_PROP_FLAGS, flagsAsString.c_str())

        .set(AMEDIAMETRICS_PROP_ORIGINALFLAGS, originalFlagsAsString.c_str())

        .set(AMEDIAMETRICS_PROP_SESSIONID, (int32_t)mSessionId)

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

        .set(AMEDIAMETRICS_PROP_STREAMTYPE, toString(mStreamType).c_str())

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

        .set(AMEDIAMETRICS_PROP_USAGE, toString(mAttributes.usage).c_str())

        .set(AMEDIAMETRICS_PROP_THREADID, (int32_t)output.outputId)
@@ -2440,7 +2444,7 @@ status_t AudioTrack::restoreTrack_l(const char *from) 
    mediametrics::Defer defer([&] {

        mediametrics::LogItem(mMetricsId)

            .set(AMEDIAMETRICS_PROP_EVENT, AMEDIAMETRICS_PROP_EVENT_VALUE_RESTORE)

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

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

            .set(AMEDIAMETRICS_PROP_STATE, stateToString(mState))

            .set(AMEDIAMETRICS_PROP_STATUS, (int32_t)result)

            .set(AMEDIAMETRICS_PROP_WHERE, from)

media/libmediametrics/include/MediaMetricsConstants.h

+4 −0
Original line number Diff line number Diff line
@@ -37,6 +37,9 @@ 
// They must be appended with another value to make a key.

#define AMEDIAMETRICS_KEY_PREFIX_AUDIO "audio."



// Device related key prefix.

#define AMEDIAMETRICS_KEY_PREFIX_AUDIO_DEVICE  AMEDIAMETRICS_KEY_PREFIX_AUDIO "device."



// The AudioMmap key appends the "trackId" to the prefix.

// This is the AudioFlinger equivalent of the AAudio Stream.

// TODO: unify with AMEDIAMETRICS_KEY_PREFIX_AUDIO_STREAM
@@ -113,6 +116,7 @@ 
#define AMEDIAMETRICS_PROP_DURATIONNS     "durationNs"     // int64 duration time span

#define AMEDIAMETRICS_PROP_ENCODING       "encoding"       // string value of format

#define AMEDIAMETRICS_PROP_EVENT          "event#"         // string value (often func name)

#define AMEDIAMETRICS_PROP_EXECUTIONTIMENS "executionTimeNs"  // time to execute the event



// TODO: fix inconsistency in flags: AudioRecord / AudioTrack int32,  AudioThread string

#define AMEDIAMETRICS_PROP_FLAGS          "flags"