Merge "Modified MediaDirection to provide more granular control over RTP and... (1794913d) · Commits · e / os / android_hardware_interfaces

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

+9 −9

Original line number	Diff line number	Diff line
		@@ -34,13 +34,13 @@
		package android.hardware.radio.ims.media;
		@Backing(type="int") @VintfStability
		enum AmrMode {
		AMR_MODE_0 = (1 << 0),
		AMR_MODE_1 = (1 << 1),
		AMR_MODE_2 = (1 << 2),
		AMR_MODE_3 = (1 << 3),
		AMR_MODE_4 = (1 << 4),
		AMR_MODE_5 = (1 << 5),
		AMR_MODE_6 = (1 << 6),
		AMR_MODE_7 = (1 << 7),
		AMR_MODE_8 = (1 << 8),
		AMR_MODE_0 = (1 << 0) /* 1 */,
		AMR_MODE_1 = (1 << 1) /* 2 */,
		AMR_MODE_2 = (1 << 2) /* 4 */,
		AMR_MODE_3 = (1 << 3) /* 8 */,
		AMR_MODE_4 = (1 << 4) /* 16 */,
		AMR_MODE_5 = (1 << 5) /* 32 */,
		AMR_MODE_6 = (1 << 6) /* 64 */,
		AMR_MODE_7 = (1 << 7) /* 128 */,
		AMR_MODE_8 = (1 << 8) /* 256 */,
		}

+5 −5

Original line number	Diff line number	Diff line
		@@ -34,9 +34,9 @@
		package android.hardware.radio.ims.media;
		@Backing(type="int") @VintfStability
		enum CodecType {
		AMR = (1 << 0),
		AMR_WB = (1 << 1),
		EVS = (1 << 2),
		PCMA = (1 << 3),
		PCMU = (1 << 4),
		AMR = (1 << 0) /* 1 */,
		AMR_WB = (1 << 1) /* 2 */,
		EVS = (1 << 2) /* 4 */,
		PCMA = (1 << 3) /* 8 */,
		PCMU = (1 << 4) /* 16 */,
		}

+4 −4

Original line number	Diff line number	Diff line
		@@ -35,8 +35,8 @@ package android.hardware.radio.ims.media;
		@Backing(type="int") @VintfStability
		enum EvsBandwidth {
		NONE = 0,
		NARROW_BAND = (1 << 0),
		WIDE_BAND = (1 << 1),
		SUPER_WIDE_BAND = (1 << 2),
		FULL_BAND = (1 << 3),
		NARROW_BAND = (1 << 0) /* 1 */,
		WIDE_BAND = (1 << 1) /* 2 */,
		SUPER_WIDE_BAND = (1 << 2) /* 4 */,
		FULL_BAND = (1 << 3) /* 8 */,
		}

+21 −21

Original line number	Diff line number	Diff line
		@@ -34,25 +34,25 @@
		package android.hardware.radio.ims.media;
		@Backing(type="int") @VintfStability
		enum EvsMode {
		EVS_MODE_0 = (1 << 0),
		EVS_MODE_1 = (1 << 1),
		EVS_MODE_2 = (1 << 2),
		EVS_MODE_3 = (1 << 3),
		EVS_MODE_4 = (1 << 4),
		EVS_MODE_5 = (1 << 5),
		EVS_MODE_6 = (1 << 6),
		EVS_MODE_7 = (1 << 7),
		EVS_MODE_8 = (1 << 8),
		EVS_MODE_9 = (1 << 9),
		EVS_MODE_10 = (1 << 10),
		EVS_MODE_11 = (1 << 11),
		EVS_MODE_12 = (1 << 12),
		EVS_MODE_13 = (1 << 13),
		EVS_MODE_14 = (1 << 14),
		EVS_MODE_15 = (1 << 15),
		EVS_MODE_16 = (1 << 16),
		EVS_MODE_17 = (1 << 17),
		EVS_MODE_18 = (1 << 18),
		EVS_MODE_19 = (1 << 19),
		EVS_MODE_20 = (1 << 20),
		EVS_MODE_0 = (1 << 0) /* 1 */,
		EVS_MODE_1 = (1 << 1) /* 2 */,
		EVS_MODE_2 = (1 << 2) /* 4 */,
		EVS_MODE_3 = (1 << 3) /* 8 */,
		EVS_MODE_4 = (1 << 4) /* 16 */,
		EVS_MODE_5 = (1 << 5) /* 32 */,
		EVS_MODE_6 = (1 << 6) /* 64 */,
		EVS_MODE_7 = (1 << 7) /* 128 */,
		EVS_MODE_8 = (1 << 8) /* 256 */,
		EVS_MODE_9 = (1 << 9) /* 512 */,
		EVS_MODE_10 = (1 << 10) /* 1024 */,
		EVS_MODE_11 = (1 << 11) /* 2048 */,
		EVS_MODE_12 = (1 << 12) /* 4096 */,
		EVS_MODE_13 = (1 << 13) /* 8192 */,
		EVS_MODE_14 = (1 << 14) /* 16384 */,
		EVS_MODE_15 = (1 << 15) /* 32768 */,
		EVS_MODE_16 = (1 << 16) /* 65536 */,
		EVS_MODE_17 = (1 << 17) /* 131072 */,
		EVS_MODE_18 = (1 << 18) /* 262144 */,
		EVS_MODE_19 = (1 << 19) /* 524288 */,
		EVS_MODE_20 = (1 << 20) /* 1048576 */,
		}

+4 −4

Original line number	Diff line number	Diff line
		@@ -35,8 +35,8 @@ package android.hardware.radio.ims.media;
		@Backing(type="int") @VintfStability
		enum MediaDirection {
		NO_FLOW = 0,
		SEND_ONLY = 1,
		RECEIVE_ONLY = 2,
		SEND_RECEIVE = 3,
		INACTIVE = 4,
		RTP_TX = (1 << 0) /* 1 */,
		RTP_RX = (1 << 1) /* 2 */,
		RTCP_TX = (1 << 2) /* 4 */,
		RTCP_RX = (1 << 3) /* 8 */,
		}