Skip to content

Commit

Permalink
Use RoundingMode.DOWN in Util.scaleLargeTimestamp and friends
Browse files Browse the repository at this point in the history 
The implementation of these methods was updated from direct java integer
arithmetic in 885ddb1.
In this change, `RoundingMode.FLOOR` was used to try and maintain
compatibility with java integer division. This was incorrect, because
java integer division uses `DOWN` (i.e. towards zero), rather than
`FLOOR` (i.e. towards negative infinity) semantics.

This change fixes the compatibility.

The dump file changes in this CL relate to tests that exercise edit
list behaviour. This involves manipulating negative timestamps, which
explains why they are impacted by this change.

PiperOrigin-RevId: 684013175
  • Loading branch information
@icbaker @copybara-github
icbaker authored and copybara-github committed Oct 9, 2024
1 parent d5baa4c commit 2c46cea
Show file tree
Hide file tree
Showing 8 changed files with 38 additions and 38 deletions.
12 changes: 6 additions & 6 deletions libraries/common/src/main/java/androidx/media3/common/util/Util.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1600,7 +1600,7 @@ public static long msToUs(long timeMs) {
*/
@UnstableApi
public static long sampleCountToDurationUs(long sampleCount, int sampleRate) {
return scaleLargeValue(sampleCount, C.MICROS_PER_SECOND, sampleRate, RoundingMode.FLOOR);
return scaleLargeValue(sampleCount, C.MICROS_PER_SECOND, sampleRate, RoundingMode.DOWN);
}

/**
Expand All @@ -1617,7 +1617,7 @@ public static long sampleCountToDurationUs(long sampleCount, int sampleRate) {
*/
@UnstableApi
public static long durationUsToSampleCount(long durationUs, int sampleRate) {
return scaleLargeValue(durationUs, sampleRate, C.MICROS_PER_SECOND, RoundingMode.CEILING);
return scaleLargeValue(durationUs, sampleRate, C.MICROS_PER_SECOND, RoundingMode.UP);
}

/**
Expand Down Expand Up @@ -1902,7 +1902,7 @@ private static long scaleLargeValueFallback(
* Scales a large timestamp.
*
* <p>Equivalent to {@link #scaleLargeValue(long, long, long, RoundingMode)} with {@link
* RoundingMode#FLOOR}.
* RoundingMode#DOWN}.
*
* @param timestamp The timestamp to scale.
* @param multiplier The multiplier.
Expand All @@ -1911,7 +1911,7 @@ private static long scaleLargeValueFallback(
*/
@UnstableApi
public static long scaleLargeTimestamp(long timestamp, long multiplier, long divisor) {
return scaleLargeValue(timestamp, multiplier, divisor, RoundingMode.FLOOR);
return scaleLargeValue(timestamp, multiplier, divisor, RoundingMode.DOWN);
}

/**
Expand All @@ -1924,7 +1924,7 @@ public static long scaleLargeTimestamp(long timestamp, long multiplier, long div
*/
@UnstableApi
public static long[] scaleLargeTimestamps(List<Long> timestamps, long multiplier, long divisor) {
return scaleLargeValues(timestamps, multiplier, divisor, RoundingMode.FLOOR);
return scaleLargeValues(timestamps, multiplier, divisor, RoundingMode.DOWN);
}

/**
Expand All @@ -1936,7 +1936,7 @@ public static long[] scaleLargeTimestamps(List<Long> timestamps, long multiplier
*/
@UnstableApi
public static void scaleLargeTimestampsInPlace(long[] timestamps, long multiplier, long divisor) {
scaleLargeValuesInPlace(timestamps, multiplier, divisor, RoundingMode.FLOOR);
scaleLargeValuesInPlace(timestamps, multiplier, divisor, RoundingMode.DOWN);
}

/**
Expand Down
10 changes: 5 additions & 5 deletions libraries/test_data/src/test/assets/extractordumps/mp4/sample_edit_list.mp4.0.dump
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,15 @@ track 0:
flags = 1
data = length 78829, hash 9265686F
sample 1:
time = -321667
time = -321666
flags = 0
data = length 32262, hash 1AD10F61
sample 2:
time = -388334
time = -388333
flags = 0
data = length 18055, hash C6BED1E3
sample 3:
time = -188334
time = -188333
flags = 0
data = length 65604, hash AA006B06
sample 4:
Expand All @@ -53,7 +53,7 @@ track 0:
flags = 0
data = length 72552, hash 9535951C
sample 6:
time = -121667
time = -121666
flags = 0
data = length 23756, hash 4074D5AE
sample 7:
Expand All @@ -65,7 +65,7 @@ track 0:
flags = 0
data = length 55804, hash D559D074
sample 9:
time = -21667
time = -21666
flags = 0
data = length 12955, hash 35EE397F
sample 10:
Expand Down
10 changes: 5 additions & 5 deletions ...ets/extractordumps/mp4/sample_edit_list.mp4.reading_within_gop_sample_dependencies.0.dump
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,15 @@ track 0:
flags = 1
data = length 78829, hash 9265686F
sample 1:
time = -321667
time = -321666
flags = 0
data = length 32262, hash 1AD10F61
sample 2:
time = -388334
time = -388333
flags = 0
data = length 18055, hash C6BED1E3
sample 3:
time = -188334
time = -188333
flags = 0
data = length 65604, hash AA006B06
sample 4:
Expand All @@ -53,7 +53,7 @@ track 0:
flags = 0
data = length 72552, hash 9535951C
sample 6:
time = -121667
time = -121666
flags = 0
data = length 23756, hash 4074D5AE
sample 7:
Expand All @@ -65,7 +65,7 @@ track 0:
flags = 0
data = length 55804, hash D559D074
sample 9:
time = -21667
time = -21666
flags = 0
data = length 12955, hash 35EE397F
sample 10:
Expand Down
10 changes: 5 additions & 5 deletions ...dumps/mp4/sample_edit_list.mp4.reading_within_gop_sample_dependencies.unknown_length.dump
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,15 @@ track 0:
flags = 1
data = length 78829, hash 9265686F
sample 1:
time = -321667
time = -321666
flags = 0
data = length 32262, hash 1AD10F61
sample 2:
time = -388334
time = -388333
flags = 0
data = length 18055, hash C6BED1E3
sample 3:
time = -188334
time = -188333
flags = 0
data = length 65604, hash AA006B06
sample 4:
Expand All @@ -53,7 +53,7 @@ track 0:
flags = 0
data = length 72552, hash 9535951C
sample 6:
time = -121667
time = -121666
flags = 0
data = length 23756, hash 4074D5AE
sample 7:
Expand All @@ -65,7 +65,7 @@ track 0:
flags = 0
data = length 55804, hash D559D074
sample 9:
time = -21667
time = -21666
flags = 0
data = length 12955, hash 35EE397F
sample 10:
Expand Down
10 changes: 5 additions & 5 deletions ...ies/test_data/src/test/assets/extractordumps/mp4/sample_edit_list.mp4.unknown_length.dump
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,15 @@ track 0:
flags = 1
data = length 78829, hash 9265686F
sample 1:
time = -321667
time = -321666
flags = 0
data = length 32262, hash 1AD10F61
sample 2:
time = -388334
time = -388333
flags = 0
data = length 18055, hash C6BED1E3
sample 3:
time = -188334
time = -188333
flags = 0
data = length 65604, hash AA006B06
sample 4:
Expand All @@ -53,7 +53,7 @@ track 0:
flags = 0
data = length 72552, hash 9535951C
sample 6:
time = -121667
time = -121666
flags = 0
data = length 23756, hash 4074D5AE
sample 7:
Expand All @@ -65,7 +65,7 @@ track 0:
flags = 0
data = length 55804, hash D559D074
sample 9:
time = -21667
time = -21666
flags = 0
data = length 12955, hash 35EE397F
sample 10:
Expand Down
20 changes: 10 additions & 10 deletions libraries/test_data/src/test/assets/playbackdumps/mp4/sample_edit_list.mp4.dump
View file
Original file line number Diff line number Diff line change
Expand Up @@ -798,13 +798,13 @@ MediaCodecAdapter (exotest.video.hevc):
timeUs = 999999545000
contents = length 78829, hash 9265686F
input buffer #1:
timeUs = 999999678333
timeUs = 999999678334
contents = length 32262, hash 1AD10F61
input buffer #2:
timeUs = 999999611666
timeUs = 999999611667
contents = length 18055, hash C6BED1E3
input buffer #3:
timeUs = 999999811666
timeUs = 999999811667
contents = length 65604, hash AA006B06
input buffer #4:
timeUs = 999999745000
Expand All @@ -813,7 +813,7 @@ MediaCodecAdapter (exotest.video.hevc):
timeUs = 999999945000
contents = length 72552, hash 9535951C
input buffer #6:
timeUs = 999999878333
timeUs = 999999878334
contents = length 23756, hash 4074D5AE
input buffer #7:
timeUs = 1000000078333
Expand All @@ -822,7 +822,7 @@ MediaCodecAdapter (exotest.video.hevc):
timeUs = 1000000011666
contents = length 55804, hash D559D074
input buffer #9:
timeUs = 999999978333
timeUs = 999999978334
contents = length 12955, hash 35EE397F
input buffer #10:
timeUs = 1000000045000
Expand Down Expand Up @@ -1054,15 +1054,15 @@ MediaCodecAdapter (exotest.video.hevc):
size = 78829
rendered = false
output buffer #1:
timeUs = 999999678333
timeUs = 999999678334
size = 32262
rendered = false
output buffer #2:
timeUs = 999999611666
timeUs = 999999611667
size = 18055
rendered = false
output buffer #3:
timeUs = 999999811666
timeUs = 999999811667
size = 65604
rendered = false
output buffer #4:
Expand All @@ -1074,7 +1074,7 @@ MediaCodecAdapter (exotest.video.hevc):
size = 72552
rendered = false
output buffer #6:
timeUs = 999999878333
timeUs = 999999878334
size = 23756
rendered = false
output buffer #7:
Expand All @@ -1086,7 +1086,7 @@ MediaCodecAdapter (exotest.video.hevc):
size = 55804
rendered = true
output buffer #9:
timeUs = 999999978333
timeUs = 999999978334
size = 12955
rendered = false
output buffer #10:
Expand Down
2 changes: 1 addition & 1 deletion ...st_data/src/test/assets/transformerdumps/mp4/long_edit_list_audioonly.mp4/transmuxed.dump
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ sample:
dataHashCode = -620111888
size = 423
isKeyFrame = true
presentationTimeUs = -16826
presentationTimeUs = -16825
sample:
trackType = audio
dataHashCode = -1530182437
Expand Down
2 changes: 1 addition & 1 deletion ...transformer/src/androidTest/java/androidx/media3/transformer/TransformerEndToEndTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1988,7 +1988,7 @@ public void transmux_audioWithEditList_preservesDuration() throws Exception {
// "gapless" audio. The generated file should have encoderDelay = 742 and first
// sample PTS of 0.
assertThat(audioTrack.lastFormat.encoderDelay).isEqualTo(0);
assertThat(audioTrack.getSampleTimeUs(/* index= */ 0)).isEqualTo(-16_826);
assertThat(audioTrack.getSampleTimeUs(/* index= */ 0)).isEqualTo(-16_825);
assertThat(audioTrack.getSampleTimeUs(/* index= */ expectedSampleCount - 1))
.isEqualTo(1_538_911);
} else {
Expand Down

0 comments on commit 2c46cea

Please sign in to comment.