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

Commit a9f74717 authored by Lajos Molnar's avatar Lajos Molnar Committed by Gerrit Code Review
Browse files

Merge changes I0ced4012,I9b1f8ed9,Iba2a7259,I8174b895 

* changes:
  omx vts: update language to comply with Android's inclusive language guidance
  omx: rename master to store
  OMX VTS: Use GetComponentRole from OMXUtils
  Convert Python OMX VTS test to Gtest
parents 0aa2a2f3 237e3d7f

media/omx/1.0/vts/functional/README.md

+4 −4
Original line number Diff line number Diff line 
## Omx Hal @ 1.0 tests ##

---

## Overview :

The scope of the tests presented here is not restricted solely to testing omx hal @ 1.0 API but also test to omx core functionality and to an extent omx components as well. The current directory contains the following folders: audio, common, component, master and video. Besides common all other folders contain test fixtures for testing AV decoder, encoder components. Common constitutes files that are used across by these test applications.

The scope of the tests presented here is not restricted solely to testing omx hal @ 1.0 API but also test to omx core functionality and to an extent omx components as well. The current directory contains the following folders: audio, common, component, store and video. Besides common all other folders contain test fixtures for testing AV decoder, encoder components. Common constitutes files that are used across by these test applications.



#### master :

Functionality of master is to enumerate all the omx components (and the roles it supports) available in android media framework.

#### store :

Functionality of store is to enumerate all the omx components (and the roles it supports) available in android media framework.



usage: atest VtsHalMediaOmxV1\_0TargetMasterTest

usage: atest VtsHalMediaOmxV1\_0TargetStoreTest



#### component :

This folder includes test fixtures that tests aspects common to all omx compatible components. For instance, port enabling/disabling, enumerating port formats, state transitions, flush, ..., stay common to all components irrespective of the service they offer. Test fixtures here are directed towards testing these (omx core). Every standard OMX compatible component is expected to pass these tests.

media/omx/1.0/vts/functional/common/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -74,5 +74,6 @@ cc_defaults { 
    shared_libs: [

        "libnativehelper",

        "libstagefright_foundation",

        "libstagefright_omx_utils",

    ],

}

media/omx/1.0/vts/functional/common/media_hidl_test_common.cpp

+2 −2
Original line number Diff line number Diff line
@@ -785,8 +785,8 @@ const std::vector<std::tuple<std::string, std::string, std::string>>& getTestPar 
        for (IOmx::ComponentInfo info : componentInfos) {

            for (std::string role : info.mRoles) {

                if (filter.empty()) {

                    if (kWhiteListRoles.find(role.c_str()) == kWhiteListRoles.end()) {

                        // This is for component test and the role is not in the white list.

                    if (kKnownRoles.find(role.c_str()) == kKnownRoles.end()) {

                        // This is for component test and the role is not supported.

                        continue;

                    }

                } else if (role.find(filter) == std::string::npos) {

media/omx/1.0/vts/functional/common/media_hidl_test_common.h

+2 −2
Original line number Diff line number Diff line
@@ -78,8 +78,8 @@ enum bufferOwner { 
    unknown,

};



// White list audio/video roles to be tested.

static std::set<std::string> kWhiteListRoles{

// List known and thus tested audio/video roles.

static std::set<std::string> kKnownRoles{

        "audio_encoder.aac",      "audio_encoder.amrnb", "audio_encoder.amrwb",

        "audio_encoder.flac",     "audio_decoder.aac",   "audio_decoder.amrnb",

        "audio_decoder.amrwb",    "audio_decoder.flac",  "audio_decoder.g711alaw",

media/omx/1.0/vts/functional/master/Android.bp→media/omx/1.0/vts/functional/store/Android.bp

+3 −2
Original line number Diff line number Diff line
@@ -15,10 +15,11 @@ 
//



cc_test {

    name: "VtsHalMediaOmxV1_0TargetMasterTest",

    name: "VtsHalMediaOmxV1_0TargetStoreTest",

    defaults: ["VtsHalMediaOmxV1_0Defaults"],

    srcs: ["VtsHalMediaOmxV1_0TargetMasterTest.cpp"],

    srcs: ["VtsHalMediaOmxV1_0TargetStoreTest.cpp"],

    test_suites: [

        "general-tests",

        "vts",

    ],

}