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

Commit 7af30a38 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic "benchmark" 

* changes:
  transcoder: Add startThreadPool to benchmark
  transcoder: Mark benchmark frame rate iteration invariant
  transcoder: Move create callback into benchmark state loop
parents 8c21d774 2d074bad

media/libmediatranscoding/transcoder/benchmark/Android.bp

+8 −1
Original line number Diff line number Diff line 
cc_defaults {

    name: "benchmarkdefaults",

    shared_libs: ["libmediandk", "libbase", "libbinder_ndk", "libutils", "libnativewindow"],

    shared_libs: [

        "libmediandk",

        "libbase",

        "libbinder_ndk",

        "libbinder",

        "libutils",

        "libnativewindow",

    ],

    static_libs: ["libmediatranscoder", "libgoogle-benchmark"],

    test_config_template: "AndroidTestTemplate.xml",

    test_suites: ["device-tests", "TranscoderBenchmarks"],

media/libmediatranscoding/transcoder/benchmark/MediaTranscoderBenchmark.cpp

+5 −3
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
 */



#include <benchmark/benchmark.h>

#include <binder/ProcessState.h>

#include <fcntl.h>

#include <media/MediaTranscoder.h>

#include <iostream>
@@ -113,7 +114,6 @@ static void TranscodeMediaFile(benchmark::State& state, const std::string& srcFi 
    std::string srcPath = kAssetDirectory + srcFileName;

    std::string dstPath = kAssetDirectory + dstFileName;



    auto callbacks = std::make_shared<TranscoderCallbacks>();

    media_status_t status = AMEDIA_OK;



    if ((srcFd = open(srcPath.c_str(), O_RDONLY)) < 0) {
@@ -126,6 +126,7 @@ static void TranscodeMediaFile(benchmark::State& state, const std::string& srcFi 
    }



    for (auto _ : state) {

        auto callbacks = std::make_shared<TranscoderCallbacks>();

        auto transcoder = MediaTranscoder::create(callbacks);



        status = transcoder->configureSource(srcFd);
@@ -154,8 +155,8 @@ static void TranscodeMediaFile(benchmark::State& state, const std::string& srcFi 
            if (strncmp(mime, "video/", 6) == 0) {

                int32_t frameCount;

                if (AMediaFormat_getInt32(srcFormat, AMEDIAFORMAT_KEY_FRAME_COUNT, &frameCount)) {

                    state.counters[PARAM_VIDEO_FRAME_RATE] =

                            benchmark::Counter(frameCount, benchmark::Counter::kIsRate);

                    state.counters[PARAM_VIDEO_FRAME_RATE] = benchmark::Counter(

                            frameCount, benchmark::Counter::kIsIterationInvariantRate);

                }

            }
@@ -390,6 +391,7 @@ void CustomCsvReporter::PrintRunData(const Run& run) { 
}



int main(int argc, char** argv) {

    android::ProcessState::self()->startThreadPool();

    std::unique_ptr<benchmark::BenchmarkReporter> fileReporter;

    for (int i = 1; i < argc; ++i) {

        if (std::string(argv[i]).find("--benchmark_out") != std::string::npos) {