Use utility method Util.usToMs(timeUs) to convert durations to Ms

PiperOrigin-RevId: 555578906
This commit is contained in:
rohks 2023-08-10 18:27:44 +00:00 committed by Tianyi Feng
parent 4282a6ecd7
commit a9f9537e5f

View File

@ -223,8 +223,8 @@ public final class CmcdHeadersFactory {
} }
cmcdObject.setTopBitrateKbps(Util.ceilDivide(topBitrate, 1000)); cmcdObject.setTopBitrateKbps(Util.ceilDivide(topBitrate, 1000));
} }
if (cmcdConfiguration.isObjectDurationLoggingAllowed() && chunkDurationUs != C.TIME_UNSET) { if (cmcdConfiguration.isObjectDurationLoggingAllowed()) {
cmcdObject.setObjectDurationMs(chunkDurationUs / 1000); cmcdObject.setObjectDurationMs(Util.usToMs(chunkDurationUs));
} }
} }
@ -235,7 +235,7 @@ public final class CmcdHeadersFactory {
CmcdRequest.Builder cmcdRequest = CmcdRequest.Builder cmcdRequest =
new CmcdRequest.Builder().setCustomData(customData.get(CmcdConfiguration.KEY_CMCD_REQUEST)); new CmcdRequest.Builder().setCustomData(customData.get(CmcdConfiguration.KEY_CMCD_REQUEST));
if (!getIsInitSegment() && cmcdConfiguration.isBufferLengthLoggingAllowed()) { if (!getIsInitSegment() && cmcdConfiguration.isBufferLengthLoggingAllowed()) {
cmcdRequest.setBufferLengthMs(bufferedDurationUs / 1000); cmcdRequest.setBufferLengthMs(Util.usToMs(bufferedDurationUs));
} }
if (cmcdConfiguration.isMeasuredThroughputLoggingAllowed() if (cmcdConfiguration.isMeasuredThroughputLoggingAllowed()
&& trackSelection.getLatestBitrateEstimate() != Long.MIN_VALUE) { && trackSelection.getLatestBitrateEstimate() != Long.MIN_VALUE) {
@ -243,7 +243,7 @@ public final class CmcdHeadersFactory {
Util.ceilDivide(trackSelection.getLatestBitrateEstimate(), 1000)); Util.ceilDivide(trackSelection.getLatestBitrateEstimate(), 1000));
} }
if (cmcdConfiguration.isDeadlineLoggingAllowed()) { if (cmcdConfiguration.isDeadlineLoggingAllowed()) {
cmcdRequest.setDeadlineMs(bufferedDurationUs / (long) (playbackRate * 1000)); cmcdRequest.setDeadlineMs(Util.usToMs((long) (bufferedDurationUs / playbackRate)));
} }
if (cmcdConfiguration.isStartupLoggingAllowed()) { if (cmcdConfiguration.isStartupLoggingAllowed()) {
cmcdRequest.setStartup(didRebuffer || isBufferEmpty); cmcdRequest.setStartup(didRebuffer || isBufferEmpty);