commit 6a3a302b3eca5cb4d3d8ef1e3da39f147cead664
author Aaron Huang <huangaaron@google.com> Fri Apr 29 17:33:01 2022 +0800
committer Aaron Huang <huangaaron@google.com> Tue Jun 07 00:42:49 2022 +0800
tree 47749f314f81ba4eb81f6cd15f57987065ea43fd
parent 39f0a4d7009ce2cc253772b9fc0166f6e7e7ab67

Update language to comply with Android's inclusive language guidance

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

Test: m
Bug: 162536543
Change-Id: I6ca839c085a5e7c944670dea6ee7ea0e9c41e3c9

media/libstagefright/Utils.cpp

diff --git a/media/libstagefright/Utils.cpp b/media/libstagefright/Utils.cpp
index a443ed9..900ac32 100644
--- a/media/libstagefright/Utils.cpp
+++ b/media/libstagefright/Utils.cpp
@@ -1911,10 +1911,10 @@
         if (msg->findString("ts-schema", &tsSchema)) {
             unsigned int numLayers = 0;
             unsigned int numBLayers = 0;
-            char dummy;
+            char placeholder;
             int tags = sscanf(tsSchema.c_str(), "android.generic.%u%c%u%c",
-                    &numLayers, &dummy, &numBLayers, &dummy);
-            if ((tags == 1 || (tags == 3 && dummy == '+'))
+                    &numLayers, &placeholder, &numBLayers, &placeholder);
+            if ((tags == 1 || (tags == 3 && placeholder == '+'))
                     && numLayers > 0 && numLayers < UINT32_MAX - numBLayers
                     && numLayers + numBLayers <= INT32_MAX) {
                 meta->setInt32(kKeyTemporalLayerCount, numLayers + numBLayers);