Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 10:44:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

omx vts: update language to comply with Android's inclusive language guidance

Browse Source 
See https://source.android.com/setup/contribute/respectful-code for reference

BUG=161896447

Change-Id: I0ced401233497bbbfce90e9b84147bb08399e421
This commit is contained in:
Lajos Molnar
2020-07-29 13:35:36 -07:00
parent 3836d5584a
commit 237e3d7ffc
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
media/omx/1.0/vts/functional/common/media_hidl_test_common.cpp
View File

@@ -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) {

4
media/omx/1.0/vts/functional/common/media_hidl_test_common.h
View File

@@ -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",

18
media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoEncTest.cpp
View File

@@ -289,11 +289,11 @@ struct CodecProducerListener : public IProducerListener {
};
// Mock IOmxBufferSource class. GraphicBufferSource.cpp in libstagefright/omx/
// implements this class. Below is dummy class introduced to test if callback
// implements this class. Below class is introduced to test if callback
// functions are actually being called or not
struct DummyBufferSource : public IOmxBufferSource {
struct MockBufferSource : public IOmxBufferSource {
public:
DummyBufferSource(sp<IOmxNode> node) {
MockBufferSource(sp<IOmxNode> node) {
callback = 0;
executing = false;
omxNode = node;
@@ -311,7 +311,7 @@ struct DummyBufferSource : public IOmxBufferSource {
android::Vector<BufferInfo> iBuffer, oBuffer;
};
Return<void> DummyBufferSource::onOmxExecuting() {
Return<void> MockBufferSource::onOmxExecuting() {
executing = true;
callback |= 0x1;
size_t index;
@@ -332,25 +332,25 @@ Return<void> DummyBufferSource::onOmxExecuting() {
return Void();
};
Return<void> DummyBufferSource::onOmxIdle() {
Return<void> MockBufferSource::onOmxIdle() {
callback |= 0x2;
executing = false;
return Void();
};
Return<void> DummyBufferSource::onOmxLoaded() {
Return<void> MockBufferSource::onOmxLoaded() {
callback |= 0x4;
return Void();
};
Return<void> DummyBufferSource::onInputBufferAdded(uint32_t buffer) {
Return<void> MockBufferSource::onInputBufferAdded(uint32_t buffer) {
(void)buffer;
EXPECT_EQ(executing, false);
callback |= 0x8;
return Void();
};
Return<void> DummyBufferSource::onInputBufferEmptied(
Return<void> MockBufferSource::onInputBufferEmptied(
uint32_t buffer, const ::android::hardware::hidl_handle& fence) {
(void)fence;
callback |= 0x10;
@@ -1143,7 +1143,7 @@ TEST_P(VideoEncHidlTest, BufferSourceCallBacks) {
setupRAWPort(omxNode, kPortIndexInput, nFrameWidth, nFrameHeight, 0,
xFramerate, eColorFormat);
sp<DummyBufferSource> buffersource = new DummyBufferSource(omxNode);
sp<MockBufferSource> buffersource = new MockBufferSource(omxNode);
ASSERT_NE(buffersource, nullptr);
status = omxNode->setInputSurface(buffersource);
ASSERT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK);