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

Commit e0aad0c9 authored by Wei Jia's avatar Wei Jia Committed by android-build-merger
Browse files

Merge "Fix bugs regarding clamping of numFrames variable." am: f4935e88

am: 716f64f5

Change-Id: Id52b35a1b5d4fb4f803172f57cabf6487242be85
parents 752403d7 716f64f5
Loading
Loading
Loading
Loading
+1 −2
Original line number Original line Diff line number Diff line
@@ -1156,8 +1156,7 @@ int64_t NuPlayer2::Renderer::getDurationUsIfPlayedAtSampleRate(uint32_t numFrame
        ALOGE("sampleRate is 0 in %s mode", offloadingAudio() ? "offload" : "non-offload");
        ALOGE("sampleRate is 0 in %s mode", offloadingAudio() ? "offload" : "non-offload");
        return 0;
        return 0;
    }
    }
    // TODO: remove the (int32_t) casting below as it may overflow at 12.4 hours.
    return (int64_t)(numFrames * 1000000LL / sampleRate);
    return (int64_t)((int32_t)numFrames * 1000000LL / sampleRate);
}
}


// Calculate duration of pending samples if played at normal rate (i.e., 1.0).
// Calculate duration of pending samples if played at normal rate (i.e., 1.0).