encapp: Update proto def

Break out Parameter from sub messages Signed-off-by: JohanBlome <[email protected]>
JohanBlome · Jul 19, 2024 · 8e1f8d0 · 8e1f8d0
1 parent 502471b
commit 8e1f8d0
Show file tree

Hide file tree

Showing 8 changed files with 167 additions and 470 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -9,7 +9,7 @@ android {
         minSdkVersion 27
         targetSdkVersion 31
         versionCode 1
-        versionName "1.14"
+        versionName "1.15"
         setProperty("archivesBaseName", applicationId + "-v" + versionName)
     }
     buildTypes {

diff --git a/app/releases/com.facebook.encapp-v1.15-debug.apk b/app/releases/com.facebook.encapp-v1.15-debug.apk
diff --git a/app/src/main/java/com/facebook/encapp/Encoder.java b/app/src/main/java/com/facebook/encapp/Encoder.java
@@ -19,6 +19,7 @@
 
 import com.facebook.encapp.proto.Configure;
 import com.facebook.encapp.proto.DataValueType;
+import com.facebook.encapp.proto.Parameter;
 import com.facebook.encapp.proto.Runtime;
 import com.facebook.encapp.proto.Test;
 import com.facebook.encapp.utils.Assert;
@@ -278,8 +279,8 @@ protected Test setCodecNameAndIdentifier(Test test) throws Exception {
     }
 
     protected void setConfigureParams(Test test, MediaFormat format) {
-        List<Configure.Parameter> params = test.getConfigure().getParameterList();
-        for (Configure.Parameter param : params) {
+        List<Parameter> params = test.getConfigure().getParameterList();
+        for (Parameter param : params) {
             switch (param.getType().getNumber()) {
                 case DataValueType.stringType_VALUE:
                     format.setString(param.getKey(), param.getValue());
@@ -345,7 +346,7 @@ public void setRuntimeParameters(int frame) {
             }
         }
 
-        for (Runtime.Parameter param : mRuntimeParams.getParameterList()) {
+        for (Parameter param : mRuntimeParams.getParameterList()) {
             if (param.getFramenum() == frame) {
                 Log.d(TAG, "Set runtime parameter @ " + frame + " key: " + param.getKey() + ", " + param.getType() + ", " + param.getValue());
                 switch (param.getType().getNumber()) {

diff --git a/app/src/main/java/com/facebook/encapp/SurfaceTranscoder.java b/app/src/main/java/com/facebook/encapp/SurfaceTranscoder.java
@@ -17,6 +17,7 @@
 
 import com.facebook.encapp.proto.DataValueType;
 import com.facebook.encapp.proto.DecoderRuntime;
+import com.facebook.encapp.proto.Parameter;
 import com.facebook.encapp.proto.Test;
 import com.facebook.encapp.utils.FileReader;
 import com.facebook.encapp.utils.FrameInfo;
@@ -309,7 +310,7 @@ public void setDecoderRuntimeParameters(Test mTest, int frame) {
         if (mDecoderRuntimeParams == null) return;
         Bundle bundle = new Bundle();
 
-        for (DecoderRuntime.Parameter param : mDecoderRuntimeParams.getParameterList()) {
+        for (Parameter param : mDecoderRuntimeParams.getParameterList()) {
             if (param.getFramenum() == frame) {
                 switch (param.getType().getNumber()) {
                     case DataValueType.floatType_VALUE:

diff --git a/app/src/main/java/com/facebook/encapp/utils/TestDefinitionHelper.java b/app/src/main/java/com/facebook/encapp/utils/TestDefinitionHelper.java
@@ -9,6 +9,7 @@
 import com.facebook.encapp.proto.DataValueType;
 import com.facebook.encapp.proto.DecoderConfigure;
 import com.facebook.encapp.proto.Input;
+import com.facebook.encapp.proto.Parameter;
 import com.facebook.encapp.proto.PixFmt;
 import com.facebook.encapp.proto.Test;
 import com.facebook.encapp.utils.MediaCodecInfoHelper;
@@ -85,7 +86,7 @@ public static MediaFormat buildMediaFormat(Test test) {
         }
 
         // set all the available values
-        for (Configure.Parameter param : config.getParameterList()) {
+        for (Parameter param : config.getParameterList()) {
             switch (param.getType().getNumber()) {
                 case DataValueType.floatType_VALUE:
                     float fval = Float.parseFloat(param.getValue());
@@ -222,9 +223,9 @@ public static Test updateBasicSettings(Test test) {
     public static void setDecoderConfigureParams(Test mTest, MediaFormat format) {
         DecoderConfigure config = mTest.getDecoderConfigure();
 
-        List<DecoderConfigure.Parameter> params = config.getParameterList();
+        List<Parameter> params = config.getParameterList();
         Log.d(TAG, "Set decoder config: " + params);
-        for (DecoderConfigure.Parameter param : params) {
+        for (Parameter param : params) {
             switch (param.getType().getNumber()) {
                 case DataValueType.intType_VALUE:
                     format.setInteger(param.getKey(), Integer.parseInt(param.getValue()));