commit d7e3aca7ef23c364041a3e444b8777ba8bc6acd2
author Treehugger Robot <treehugger-gerrit@google.com> Mon Oct 12 23:08:28 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Oct 12 23:08:28 2020 +0000
tree 7a0d9a9d6a281560112ec491307ecf5e54d168ef
parent 5cd45d95e02c442959e1d3d73fe24b48ef1ff300
parent 17574d194f9fec5ac2d5efae66908e4e62b2783a

Merge "codec2: change tunneled settings to tunings" am: 17574d194f

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1455723

Change-Id: I0392ba18bc35f143ccffb3acda28dbb1b45569ad

media/codec2/core/include/C2Config.h

diff --git a/media/codec2/core/include/C2Config.h b/media/codec2/core/include/C2Config.h
index 306c04c..ebe7b40 100644
--- a/media/codec2/core/include/C2Config.h
+++ b/media/codec2/core/include/C2Config.h
@@ -2239,8 +2239,8 @@
 /**
  * Configure tunneled mode
  */
-typedef C2PortParam<C2Setting, C2TunneledModeStruct, kParamIndexTunneledMode>
-        C2PortTunneledModeSetting;
+typedef C2PortParam<C2Tuning, C2TunneledModeStruct, kParamIndexTunneledMode>
+        C2PortTunneledModeTuning;
 constexpr char C2_PARAMKEY_TUNNELED_RENDER[] = "output.tunneled-render";
 
 /**
@@ -2248,7 +2248,7 @@
  * tunneled mode. If the tunneled mode is SIDEBAND, this is the
  * sideband handle.
  */
-typedef C2PortParam<C2Setting, C2Int32Array, kParamIndexTunnelHandle> C2PortTunnelHandleSetting;
+typedef C2PortParam<C2Tuning, C2Int32Array, kParamIndexTunnelHandle> C2PortTunnelHandleTuning;
 constexpr char C2_PARAMKEY_OUTPUT_TUNNEL_HANDLE[] = "output.tunnel-handle";
 
 /**