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

Commit 87b380d9 authored by Santiago Seifert's avatar Santiago Seifert
Browse files

Pass MediaParser metrics to statsd 

Also include MediaParser JNI in the Media mainline module.

Bug: 158742256
Test: atest CtsMediaParserTestCases
Change-Id: I4db82cb4b003bd6456862a12fe7882e25687f8e4
Merged-In: I4db82cb4b003bd6456862a12fe7882e25687f8e4
parent 0cf52d3b

apex/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -31,6 +31,8 @@ apex_defaults { 
                "libmpeg2extractor",

                "liboggextractor",

                "libwavextractor",

                // JNI

                "libmediaparser-jni"

            ],

        },

    },

services/mediametrics/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -131,6 +131,7 @@ cc_library_shared { 
        "statsd_codec.cpp",

        "statsd_drm.cpp",

        "statsd_extractor.cpp",

        "statsd_mediaparser.cpp",

        "statsd_nuplayer.cpp",

        "statsd_recorder.cpp",

        "StringUtils.cpp"

services/mediametrics/iface_statsd.cpp

+1 −0
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ static constexpr struct statsd_hooks statsd_handlers[] = 
    { "drmmanager", statsd_drmmanager },

    { "extractor", statsd_extractor },

    { "mediadrm", statsd_mediadrm },

    { "mediaparser", statsd_mediaparser },

    { "nuplayer", statsd_nuplayer },

    { "nuplayer2", statsd_nuplayer },

    { "recorder", statsd_recorder },

services/mediametrics/iface_statsd.h

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ extern bool statsd_audiothread(const mediametrics::Item *); 
extern bool statsd_audiotrack(const mediametrics::Item *);

extern bool statsd_codec(const mediametrics::Item *);

extern bool statsd_extractor(const mediametrics::Item *);

extern bool statsd_mediaparser(const mediametrics::Item *);

extern bool statsd_nuplayer(const mediametrics::Item *);

extern bool statsd_recorder(const mediametrics::Item *);

services/mediametrics/statsd_mediaparser.cpp

0 → 100644
+106 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2020 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#define LOG_TAG "statsd_mediaparser"

#include <utils/Log.h>



#include <dirent.h>

#include <inttypes.h>

#include <pthread.h>

#include <pwd.h>

#include <stdint.h>

#include <string.h>

#include <sys/stat.h>

#include <sys/time.h>

#include <sys/types.h>

#include <unistd.h>



#include <statslog.h>



#include "MediaMetricsService.h"

#include "frameworks/base/core/proto/android/stats/mediametrics/mediametrics.pb.h"

#include "iface_statsd.h"



namespace android {



bool statsd_mediaparser(const mediametrics::Item *item)

{

    if (item == nullptr) {

        return false;

    }



    // statsd wrapper data.

    const nsecs_t timestamp = MediaMetricsService::roundTime(item->getTimestamp());

    std::string pkgName = item->getPkgName();

    int64_t pkgVersionCode = item->getPkgVersionCode();



    std::string parserName;

    item->getString("android.media.mediaparser.parserName", &parserName);



    int32_t createdByName = -1;

    item->getInt32("android.media.mediaparser.createdByName", &createdByName);



    std::string parserPool;

    item->getString("android.media.mediaparser.parserPool", &parserPool);



    std::string lastException;

    item->getString("android.media.mediaparser.lastException", &lastException);



    int64_t resourceByteCount = -1;

    item->getInt64("android.media.mediaparser.resourceByteCount", &resourceByteCount);



    int64_t durationMillis = -1;

    item->getInt64("android.media.mediaparser.durationMillis", &durationMillis);



    std::string trackMimeTypes;

    item->getString("android.media.mediaparser.trackMimeTypes", &trackMimeTypes);



    std::string trackCodecs;

    item->getString("android.media.mediaparser.trackCodecs", &trackCodecs);



    std::string alteredParameters;

    item->getString("android.media.mediaparser.alteredParameters", &alteredParameters);



    int32_t videoWidth = -1;

    item->getInt32("android.media.mediaparser.videoWidth", &videoWidth);



    int32_t videoHeight = -1;

    item->getInt32("android.media.mediaparser.videoHeight", &videoHeight);



    if (enabled_statsd) {

        (void) android::util::stats_write(android::util::MEDIAMETRICS_MEDIAPARSER_REPORTED,

                                   timestamp,

                                   pkgName.c_str(),

                                   pkgVersionCode,

                                   parserName.c_str(),

                                   createdByName,

                                   parserPool.c_str(),

                                   lastException.c_str(),

                                   resourceByteCount,

                                   durationMillis,

                                   trackMimeTypes.c_str(),

                                   trackCodecs.c_str(),

                                   alteredParameters.c_str(),

                                   videoWidth,

                                   videoHeight);

    } else {

        ALOGV("NOT sending MediaParser media metrics.");

    }



    return true;

}



} // namespace android