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

Commit 4c39b9c7 authored by Chih-Hung Hsieh's avatar Chih-Hung Hsieh
Browse files

resolve merge conflicts of 9764d529 to nyc-dev-plus-aosp 

Change-Id: I52d001d9dff4b250769e5fa59f9aea461b435193
parents f69feffd 9764d529

media/libmedia/AudioTrack.cpp

+1 −1
Original line number Diff line number Diff line
@@ -2499,7 +2499,7 @@ status_t AudioTrack::getTimestamp(AudioTimestamp& timestamp) 
    // This is sometimes caused by erratic reports of the available space in the ALSA drivers.

    if (status == NO_ERROR) {

        if (previousTimestampValid) {

#define TIME_TO_NANOS(time) ((int64_t)time.tv_sec * 1000000000 + time.tv_nsec)

#define TIME_TO_NANOS(time) ((int64_t)(time).tv_sec * 1000000000 + (time).tv_nsec)

            const int64_t previousTimeNanos = TIME_TO_NANOS(mPreviousTimestamp.mTime);

            const int64_t currentTimeNanos = TIME_TO_NANOS(timestamp.mTime);

#undef TIME_TO_NANOS