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

Commit d7e3aca7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I0392ba18bc35f143ccffb3acda28dbb1b45569ad
parents 5cd45d95 17574d19

media/codec2/core/include/C2Config.h

+3 −3
Original line number Diff line number Diff line
@@ -2239,8 +2239,8 @@ C2ENUM(C2TunneledModeStruct::sync_type_t, uint32_t, 
/**

 * 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 @@ constexpr char C2_PARAMKEY_TUNNELED_RENDER[] = "output.tunneled-render"; 
 * 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";



/**