sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-27 15:07:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

MuxerWrapper: Fix spelling mistake in method name

Browse source 
PiperOrigin-RevId: 640838741
This commit is contained in:
tofunmi 2024-06-06 03:29:24 -07:00 committed by Copybara-Service
parent f238db8208
commit cd5a638e43
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/transformer/src/main/java/androidx/media3/transformer/MuxerWrapper.java
View file

@ -230,7 +230,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
*/ */
@Nullable @Nullable
@VisibleForTesting(otherwise = PRIVATE) @VisibleForTesting(otherwise = PRIVATE)
public static List<byte[]> getMostComatibleInitializationData( public static List<byte[]> getMostCompatibleInitializationData(
Format existingVideoTrackFormat, Format newVideoTrackFormat) { Format existingVideoTrackFormat, Format newVideoTrackFormat) {
if (existingVideoTrackFormat.initializationDataEquals(newVideoTrackFormat)) { if (existingVideoTrackFormat.initializationDataEquals(newVideoTrackFormat)) {
return existingVideoTrackFormat.initializationData; return existingVideoTrackFormat.initializationData;
@ -391,7 +391,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
.build(); .build();
if (muxerMode == MUXER_MODE_MUX_PARTIAL) { if (muxerMode == MUXER_MODE_MUX_PARTIAL) {
List<byte[]> mostCompatibleInitializationData = List<byte[]> mostCompatibleInitializationData =
getMostComatibleInitializationData(format, checkNotNull(appendVideoFormat)); getMostCompatibleInitializationData(format, checkNotNull(appendVideoFormat));
if (mostCompatibleInitializationData == null) { if (mostCompatibleInitializationData == null) {
throw new AppendTrackFormatException("Switching to MUXER_MODE_APPEND will fail."); throw new AppendTrackFormatException("Switching to MUXER_MODE_APPEND will fail.");
} }

12
libraries/transformer/src/test/java/androidx/media3/transformer/MuxerWrapperTest.java
View file

@ -449,7 +449,7 @@ public class MuxerWrapperTest {
.setInitializationData(ImmutableList.of(new byte[] {1, 2, 3, 4})) .setInitializationData(ImmutableList.of(new byte[] {1, 2, 3, 4}))
.build(); .build();
assertThat(MuxerWrapper.getMostComatibleInitializationData(existingFormat, otherFormat)) assertThat(MuxerWrapper.getMostCompatibleInitializationData(existingFormat, otherFormat))
.isNull(); .isNull();
} }
@ -467,7 +467,7 @@ public class MuxerWrapperTest {
.build(); .build();
List<byte[]> initializationData = List<byte[]> initializationData =
MuxerWrapper.getMostComatibleInitializationData(existingFormat, otherFormat); MuxerWrapper.getMostCompatibleInitializationData(existingFormat, otherFormat);
assertThat(initializationData).hasSize(1); assertThat(initializationData).hasSize(1);
Byte[] expectedInitializationData = new Byte[] {1, 2, 3, 4}; Byte[] expectedInitializationData = new Byte[] {1, 2, 3, 4};
@ -491,7 +491,7 @@ public class MuxerWrapperTest {
.build(); .build();
List<byte[]> initializationData = List<byte[]> initializationData =
MuxerWrapper.getMostComatibleInitializationData(existingFormat, otherFormat); MuxerWrapper.getMostCompatibleInitializationData(existingFormat, otherFormat);
assertThat(initializationData).hasSize(1); assertThat(initializationData).hasSize(1);
Byte[] expectedInitializationData = new Byte[] {1, 2, 3, 4}; Byte[] expectedInitializationData = new Byte[] {1, 2, 3, 4};
@ -517,7 +517,7 @@ public class MuxerWrapperTest {
.build(); .build();
List<byte[]> initializationData = List<byte[]> initializationData =
MuxerWrapper.getMostComatibleInitializationData(existingFormat, otherFormat); MuxerWrapper.getMostCompatibleInitializationData(existingFormat, otherFormat);
assertThat(initializationData).hasSize(2); assertThat(initializationData).hasSize(2);
Byte[] expectedInitializationDataSps = new Byte[] {0, 0, 0, 1, 103, 100, 0, 41}; Byte[] expectedInitializationDataSps = new Byte[] {0, 0, 0, 1, 103, 100, 0, 41};
@ -547,7 +547,7 @@ public class MuxerWrapperTest {
ImmutableList.of(new byte[] {0, 0, 0, 1, 103, 100, 0, 41}, new byte[] {0, 0, 0, 1})) ImmutableList.of(new byte[] {0, 0, 0, 1, 103, 100, 0, 41}, new byte[] {0, 0, 0, 1}))
.build(); .build();
assertThat(MuxerWrapper.getMostComatibleInitializationData(existingFormat, otherFormat)) assertThat(MuxerWrapper.getMostCompatibleInitializationData(existingFormat, otherFormat))
.isNull(); .isNull();
} }
@ -565,7 +565,7 @@ public class MuxerWrapperTest {
ImmutableList.of(new byte[] {0, 0, 0, 1, 103, 100, 0, 41}, new byte[] {0, 0, 0, 1})) ImmutableList.of(new byte[] {0, 0, 0, 1, 103, 100, 0, 41}, new byte[] {0, 0, 0, 1}))
.build(); .build();
assertThat(MuxerWrapper.getMostComatibleInitializationData(existingFormat, otherFormat)) assertThat(MuxerWrapper.getMostCompatibleInitializationData(existingFormat, otherFormat))
.isNull(); .isNull();
} }