Merge "[AOSP IMS] Change anbrBitrate to anbrMode" (5dbcc47e) · Commits · e / os / android_hardware_interfaces

radio/aidl/aidl_api/android.hardware.radio.ims.media/current/android/hardware/radio/ims/media/AnbrMode.aidl

0 → 100644

+39 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2022 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/
		///////////////////////////////////////////////////////////////////////////////
		// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. //
		///////////////////////////////////////////////////////////////////////////////

		// This file is a snapshot of an AIDL file. Do not edit it manually. There are
		// two cases:
		// 1). this is a frozen version file - do not edit this in any case.
		// 2). this is a 'current' file. If you make a backwards compatible change to
		// the interface (from the latest frozen version), the build system will
		// prompt you to update this file with `m <name>-update-api`.
		//
		// You must not make a backward incompatible change to any AIDL file built
		// with the aidl_interface module type with versions property set. The module
		// type is used to build AIDL files in a way that they can be used across
		// independently updatable components of the system. If a device is shipped
		// with such a backward incompatible change, it has a high risk of breaking
		// later when a module using the interface is updated, e.g., Mainline modules.

		package android.hardware.radio.ims.media;
		@JavaDerive(toString=true) @VintfStability
		parcelable AnbrMode {
		android.hardware.radio.ims.media.CodecMode anbrUplinkMode;
		android.hardware.radio.ims.media.CodecMode anbrDownlinkMode;
		}

radio/aidl/aidl_api/android.hardware.radio.ims.media/current/android/hardware/radio/ims/media/AnbrBitrate.aidl→radio/aidl/aidl_api/android.hardware.radio.ims.media/current/android/hardware/radio/ims/media/CodecMode.aidl

+5 −5

Original line number	Diff line number	Diff line
		@@ -32,9 +32,9 @@
		// later when a module using the interface is updated, e.g., Mainline modules.

		package android.hardware.radio.ims.media;
		@VintfStability
		parcelable AnbrBitrate {
		int uplinkBps;
		int downlinkBps;
		const int INVALID_ANBR_BITRATE = (-1);
		@JavaDerive(toString=true) @VintfStability
		union CodecMode {
		boolean noinit;
		android.hardware.radio.ims.media.AmrMode amr;
		android.hardware.radio.ims.media.EvsMode evs;
		}

radio/aidl/aidl_api/android.hardware.radio.ims.media/current/android/hardware/radio/ims/media/RtpConfig.aidl

+1 −1

Original line number	Diff line number	Diff line
		@@ -39,5 +39,5 @@ parcelable RtpConfig {
		android.hardware.radio.ims.media.RtpAddress remoteAddress;
		android.hardware.radio.ims.media.RtpSessionParams sessionParams;
		android.hardware.radio.ims.media.RtcpConfig rtcpConfig;
		android.hardware.radio.ims.media.AnbrBitrate anbrBitrateParams;
		android.hardware.radio.ims.media.AnbrMode anbrModeParams;
		}

radio/aidl/android/hardware/radio/ims/media/AnbrMode.aidl

0 → 100644

+34 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2022 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.hardware.radio.ims.media;

		import android.hardware.radio.ims.media.CodecMode;

		@VintfStability
		@JavaDerive(toString=true)
		parcelable AnbrMode {
		/**
		* Codec mode converted from bitrate received for uplink
		* from network or peer UE for ANBR
		*/
		CodecMode anbrUplinkMode;
		/**
		* Codec mode converted from bitrate received for downlink
		* from network or peer UE for ANBR
		*/
		CodecMode anbrDownlinkMode;
		}

radio/aidl/android/hardware/radio/ims/media/AnbrBitrate.aidl→radio/aidl/android/hardware/radio/ims/media/CodecMode.aidl

+11 −8

Original line number	Diff line number	Diff line
		@@ -16,13 +16,16 @@

		package android.hardware.radio.ims.media;

		@VintfStability
		parcelable AnbrBitrate {
		/** default value to represent NOT_SET */
		const int INVALID_ANBR_BITRATE = -1;
		import android.hardware.radio.ims.media.AmrMode;
		import android.hardware.radio.ims.media.EvsMode;

		/** Received bitrate in seconds for Uplink from NW or peer UE for ANBR */
		int uplinkBps;
		/** Received bitrate in secondsfor Downlink from NW or peer UE for ANBR */
		int downlinkBps;
		@VintfStability
		@JavaDerive(toString=true)
		union CodecMode {
		/** Default value */
		boolean noinit;
		/** AMR codec mode to represent the bit rate. See 3ggp Specs 26.976 & 26.071 */
		AmrMode amr;
		/** EVS codec mode to represent the bit rate. See 3ggp Spec 26.952 Table 5.1 */
		EvsMode evs;
		}