Merge "Enlarge the width of AudioTimestampInternal.position" am: 79e6a53b52 am: 1ad538d283
Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2635069
Change-Id: I2ace7a38c2ca6b1761955c9ca05d4ad8693ce7a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/media/libaudioclient/AidlConversion.cpp b/media/libaudioclient/AidlConversion.cpp
index bd10e44..2377fc8 100644
--- a/media/libaudioclient/AidlConversion.cpp
+++ b/media/libaudioclient/AidlConversion.cpp
@@ -528,7 +528,7 @@
ConversionResult<media::AudioTimestampInternal>
legacy2aidl_AudioTimestamp_AudioTimestampInternal(const AudioTimestamp& legacy) {
media::AudioTimestampInternal aidl;
- aidl.position = VALUE_OR_RETURN(convertIntegral<int32_t>(legacy.mPosition));
+ aidl.position = VALUE_OR_RETURN(convertIntegral<int64_t>(legacy.mPosition));
aidl.sec = VALUE_OR_RETURN(convertIntegral<int64_t>(legacy.mTime.tv_sec));
aidl.nsec = VALUE_OR_RETURN(convertIntegral<int32_t>(legacy.mTime.tv_nsec));
return aidl;
diff --git a/media/libaudioclient/aidl/android/media/AudioTimestampInternal.aidl b/media/libaudioclient/aidl/android/media/AudioTimestampInternal.aidl
index 8bbfb57..1f16525 100644
--- a/media/libaudioclient/aidl/android/media/AudioTimestampInternal.aidl
+++ b/media/libaudioclient/aidl/android/media/AudioTimestampInternal.aidl
@@ -22,8 +22,11 @@
* {@hide}
*/
parcelable AudioTimestampInternal {
- /** A frame position in AudioTrack::getPosition() units. */
- int position;
+ /**
+ * A frame position in AudioTrack::getPosition() units. Use 'long' to accommodate
+ * all values from 'uint32_t'.
+ */
+ long position;
/** corresponding CLOCK_MONOTONIC when frame is expected to present. */
long sec;
int nsec;