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

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

Merge "Enlarge the width of AudioTimestampInternal.position" am: 79e6a53b... 

Merge "Enlarge the width of AudioTimestampInternal.position" am: 79e6a53b am: 1ad538d2 am: bbeb1b5f am: ba248cd1

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



Change-Id: I832db6e5fc84810ccd0addb84ae1c3f89d65d3bf
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 29243952 ba248cd1

media/libaudioclient/AidlConversion.cpp

+1 −1
Original line number Diff line number Diff line
@@ -528,7 +528,7 @@ aidl2legacy_AudioTimestampInternal_AudioTimestamp(const media::AudioTimestampInt 
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;

media/libaudioclient/aidl/android/media/AudioTimestampInternal.aidl

+5 −2
Original line number Diff line number Diff line
@@ -22,8 +22,11 @@ package android.media; 
 * {@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;