From a9f9537e5fe16e556b67e11ccb7f561187e9dcab Mon Sep 17 00:00:00 2001 From: rohks Date: Thu, 10 Aug 2023 18:27:44 +0000 Subject: [PATCH] Use utility method `Util.usToMs(timeUs)` to convert durations to `Ms` PiperOrigin-RevId: 555578906 --- .../media3/exoplayer/upstream/CmcdHeadersFactory.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/upstream/CmcdHeadersFactory.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/upstream/CmcdHeadersFactory.java index fdab76f0bb..1967053664 100644 --- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/upstream/CmcdHeadersFactory.java +++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/upstream/CmcdHeadersFactory.java @@ -223,8 +223,8 @@ public final class CmcdHeadersFactory { } cmcdObject.setTopBitrateKbps(Util.ceilDivide(topBitrate, 1000)); } - if (cmcdConfiguration.isObjectDurationLoggingAllowed() && chunkDurationUs != C.TIME_UNSET) { - cmcdObject.setObjectDurationMs(chunkDurationUs / 1000); + if (cmcdConfiguration.isObjectDurationLoggingAllowed()) { + cmcdObject.setObjectDurationMs(Util.usToMs(chunkDurationUs)); } } @@ -235,7 +235,7 @@ public final class CmcdHeadersFactory { CmcdRequest.Builder cmcdRequest = new CmcdRequest.Builder().setCustomData(customData.get(CmcdConfiguration.KEY_CMCD_REQUEST)); if (!getIsInitSegment() && cmcdConfiguration.isBufferLengthLoggingAllowed()) { - cmcdRequest.setBufferLengthMs(bufferedDurationUs / 1000); + cmcdRequest.setBufferLengthMs(Util.usToMs(bufferedDurationUs)); } if (cmcdConfiguration.isMeasuredThroughputLoggingAllowed() && trackSelection.getLatestBitrateEstimate() != Long.MIN_VALUE) { @@ -243,7 +243,7 @@ public final class CmcdHeadersFactory { Util.ceilDivide(trackSelection.getLatestBitrateEstimate(), 1000)); } if (cmcdConfiguration.isDeadlineLoggingAllowed()) { - cmcdRequest.setDeadlineMs(bufferedDurationUs / (long) (playbackRate * 1000)); + cmcdRequest.setDeadlineMs(Util.usToMs((long) (bufferedDurationUs / playbackRate))); } if (cmcdConfiguration.isStartupLoggingAllowed()) { cmcdRequest.setStartup(didRebuffer || isBufferEmpty);