Merge "Added changes to move CMR from codec params to Evs Params as per vendor feedback" into main-ims-dev
diff --git a/radio/aidl/aidl_api/android.hardware.radio.ims.media/current/android/hardware/radio/ims/media/CodecParams.aidl b/radio/aidl/aidl_api/android.hardware.radio.ims.media/current/android/hardware/radio/ims/media/CodecParams.aidl
index b310613..3da2dbd 100644
--- a/radio/aidl/aidl_api/android.hardware.radio.ims.media/current/android/hardware/radio/ims/media/CodecParams.aidl
+++ b/radio/aidl/aidl_api/android.hardware.radio.ims.media/current/android/hardware/radio/ims/media/CodecParams.aidl
@@ -38,7 +38,6 @@
byte rxPayloadTypeNumber;
byte txPayloadTypeNumber;
byte samplingRateKHz;
- byte codecModeRequest;
boolean dtxEnabled;
android.hardware.radio.ims.media.CodecSpecificParams codecSpecificParams;
}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.ims.media/current/android/hardware/radio/ims/media/EvsParams.aidl b/radio/aidl/aidl_api/android.hardware.radio.ims.media/current/android/hardware/radio/ims/media/EvsParams.aidl
index bdd0a4b..735eb08 100644
--- a/radio/aidl/aidl_api/android.hardware.radio.ims.media/current/android/hardware/radio/ims/media/EvsParams.aidl
+++ b/radio/aidl/aidl_api/android.hardware.radio.ims.media/current/android/hardware/radio/ims/media/EvsParams.aidl
@@ -39,4 +39,5 @@
byte channelAwareMode;
boolean useHeaderFullOnly;
boolean useEvsModeSwitch;
+ byte codecModeRequest;
}
diff --git a/radio/aidl/android/hardware/radio/ims/media/CodecParams.aidl b/radio/aidl/android/hardware/radio/ims/media/CodecParams.aidl
index e0c1f6f..0aa5505 100644
--- a/radio/aidl/android/hardware/radio/ims/media/CodecParams.aidl
+++ b/radio/aidl/android/hardware/radio/ims/media/CodecParams.aidl
@@ -37,12 +37,6 @@
byte txPayloadTypeNumber;
/** Sampling rate in kHz*/
byte samplingRateKHz;
- /**
- * cmr: Codec mode request is used to request the speech codec encoder of the
- * other party to set the frame type index of speech mode via RTP header, See
- * 3GPP TS 26.445 section A.3. Allowed values are -1, 0 and 1.
- */
- byte codecModeRequest;
/** dtx: Whether discontinuous transmission is enabled or not */
boolean dtxEnabled;
/** Codec specific parameters */
diff --git a/radio/aidl/android/hardware/radio/ims/media/EvsParams.aidl b/radio/aidl/android/hardware/radio/ims/media/EvsParams.aidl
index 7b420c8..d138c83 100644
--- a/radio/aidl/android/hardware/radio/ims/media/EvsParams.aidl
+++ b/radio/aidl/android/hardware/radio/ims/media/EvsParams.aidl
@@ -47,4 +47,10 @@
* If this value is true, the codec operates in AMR-WB IO mode
*/
boolean useEvsModeSwitch;
+ /**
+ * cmr: Codec mode request is used to request the speech codec encoder of the
+ * other party to set the frame type index of speech mode via RTP header, See
+ * 3GPP TS 26.445 section A.3. Allowed values are -1, 0 and 1.
+ */
+ byte codecModeRequest;
}