From 9f60eb3825f249bfdd7e0495c343b665806d24d3 Mon Sep 17 00:00:00 2001 From: kimvde Date: Tue, 11 Feb 2025 04:13:38 -0800 Subject: [PATCH] Fix TODOs formatting in Transformer PiperOrigin-RevId: 725572106 --- .../transformer/ForceEndOfStreamTest.java | 6 +-- .../ParameterizedAndroidTestUtil.java | 2 +- .../transformer/TransformerEndToEndTest.java | 2 +- .../transformer/TransformerProgressTest.java | 2 +- ...rocessorParametrizedSurfaceOutputTest.java | 2 +- ...oFrameProcessorTextureOutputPixelTest.java | 38 +++++++++---------- .../media3/transformer/mh/ExportTest.java | 4 +- .../mh/ForceInterpretHdrVideoAsSdrTest.java | 4 +- .../ToneMapHdrToSdrUsingOpenGlPixelTest.java | 12 +++--- .../transformer/mh/UnoptimizedGlEffect.java | 2 +- .../mh/analysis/SsimMapperTest.java | 4 +- .../media3/transformer/AudioGraphInput.java | 4 +- .../transformer/AudioGraphInputAudioSink.java | 2 +- .../transformer/AudioSampleExporter.java | 4 +- .../DefaultAssetLoaderFactory.java | 12 +++--- .../media3/transformer/DefaultAudioMixer.java | 4 +- .../transformer/DefaultDecoderFactory.java | 2 +- .../transformer/DefaultEncoderFactory.java | 18 ++++----- .../media3/transformer/EditedMediaItem.java | 10 ++--- .../media3/transformer/EncoderUtil.java | 6 +-- .../ExoAssetLoaderBaseRenderer.java | 8 ++-- .../ExoAssetLoaderVideoRenderer.java | 2 +- .../transformer/ExoPlayerAssetLoader.java | 6 +-- .../media3/transformer/ImageAssetLoader.java | 4 +- .../transformer/SequenceAssetLoader.java | 2 +- .../transformer/SequenceRenderersFactory.java | 4 +- .../transformer/SilentAudioGenerator.java | 2 +- .../transformer/TransformationRequest.java | 2 +- .../media3/transformer/Transformer.java | 2 +- .../transformer/TransformerInternal.java | 4 +- .../transformer/VideoSampleExporter.java | 6 +-- .../transformer/DefaultAudioMixerTest.java | 2 +- .../transformer/MediaItemExportTest.java | 4 +- .../transformer/SequenceExportTest.java | 2 +- 34 files changed, 95 insertions(+), 95 deletions(-) diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/ForceEndOfStreamTest.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/ForceEndOfStreamTest.java index d13f75261e..eb9ed0acd8 100644 --- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/ForceEndOfStreamTest.java +++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/ForceEndOfStreamTest.java @@ -72,7 +72,7 @@ public class ForceEndOfStreamTest { @Test public void transcode_decoderDroppingLastFourFrames_exportSucceeds() throws Exception { - // TODO: b/370050055 - do we need API 29+, or the device list from + // TODO: b/370050055 - Do we need API 29+, or the device list from // Util.isFrameDropAllowedOnSurfaceInput? assumeTrue(Util.SDK_INT >= 29); assumeFormatsSupported( @@ -94,7 +94,7 @@ public class ForceEndOfStreamTest { @Test public void transcode_decoderDroppingNoFrame_exportSucceeds() throws Exception { - // TODO: b/370050055 - do we need API 29+, or the device list from + // TODO: b/370050055 - Do we need API 29+, or the device list from // Util.isFrameDropAllowedOnSurfaceInput? assumeTrue(Util.SDK_INT >= 29); assumeFormatsSupported( @@ -116,7 +116,7 @@ public class ForceEndOfStreamTest { @Test public void transcode_withSlowVideoEffect_exportSucceedsWithCorrectNumberOfFrames() throws Exception { - // TODO: b/370050055 - do we need API 29+, or the device list from + // TODO: b/370050055 - Do we need API 29+, or the device list from // Util.isFrameDropAllowedOnSurfaceInput? assumeTrue(Util.SDK_INT >= 29); assumeFormatsSupported( diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/ParameterizedAndroidTestUtil.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/ParameterizedAndroidTestUtil.java index 61ebefbd87..c7b33f0040 100644 --- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/ParameterizedAndroidTestUtil.java +++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/ParameterizedAndroidTestUtil.java @@ -100,7 +100,7 @@ import java.util.Objects; public abstract static class ItemConfig { public final int frameCount; @Nullable public final Format format; - // TODO - b/345483531: Modify output format to account for effects (such as presentation). + // TODO: b/345483531 - Modify output format to account for effects (such as presentation). @Nullable public final Format outputFormat; protected final Effects effects; diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/TransformerEndToEndTest.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/TransformerEndToEndTest.java index 097a75f8f8..7051011e03 100644 --- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/TransformerEndToEndTest.java +++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/TransformerEndToEndTest.java @@ -2297,7 +2297,7 @@ public class TransformerEndToEndTest { .run(testId, editedMediaItem); // The test file contains 44100 samples (1 sec @44.1KHz, mono). We expect to receive 44100 / 1.5 // samples. - // TODO (b/361768785): Remove unexpected last sample when Sonic's resampler returns the right + // TODO: b/361768785 - Remove unexpected last sample when Sonic's resampler returns the right // number of samples. assertThat(readBytes.get() / 2).isWithin(1).of(29400); } diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/TransformerProgressTest.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/TransformerProgressTest.java index 7ae0022736..7ad071b1cd 100644 --- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/TransformerProgressTest.java +++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/TransformerProgressTest.java @@ -235,7 +235,7 @@ public class TransformerProgressTest { assertThat(transformerExceptionFuture.get()).isNull(); assertThat(progresses).isInOrder(); - // TODO - b/322145448 Make tests more deterministic and produce at least one progress output. + // TODO: b/322145448 - Make tests more deterministic and produce at least one progress output. if (!progresses.isEmpty()) { // The progress list could be empty if the export ends before any progress can be retrieved. assertThat(Iterables.getFirst(progresses, /* defaultValue= */ -1)).isAtLeast(0); diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/DefaultVideoFrameProcessorParametrizedSurfaceOutputTest.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/DefaultVideoFrameProcessorParametrizedSurfaceOutputTest.java index 522dbb6e4c..fe222cc275 100644 --- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/DefaultVideoFrameProcessorParametrizedSurfaceOutputTest.java +++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/DefaultVideoFrameProcessorParametrizedSurfaceOutputTest.java @@ -48,7 +48,7 @@ import org.junit.runners.Parameterized.Parameters; * a {@link SurfaceBitmapReader} to verify that releasing the output surface during processing * succeeds. */ -// TODO(b/263395272): Move this test to effects/mh tests +// TODO: b/263395272 - Move this test to effects/mh tests @RunWith(Parameterized.class) public class DefaultVideoFrameProcessorParametrizedSurfaceOutputTest { @Rule public final TestName testName = new TestName(); diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/DefaultVideoFrameProcessorTextureOutputPixelTest.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/DefaultVideoFrameProcessorTextureOutputPixelTest.java index 8b162ca48e..f15f1ff902 100644 --- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/DefaultVideoFrameProcessorTextureOutputPixelTest.java +++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/DefaultVideoFrameProcessorTextureOutputPixelTest.java @@ -83,7 +83,7 @@ import org.junit.runner.RunWith; *

Uses a {@link DefaultVideoFrameProcessor} to process one frame, and checks that the actual * output matches expected output, either from a golden file or from another edit. */ -// TODO(b/263395272): Move this test to effects/mh tests, and remove @TestOnly dependencies. +// TODO: b/263395272 - Move this test to effects/mh tests, and remove @TestOnly dependencies. @RunWith(AndroidJUnit4.class) public final class DefaultVideoFrameProcessorTextureOutputPixelTest { private static final String ORIGINAL_PNG_ASSET_PATH = @@ -160,7 +160,7 @@ public final class DefaultVideoFrameProcessorTextureOutputPixelTest { videoFrameProcessorTestRunner.processFirstFrameAndEnd(); Bitmap actualBitmap = videoFrameProcessorTestRunner.getOutputBitmap(); - // TODO(b/207848601): Switch to using proper tooling for testing against golden data. + // TODO: b/207848601 - Switch to using proper tooling for testing against golden data. float averagePixelAbsoluteDifference = getBitmapAveragePixelAbsoluteDifferenceArgb8888(expectedBitmap, actualBitmap, testId); assertThat(averagePixelAbsoluteDifference) @@ -188,7 +188,7 @@ public final class DefaultVideoFrameProcessorTextureOutputPixelTest { texIdProducingVideoFrameProcessorTestRunner.release(); Bitmap actualBitmap = consumersBitmapReader.getBitmap(); - // TODO(b/207848601): Switch to using proper tooling for testing against golden data. + // TODO: b/207848601 - Switch to using proper tooling for testing against golden data. float averagePixelAbsoluteDifference = getBitmapAveragePixelAbsoluteDifferenceArgb8888(expectedBitmap, actualBitmap, testId); assertThat(averagePixelAbsoluteDifference) @@ -230,7 +230,7 @@ public final class DefaultVideoFrameProcessorTextureOutputPixelTest { videoFrameProcessorTestRunner.processFirstFrameAndEnd(); Bitmap actualBitmap = videoFrameProcessorTestRunner.getOutputBitmap(); - // TODO(b/207848601): Switch to using proper tooling for testing against golden data. + // TODO: b/207848601 - Switch to using proper tooling for testing against golden data. float averagePixelAbsoluteDifference = getBitmapAveragePixelAbsoluteDifferenceArgb8888(expectedBitmap, actualBitmap, testId); assertThat(averagePixelAbsoluteDifference) @@ -258,7 +258,7 @@ public final class DefaultVideoFrameProcessorTextureOutputPixelTest { texIdProducingVideoFrameProcessorTestRunner.release(); Bitmap actualBitmap = consumersBitmapReader.getBitmap(); - // TODO(b/207848601): Switch to using proper tooling for testing against golden data. + // TODO: b/207848601 - Switch to using proper tooling for testing against golden data. float averagePixelAbsoluteDifference = getBitmapAveragePixelAbsoluteDifferenceArgb8888(expectedBitmap, actualBitmap, testId); assertThat(averagePixelAbsoluteDifference) @@ -266,7 +266,7 @@ public final class DefaultVideoFrameProcessorTextureOutputPixelTest { } @Test - @Ignore("TODO: b/344529901 - enable this test when fixed.") + @Ignore("TODO: b/344529901 - Enable this test when fixed.") public void ultraHdrBitmapAndTextOverlay_hlg10Input_matchesGoldenFile() throws Exception { Context context = getApplicationContext(); Format format = MP4_ASSET_1080P_5_SECOND_HLG10.videoFormat; @@ -455,7 +455,7 @@ public final class DefaultVideoFrameProcessorTextureOutputPixelTest { videoFrameProcessorTestRunner.processFirstFrameAndEnd(); Bitmap actualBitmap = videoFrameProcessorTestRunner.getOutputBitmap(); - // TODO(b/207848601): Switch to using proper tooling for testing against golden data. + // TODO: b/207848601 - Switch to using proper tooling for testing against golden data. float averagePixelAbsoluteDifference = BitmapPixelTestUtil.getBitmapAveragePixelAbsoluteDifferenceFp16( expectedBitmap, actualBitmap); @@ -513,7 +513,7 @@ public final class DefaultVideoFrameProcessorTextureOutputPixelTest { texIdProducingVideoFrameProcessorTestRunner.release(); Bitmap actualBitmap = consumersBitmapReader.getBitmap(); - // TODO(b/207848601): Switch to using proper tooling for testing against golden data. + // TODO: b/207848601 - Switch to using proper tooling for testing against golden data. float averagePixelAbsoluteDifference = BitmapPixelTestUtil.getBitmapAveragePixelAbsoluteDifferenceFp16( expectedBitmap, actualBitmap); @@ -546,7 +546,7 @@ public final class DefaultVideoFrameProcessorTextureOutputPixelTest { videoFrameProcessorTestRunner.endFrameProcessing(); Bitmap actualBitmap = videoFrameProcessorTestRunner.getOutputBitmap(); - // TODO(b/207848601): Switch to using proper tooling for testing against golden data. + // TODO: b/207848601 - Switch to using proper tooling for testing against golden data. float averagePixelAbsoluteDifference = BitmapPixelTestUtil.getBitmapAveragePixelAbsoluteDifferenceFp16( expectedBitmap, actualBitmap); @@ -571,7 +571,7 @@ public final class DefaultVideoFrameProcessorTextureOutputPixelTest { videoFrameProcessorTestRunner.processFirstFrameAndEnd(); Bitmap actualBitmap = videoFrameProcessorTestRunner.getOutputBitmap(); - // TODO(b/207848601): Switch to using proper tooling for testing against golden data. + // TODO: b/207848601 - Switch to using proper tooling for testing against golden data. float averagePixelAbsoluteDifference = BitmapPixelTestUtil.getBitmapAveragePixelAbsoluteDifferenceFp16( expectedBitmap, actualBitmap); @@ -605,7 +605,7 @@ public final class DefaultVideoFrameProcessorTextureOutputPixelTest { videoFrameProcessorTestRunner.processFirstFrameAndEnd(); Bitmap actualBitmap = videoFrameProcessorTestRunner.getOutputBitmap(); - // TODO(b/207848601): Switch to using proper tooling for testing against golden data. + // TODO: b/207848601 - Switch to using proper tooling for testing against golden data. float averagePixelAbsoluteDifference = BitmapPixelTestUtil.getBitmapAveragePixelAbsoluteDifferenceFp16( expectedBitmap, actualBitmap); @@ -634,7 +634,7 @@ public final class DefaultVideoFrameProcessorTextureOutputPixelTest { texIdProducingVideoFrameProcessorTestRunner.release(); Bitmap actualBitmap = consumersBitmapReader.getBitmap(); - // TODO(b/207848601): Switch to using proper tooling for testing against golden data. + // TODO: b/207848601 - Switch to using proper tooling for testing against golden data. float averagePixelAbsoluteDifference = BitmapPixelTestUtil.getBitmapAveragePixelAbsoluteDifferenceFp16( expectedBitmap, actualBitmap); @@ -667,7 +667,7 @@ public final class DefaultVideoFrameProcessorTextureOutputPixelTest { videoFrameProcessorTestRunner.endFrameProcessing(); Bitmap actualBitmap = videoFrameProcessorTestRunner.getOutputBitmap(); - // TODO(b/207848601): Switch to using proper tooling for testing against golden data. + // TODO: b/207848601 - Switch to using proper tooling for testing against golden data. float averagePixelAbsoluteDifference = BitmapPixelTestUtil.getBitmapAveragePixelAbsoluteDifferenceFp16( expectedBitmap, actualBitmap); @@ -693,7 +693,7 @@ public final class DefaultVideoFrameProcessorTextureOutputPixelTest { videoFrameProcessorTestRunner.processFirstFrameAndEnd(); Bitmap actualBitmap = videoFrameProcessorTestRunner.getOutputBitmap(); - // TODO(b/207848601): Switch to using proper tooling for testing against golden data. + // TODO: b/207848601 - Switch to using proper tooling for testing against golden data. float averagePixelAbsoluteDifference = BitmapPixelTestUtil.getBitmapAveragePixelAbsoluteDifferenceFp16( expectedBitmap, actualBitmap); @@ -722,7 +722,7 @@ public final class DefaultVideoFrameProcessorTextureOutputPixelTest { texIdProducingVideoFrameProcessorTestRunner.release(); Bitmap actualBitmap = consumersBitmapReader.getBitmap(); - // TODO(b/207848601): Switch to using proper tooling for testing against golden data. + // TODO: b/207848601 - Switch to using proper tooling for testing against golden data. float averagePixelAbsoluteDifference = BitmapPixelTestUtil.getBitmapAveragePixelAbsoluteDifferenceFp16( expectedBitmap, actualBitmap); @@ -756,7 +756,7 @@ public final class DefaultVideoFrameProcessorTextureOutputPixelTest { videoFrameProcessorTestRunner.endFrameProcessing(); Bitmap actualBitmap = videoFrameProcessorTestRunner.getOutputBitmap(); - // TODO(b/207848601): Switch to using proper tooling for testing against golden data. + // TODO: b/207848601 - Switch to using proper tooling for testing against golden data. float averagePixelAbsoluteDifference = BitmapPixelTestUtil.getBitmapAveragePixelAbsoluteDifferenceFp16( expectedBitmap, actualBitmap); @@ -782,7 +782,7 @@ public final class DefaultVideoFrameProcessorTextureOutputPixelTest { videoFrameProcessorTestRunner.processFirstFrameAndEnd(); Bitmap actualBitmap = videoFrameProcessorTestRunner.getOutputBitmap(); - // TODO(b/207848601): Switch to using proper tooling for testing against golden data. + // TODO: b/207848601 - Switch to using proper tooling for testing against golden data. float averagePixelAbsoluteDifference = BitmapPixelTestUtil.getBitmapAveragePixelAbsoluteDifferenceFp16( expectedBitmap, actualBitmap); @@ -811,7 +811,7 @@ public final class DefaultVideoFrameProcessorTextureOutputPixelTest { texIdProducingVideoFrameProcessorTestRunner.release(); Bitmap actualBitmap = consumersBitmapReader.getBitmap(); - // TODO(b/207848601): Switch to using proper tooling for testing against golden data. + // TODO: b/207848601 - Switch to using proper tooling for testing against golden data. float averagePixelAbsoluteDifference = BitmapPixelTestUtil.getBitmapAveragePixelAbsoluteDifferenceFp16( expectedBitmap, actualBitmap); @@ -845,7 +845,7 @@ public final class DefaultVideoFrameProcessorTextureOutputPixelTest { videoFrameProcessorTestRunner.endFrameProcessing(); Bitmap actualBitmap = videoFrameProcessorTestRunner.getOutputBitmap(); - // TODO(b/207848601): Switch to using proper tooling for testing against golden data. + // TODO: b/207848601 - Switch to using proper tooling for testing against golden data. float averagePixelAbsoluteDifference = BitmapPixelTestUtil.getBitmapAveragePixelAbsoluteDifferenceFp16( expectedBitmap, actualBitmap); diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/ExportTest.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/ExportTest.java index df6f8c826e..c502e79df3 100644 --- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/ExportTest.java +++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/ExportTest.java @@ -309,7 +309,7 @@ public class ExportTest { public void exportSef() throws Exception { Context context = ApplicationProvider.getApplicationContext(); if (SDK_INT < 25) { - // TODO(b/210593256): Remove test skipping after using an in-app muxer that supports B-frames + // TODO: b/210593256 - Remove test skipping after using an in-app muxer that supports B-frames // before API 25. recordTestSkipped(context, testId, /* reason= */ "API version lacks muxing support"); return; @@ -334,7 +334,7 @@ public class ExportTest { public void exportSefH265() throws Exception { Context context = ApplicationProvider.getApplicationContext(); if (SDK_INT < 25) { - // TODO(b/210593256): Remove test skipping after using an in-app muxer that supports B-frames + // TODO: b/210593256 - Remove test skipping after using an in-app muxer that supports B-frames // before API 25. recordTestSkipped(context, testId, /* reason= */ "API version lacks muxing support"); return; diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/ForceInterpretHdrVideoAsSdrTest.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/ForceInterpretHdrVideoAsSdrTest.java index 4a76042756..ff082f2e47 100644 --- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/ForceInterpretHdrVideoAsSdrTest.java +++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/ForceInterpretHdrVideoAsSdrTest.java @@ -64,7 +64,7 @@ public class ForceInterpretHdrVideoAsSdrTest { Context context = ApplicationProvider.getApplicationContext(); if (SDK_INT < 29) { - // TODO(b/269759013): Fix failures under API 29 to expand confidence on all API versions. + // TODO: b/269759013 - Fix failures under API 29 to expand confidence on all API versions. recordTestSkipped( context, testId, /* reason= */ "Under API 29, this API is considered best-effort."); return; @@ -105,7 +105,7 @@ public class ForceInterpretHdrVideoAsSdrTest { Context context = ApplicationProvider.getApplicationContext(); if (SDK_INT < 29) { - // TODO(b/269759013): Fix failures under API 29 to expand confidence on all API versions. + // TODO: b/269759013 - Fix failures under API 29 to expand confidence on all API versions. recordTestSkipped( context, testId, /* reason= */ "Under API 29, this API is considered best-effort."); return; diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/ToneMapHdrToSdrUsingOpenGlPixelTest.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/ToneMapHdrToSdrUsingOpenGlPixelTest.java index 206d78969e..c7f8ae642c 100644 --- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/ToneMapHdrToSdrUsingOpenGlPixelTest.java +++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/ToneMapHdrToSdrUsingOpenGlPixelTest.java @@ -48,7 +48,7 @@ import org.junit.runner.RunWith; *

Uses a {@link DefaultVideoFrameProcessor} to process one frame, and checks that the actual * output matches expected output, either from a golden file or from another edit. */ -// TODO(b/263395272): Move this test to effects/mh tests. +// TODO: b/263395272 - Move this test to effects/mh tests. @RunWith(AndroidJUnit4.class) public final class ToneMapHdrToSdrUsingOpenGlPixelTest { private static final String TAG = "ToneMapHdrToSdrGl"; @@ -148,7 +148,7 @@ public final class ToneMapHdrToSdrUsingOpenGlPixelTest { Bitmap actualBitmap = videoFrameProcessorTestRunner.getOutputBitmap(); Log.i(TAG, "Successfully tone mapped."); - // TODO(b/207848601): Switch to using proper tooling for testing against golden data. + // TODO: b/207848601 - Switch to using proper tooling for testing against golden data. float averagePixelAbsoluteDifference = getBitmapAveragePixelAbsoluteDifferenceArgb8888(expectedBitmap, actualBitmap, testId); assertThat(averagePixelAbsoluteDifference) @@ -170,7 +170,7 @@ public final class ToneMapHdrToSdrUsingOpenGlPixelTest { Bitmap actualBitmap = videoFrameProcessorTestRunner.getOutputBitmap(); Log.i(TAG, "Successfully tone mapped."); - // TODO(b/207848601): Switch to using proper tooling for testing against golden data. + // TODO: b/207848601 - Switch to using proper tooling for testing against golden data. float averagePixelAbsoluteDifference = getBitmapAveragePixelAbsoluteDifferenceArgb8888(expectedBitmap, actualBitmap, testId); assertThat(averagePixelAbsoluteDifference) @@ -192,7 +192,7 @@ public final class ToneMapHdrToSdrUsingOpenGlPixelTest { Bitmap actualBitmap = videoFrameProcessorTestRunner.getOutputBitmap(); Log.i(TAG, "Successfully tone mapped."); - // TODO(b/207848601): Switch to using proper tooling for testing against golden data. + // TODO: b/207848601 - Switch to using proper tooling for testing against golden data. float averagePixelAbsoluteDifference = getBitmapAveragePixelAbsoluteDifferenceArgb8888(expectedBitmap, actualBitmap, testId); assertThat(averagePixelAbsoluteDifference) @@ -215,7 +215,7 @@ public final class ToneMapHdrToSdrUsingOpenGlPixelTest { Bitmap actualBitmap = videoFrameProcessorTestRunner.getOutputBitmap(); Log.i(TAG, "Successfully tone mapped."); - // TODO(b/207848601): Switch to using proper tooling for testing against golden data. + // TODO: b/207848601 - Switch to using proper tooling for testing against golden data. float averagePixelAbsoluteDifference = getBitmapAveragePixelAbsoluteDifferenceArgb8888(expectedBitmap, actualBitmap, testId); assertThat(averagePixelAbsoluteDifference) @@ -241,7 +241,7 @@ public final class ToneMapHdrToSdrUsingOpenGlPixelTest { Bitmap actualBitmap = videoFrameProcessorTestRunner.getOutputBitmap(); Log.i(TAG, "Successfully tone mapped."); - // TODO(b/207848601): Switch to using proper tooling for testing against golden data. + // TODO: b/207848601 - Switch to using proper tooling for testing against golden data. float averagePixelAbsoluteDifference = getBitmapAveragePixelAbsoluteDifferenceArgb8888(expectedBitmap, actualBitmap, testId); assertThat(averagePixelAbsoluteDifference) diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/UnoptimizedGlEffect.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/UnoptimizedGlEffect.java index 3fdd4cfff4..f0cede5449 100644 --- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/UnoptimizedGlEffect.java +++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/UnoptimizedGlEffect.java @@ -30,7 +30,7 @@ import androidx.media3.effect.ScaleAndRotateTransformation; * for the wrapped {@link GlEffect} rather than merging it with preceding or subsequent {@link * GlEffect} instances and applying them in one combined {@link GlShaderProgram}. */ -// TODO(b/263395272): Move this to effects/mh tests. +// TODO: b/263395272 - Move this to effects/mh tests. public final class UnoptimizedGlEffect implements GlEffect { // A passthrough effect allows for testing having an intermediate effect injected, which uses // different OpenGL shaders from having no effects. diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/analysis/SsimMapperTest.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/analysis/SsimMapperTest.java index 602a302d43..a8834b8653 100644 --- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/analysis/SsimMapperTest.java +++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/analysis/SsimMapperTest.java @@ -118,7 +118,7 @@ public class SsimMapperTest { List parameterList = new ArrayList<>(); for (AssetInfo assetInfo : INPUT_ASSETS) { parameterList.add(new Object[] {assetInfo, MimeTypes.VIDEO_H264}); - // TODO(b/210593256): Test pre 24 once in-app muxing implemented. + // TODO: b/210593256 - Test pre 24 once in-app muxing implemented. if (Util.SDK_INT >= 24) { parameterList.add(new Object[] {assetInfo, MimeTypes.VIDEO_H265}); } @@ -271,7 +271,7 @@ public class SsimMapperTest { } private double exportAndGetSsim(int bitrate) throws Exception { - // TODO(b/238094555): Force specific encoders to be used. + // TODO: b/238094555 - Force specific encoders to be used. String fileName = checkNotNull(getLast(FORWARD_SLASH_SPLITTER.split(videoUri))); String testId = String.format("%s_%s_%s", testIdPrefix, bitrate, fileName); diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/AudioGraphInput.java b/libraries/transformer/src/main/java/androidx/media3/transformer/AudioGraphInput.java index a278d048af..89549ba9a5 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/AudioGraphInput.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/AudioGraphInput.java @@ -92,7 +92,7 @@ import java.util.concurrent.atomic.AtomicLong; AudioFormat inputAudioFormat = new AudioFormat(inputFormat); checkArgument(isInputAudioFormatValid(inputAudioFormat), /* errorMessage= */ inputAudioFormat); - // TODO(b/323148735) - Use improved buffer assignment logic. + // TODO: b/323148735 - Use improved buffer assignment logic. availableInputBuffers = new ConcurrentLinkedQueue<>(); ByteBuffer emptyBuffer = ByteBuffer.allocateDirect(0).order(ByteOrder.nativeOrder()); for (int i = 0; i < MAX_INPUT_BUFFER_COUNT; i++) { @@ -530,7 +530,7 @@ import java.util.concurrent.atomic.AtomicLong; audioProcessors.add(sampleRateChanger); } - // TODO(b/262706549): Handle channel mixing with AudioMixer. + // TODO: b/262706549 - Handle channel mixing with AudioMixer. // ChannelMixingMatrix.create only has defaults for mono/stereo input/output. if (requiredOutputAudioFormat.channelCount == 1 || requiredOutputAudioFormat.channelCount == 2) { diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/AudioGraphInputAudioSink.java b/libraries/transformer/src/main/java/androidx/media3/transformer/AudioGraphInputAudioSink.java index 1969f396a3..09eb5246c7 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/AudioGraphInputAudioSink.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/AudioGraphInputAudioSink.java @@ -118,7 +118,7 @@ import java.util.Objects; throws ConfigurationException { checkArgument(supportsFormat(inputFormat)); EditedMediaItem editedMediaItem = checkStateNotNull(currentEditedMediaItemInfo).editedMediaItem; - // TODO(b/303029969): Evaluate throwing vs ignoring for null outputChannels. + // TODO: b/303029969 - Evaluate throwing vs ignoring for null outputChannels. checkArgument(outputChannels == null); currentInputFormat = inputFormat; diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/AudioSampleExporter.java b/libraries/transformer/src/main/java/androidx/media3/transformer/AudioSampleExporter.java index 4ede44e041..77df472270 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/AudioSampleExporter.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/AudioSampleExporter.java @@ -87,7 +87,7 @@ import org.checkerframework.dataflow.qual.Pure; .setCodecs(firstInputFormat.codecs) .build(); - // TODO - b/324426022: Move logic for supported mime types to DefaultEncoderFactory. + // TODO: b/324426022 - Move logic for supported mime types to DefaultEncoderFactory. encoder = encoderFactory.createForAudioEncoding( requestedEncoderFormat @@ -222,7 +222,7 @@ import org.checkerframework.dataflow.qual.Pure; @Pure private static TransformationRequest createFallbackTransformationRequest( TransformationRequest transformationRequest, Format requestedFormat, Format actualFormat) { - // TODO(b/255953153): Consider including bitrate and other audio characteristics in the revised + // TODO: b/255953153 - Consider including bitrate and other audio characteristics in the revised // fallback. if (Util.areEqual(requestedFormat.sampleMimeType, actualFormat.sampleMimeType)) { return transformationRequest; diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/DefaultAssetLoaderFactory.java b/libraries/transformer/src/main/java/androidx/media3/transformer/DefaultAssetLoaderFactory.java index 641f6bcc12..144401c269 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/DefaultAssetLoaderFactory.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/DefaultAssetLoaderFactory.java @@ -48,7 +48,7 @@ public final class DefaultAssetLoaderFactory implements AssetLoader.Factory { // Limit decoded images to 4096x4096 - should be large enough for most image to video // transcode operations, and smaller than GL_MAX_TEXTURE_SIZE for most devices. - // TODO: b/356072337 - consider reading this from GL_MAX_TEXTURE_SIZE. This requires an + // TODO: b/356072337 - Consider reading this from GL_MAX_TEXTURE_SIZE. This requires an // active OpenGL context. private static final int MAXIMUM_BITMAP_OUTPUT_DIMENSION = 4096; @@ -77,7 +77,7 @@ public final class DefaultAssetLoaderFactory implements AssetLoader.Factory { */ public DefaultAssetLoaderFactory( Context context, Codec.DecoderFactory decoderFactory, Clock clock) { - // TODO: b/381519379 - deprecate this constructor and replace with a builder. + // TODO: b/381519379 - Deprecate this constructor and replace with a builder. this.context = context.getApplicationContext(); this.decoderFactory = decoderFactory; this.clock = clock; @@ -106,7 +106,7 @@ public final class DefaultAssetLoaderFactory implements AssetLoader.Factory { * @param bitmapLoader The {@link BitmapLoader} to use to load and decode images. */ public DefaultAssetLoaderFactory(Context context, BitmapLoader bitmapLoader) { - // TODO: b/381519379 - deprecate this constructor and replace with a builder. + // TODO: b/381519379 - Deprecate this constructor and replace with a builder. this.context = context.getApplicationContext(); this.bitmapLoader = bitmapLoader; decoderFactory = new DefaultDecoderFactory.Builder(context).build(); @@ -133,7 +133,7 @@ public final class DefaultAssetLoaderFactory implements AssetLoader.Factory { Clock clock, @Nullable MediaSource.Factory mediaSourceFactory, BitmapLoader bitmapLoader) { - // TODO: b/381519379 - deprecate this constructor and replace with a builder. + // TODO: b/381519379 - Deprecate this constructor and replace with a builder. this.context = context.getApplicationContext(); this.decoderFactory = decoderFactory; this.clock = clock; @@ -163,7 +163,7 @@ public final class DefaultAssetLoaderFactory implements AssetLoader.Factory { @Nullable MediaSource.Factory mediaSourceFactory, BitmapLoader bitmapLoader, TrackSelector.Factory trackSelectorFactory) { - // TODO: b/381519379 - deprecate this constructor and replace with a builder. + // TODO: b/381519379 - Deprecate this constructor and replace with a builder. this.context = context.getApplicationContext(); this.decoderFactory = decoderFactory; this.clock = clock; @@ -180,7 +180,7 @@ public final class DefaultAssetLoaderFactory implements AssetLoader.Factory { CompositionSettings compositionSettings) { MediaItem mediaItem = editedMediaItem.mediaItem; boolean isImage = isImage(context, mediaItem); - // TODO: b/350499931 - use the MediaItem's imageDurationMs instead of the EditedMediaItem's + // TODO: b/350499931 - Use the MediaItem's imageDurationMs instead of the EditedMediaItem's // durationUs to export motion photos as video boolean exportVideoFromMotionPhoto = isImage && editedMediaItem.durationUs == C.TIME_UNSET; if (isImage && !exportVideoFromMotionPhoto) { diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/DefaultAudioMixer.java b/libraries/transformer/src/main/java/androidx/media3/transformer/DefaultAudioMixer.java index 37eb1ad854..aa5c426cf4 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/DefaultAudioMixer.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/DefaultAudioMixer.java @@ -82,7 +82,7 @@ public final class DefaultAudioMixer implements AudioMixer { } } - // TODO(b/290002438, b/276734854): Improve buffer management & determine best default size. + // TODO: b/290002438, b/276734854 - Improve buffer management & determine best default size. private static final int DEFAULT_BUFFER_SIZE_MS = 500; private final boolean outputSilenceWithNoSources; @@ -302,7 +302,7 @@ public final class DefaultAudioMixer implements AudioMixer { outputBuffer = outputBuffer.slice().order(ByteOrder.nativeOrder()); if (newOutputPosition == mixingBuffer.limit) { - // TODO(b/264926272): Generalize for >2 mixing buffers. + // TODO: b/264926272 - Generalize for >2 mixing buffers. mixingBuffers[0] = mixingBuffers[1]; mixingBuffers[1] = allocateMixingBuffer(mixingBuffers[1].limit); } diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/DefaultDecoderFactory.java b/libraries/transformer/src/main/java/androidx/media3/transformer/DefaultDecoderFactory.java index 5570936d17..eba592dd8d 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/DefaultDecoderFactory.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/DefaultDecoderFactory.java @@ -256,7 +256,7 @@ public final class DefaultDecoderFactory implements Codec.DecoderFactory { format, /* reason= */ "Tone-mapping HDR is not supported on this device."); } if (SDK_INT < 29) { - // TODO(b/266837571, b/267171669): Remove API version restriction after fixing linked bugs. + // TODO: b/266837571, b/267171669 - Remove API version restriction after fixing linked bugs. throw createExportException( format, /* reason= */ "Decoding HDR is not supported on this device."); } diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/DefaultEncoderFactory.java b/libraries/transformer/src/main/java/androidx/media3/transformer/DefaultEncoderFactory.java index 1aa05dc9d3..f6fb40610d 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/DefaultEncoderFactory.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/DefaultEncoderFactory.java @@ -49,7 +49,7 @@ import java.util.List; import org.checkerframework.checker.nullness.qual.RequiresNonNull; /** A default implementation of {@link Codec.EncoderFactory}. */ -// TODO(b/224949986) Split audio and video encoder factory. +// TODO: b/224949986 - Split audio and video encoder factory. @UnstableApi public final class DefaultEncoderFactory implements Codec.EncoderFactory { private static final int DEFAULT_AUDIO_BITRATE = 128 * 1024; @@ -339,7 +339,7 @@ public final class DefaultEncoderFactory implements Codec.EncoderFactory { } if (Util.SDK_INT >= 31 && ColorInfo.isTransferHdr(format.colorInfo)) { - // TODO(b/260389841): Validate the picked encoder supports HDR editing. + // TODO: b/260389841 - Validate the picked encoder supports HDR editing. if (EncoderUtil.getSupportedColorFormats(encoderInfo, mimeType) .contains(MediaCodecInfo.CodecCapabilities.COLOR_Format32bitABGR2101010)) { mediaFormat.setInteger( @@ -526,7 +526,7 @@ public final class DefaultEncoderFactory implements Codec.EncoderFactory { /** Returns a list of encoders that support the requested resolution most closely. */ private static ImmutableList filterEncodersByResolution( List encoders, String mimeType, int requestedWidth, int requestedHeight) { - // TODO(b/267740292): Investigate the fallback logic that might prefer software encoders. + // TODO: b/267740292 - Investigate the fallback logic that might prefer software encoders. return filterEncoders( encoders, /* cost= */ (encoderInfo) -> { @@ -676,8 +676,8 @@ public final class DefaultEncoderFactory implements Codec.EncoderFactory { */ private static void adjustMediaFormatForH264EncoderSettings( @Nullable ColorInfo colorInfo, MediaCodecInfo encoderInfo, MediaFormat mediaFormat) { - // TODO(b/210593256): Remove overriding profile/level (before API 29) after switching to in-app - // muxing. + // TODO: b/210593256 - Remove overriding profile/level (before API 29) after switching to in-app + // muxing. String mimeType = MimeTypes.VIDEO_H264; if (Util.SDK_INT >= 29) { int expectedEncodingProfile = MediaCodecInfo.CodecProfileLevel.AVCProfileHigh; @@ -714,8 +714,8 @@ public final class DefaultEncoderFactory implements Codec.EncoderFactory { if (!mediaFormat.containsKey(MediaFormat.KEY_LEVEL)) { mediaFormat.setInteger(MediaFormat.KEY_LEVEL, supportedEncodingLevel); } - // TODO(b/210593256): Set KEY_LATENCY to 2 to enable B-frame production after in-app muxing - // is the default and it supports B-frames. + // TODO: b/210593256 - Set KEY_LATENCY to 2 to enable B-frame production after in-app muxing + // is the default and it supports B-frames. mediaFormat.setInteger(MediaFormat.KEY_LATENCY, 1); } } else if (Util.SDK_INT >= 24) { @@ -793,7 +793,7 @@ public final class DefaultEncoderFactory implements Codec.EncoderFactory { * */ private static int getSuggestedBitrate(int width, int height, float frameRate) { - // TODO(b/238094555) Refactor into a BitrateProvider. + // TODO: b/238094555 - Refactor into a BitrateProvider. // Assume medium motion factor. // 1080p60 -> 16.6Mbps, 720p30 -> 3.7Mbps. return (int) (width * height * frameRate * 0.07 * 2); @@ -835,7 +835,7 @@ public final class DefaultEncoderFactory implements Codec.EncoderFactory { private static boolean deviceNeedsNoH264HighProfileWorkaround() { // The H.264/AVC encoder produces B-frames when high profile is chosen despite configuration to // turn them off, so force not using high profile on these devices (see b/306617392). - // TODO(b/229420356): Remove once the in-app muxer is the default and B-frames are supported. + // TODO: b/229420356 - Remove once the in-app muxer is the default and B-frames are supported. return Util.SDK_INT == 27 && (Build.DEVICE.equals("ASUS_X00T_3") || Build.DEVICE.equals("TC77")); } diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/EditedMediaItem.java b/libraries/transformer/src/main/java/androidx/media3/transformer/EditedMediaItem.java index e368ea8fdd..ebed1000b1 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/EditedMediaItem.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/EditedMediaItem.java @@ -140,7 +140,7 @@ public final class EditedMediaItem { */ @CanIgnoreReturnValue public Builder setFlattenForSlowMotion(boolean flattenForSlowMotion) { - // TODO(b/233986762): Support clipping with SEF flattening. + // TODO: b/233986762 - Support clipping with SEF flattening. checkArgument( mediaItem.clippingConfiguration.equals(MediaItem.ClippingConfiguration.UNSET) || !flattenForSlowMotion, @@ -190,8 +190,8 @@ public final class EditedMediaItem { * @param frameRate The frame rate, in frames per second. * @return This builder. */ - // TODO(b/210593170): Remove/deprecate frameRate parameter when frameRate parameter is added to - // transformer. + // TODO: b/210593170 - Remove/deprecate frameRate parameter when frameRate parameter is added to + // transformer. @CanIgnoreReturnValue public Builder setFrameRate(@IntRange(from = 0) int frameRate) { checkArgument(frameRate > 0); @@ -272,7 +272,7 @@ public final class EditedMediaItem { * The duration of the image in the output video for image {@link MediaItem}, or the media * duration for other types of {@link MediaItem}, in microseconds. */ - // TODO - b/309767764: Consider merging with presentationDurationUs. + // TODO: b/309767764 - Consider merging with presentationDurationUs. public final long durationUs; /** The frame rate of the image in the output video, in frames per second. */ @@ -317,7 +317,7 @@ public final class EditedMediaItem { if (presentationDurationUs == C.TIME_UNSET) { if (mediaItem.clippingConfiguration.equals(MediaItem.ClippingConfiguration.UNSET) || durationUs == C.TIME_UNSET) { - // TODO - b/290734981: Use presentationDurationUs for image presentation + // TODO: b/290734981 - Use presentationDurationUs for image presentation presentationDurationUs = durationUs; } else { MediaItem.ClippingConfiguration clippingConfiguration = mediaItem.clippingConfiguration; diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/EncoderUtil.java b/libraries/transformer/src/main/java/androidx/media3/transformer/EncoderUtil.java index ab3e31065a..b71f249352 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/EncoderUtil.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/EncoderUtil.java @@ -151,7 +151,7 @@ public final class EncoderUtil { @SuppressWarnings("InlinedApi") // Safe use of inlined constants from newer API versions. public static ImmutableList getCodecProfilesForHdrFormat( String mimeType, @ColorTransfer int colorTransfer) { - // TODO(b/239174610): Add a way to determine profiles for DV and HDR10+. + // TODO: b/239174610 - Add a way to determine profiles for DV and HDR10+. switch (mimeType) { case MimeTypes.VIDEO_VP9: if (colorTransfer == C.COLOR_TRANSFER_HLG || colorTransfer == C.COLOR_TRANSFER_ST2084) { @@ -327,7 +327,7 @@ public final class EncoderUtil { */ public static int findHighestSupportedEncodingLevel( MediaCodecInfo encoderInfo, String mimeType, int profile) { - // TODO(b/214964116): Merge into MediaCodecUtil. + // TODO: b/214964116 - Merge into MediaCodecUtil. MediaCodecInfo.CodecProfileLevel[] profileLevels = encoderInfo.getCapabilitiesForType(mimeType).profileLevels; @@ -400,7 +400,7 @@ public final class EncoderUtil { /** Checks if a {@linkplain MediaCodecInfo codec} is hardware-accelerated. */ public static boolean isHardwareAccelerated(MediaCodecInfo encoderInfo, String mimeType) { - // TODO(b/214964116): Merge into MediaCodecUtil. + // TODO: b/214964116 - Merge into MediaCodecUtil. if (Util.SDK_INT >= 29) { return Api29.isHardwareAccelerated(encoderInfo); } diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/ExoAssetLoaderBaseRenderer.java b/libraries/transformer/src/main/java/androidx/media3/transformer/ExoAssetLoaderBaseRenderer.java index 2b442986fd..3850948b91 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/ExoAssetLoaderBaseRenderer.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/ExoAssetLoaderBaseRenderer.java @@ -225,8 +225,8 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull; if (shouldInitDecoder) { if (getProcessedTrackType(inputFormat.sampleMimeType) == C.TRACK_TYPE_VIDEO) { - // TODO(b/278259383): Move surface creation out of video sampleConsumer. Init decoder and - // get decoder output Format before init sampleConsumer. + // TODO: b/278259383 - Move surface creation out of video sampleConsumer. Init decoder and + // get decoder output Format before init sampleConsumer. if (!ensureSampleConsumerInitialized()) { return false; } @@ -263,8 +263,8 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull; } outputFormat = overrideOutputFormat(decoderOutputFormat); } else { - // TODO(b/278259383): Move surface creation out of video sampleConsumer. Init decoder and - // get decoderOutput Format before init sampleConsumer. + // TODO: b/278259383 - Move surface creation out of video sampleConsumer. Init decoder and + // get decoderOutput Format before init sampleConsumer. outputFormat = overrideOutputFormat(inputFormat); } } diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/ExoAssetLoaderVideoRenderer.java b/libraries/transformer/src/main/java/androidx/media3/transformer/ExoAssetLoaderVideoRenderer.java index e074d5b34e..c2118b53f6 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/ExoAssetLoaderVideoRenderer.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/ExoAssetLoaderVideoRenderer.java @@ -108,7 +108,7 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull; @Override protected void initDecoder(Format inputFormat) throws ExportException { - // TODO(b/278259383): Move surface creation out of sampleConsumer. Init decoder before + // TODO: b/278259383 - Move surface creation out of sampleConsumer. Init decoder before // sampleConsumer. checkStateNotNull(sampleConsumer); boolean isDecoderToneMappingRequired = diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/ExoPlayerAssetLoader.java b/libraries/transformer/src/main/java/androidx/media3/transformer/ExoPlayerAssetLoader.java index 5fb0f97967..b994ddd044 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/ExoPlayerAssetLoader.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/ExoPlayerAssetLoader.java @@ -83,7 +83,7 @@ public final class ExoPlayerAssetLoader implements AssetLoader { * testing. */ public Factory(Context context, Codec.DecoderFactory decoderFactory, Clock clock) { - // TODO: b/381519379 - deprecate this constructor and replace with a builder. + // TODO: b/381519379 - Deprecate this constructor and replace with a builder. this( context, decoderFactory, @@ -108,7 +108,7 @@ public final class ExoPlayerAssetLoader implements AssetLoader { Codec.DecoderFactory decoderFactory, Clock clock, MediaSource.Factory mediaSourceFactory) { - // TODO: b/381519379 - deprecate this constructor and replace with a builder. + // TODO: b/381519379 - Deprecate this constructor and replace with a builder. this(context, decoderFactory, clock, mediaSourceFactory, /* trackSelectorFactory= */ null); } @@ -131,7 +131,7 @@ public final class ExoPlayerAssetLoader implements AssetLoader { Clock clock, @Nullable MediaSource.Factory mediaSourceFactory, @Nullable TrackSelector.Factory trackSelectorFactory) { - // TODO: b/381519379 - deprecate this constructor and replace with a builder. + // TODO: b/381519379 - Deprecate this constructor and replace with a builder. this.context = context; this.decoderFactory = decoderFactory; this.clock = clock; diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/ImageAssetLoader.java b/libraries/transformer/src/main/java/androidx/media3/transformer/ImageAssetLoader.java index 68e0c11121..7df49212f9 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/ImageAssetLoader.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/ImageAssetLoader.java @@ -207,8 +207,8 @@ public final class ImageAssetLoader implements AssetLoader { () -> queueBitmapInternal(bitmap, format), QUEUE_BITMAP_INTERVAL_MS, MILLISECONDS); return; } - // TODO(b/262693274): consider using listener.onDurationUs() or the MediaItem change - // callback rather than setting duration here. + // TODO: b/262693274 - Consider using listener.onDurationUs() or the MediaItem change callback + // rather than setting duration here. @InputResult int result = sampleConsumer.queueInputBitmap( diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/SequenceAssetLoader.java b/libraries/transformer/src/main/java/androidx/media3/transformer/SequenceAssetLoader.java index 4cc0cd94db..d161109c0a 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/SequenceAssetLoader.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/SequenceAssetLoader.java @@ -314,7 +314,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull; new SampleConsumerWrapper(wrappedAudioSampleConsumer, C.TRACK_TYPE_AUDIO)); } } else { - // TODO(b/270533049): Remove the check below when implementing blank video frames generation. + // TODO: b/270533049 - Remove the check below when implementing blank video frames generation. boolean videoTrackDisappeared = reportedTrackCount.get() == 1 && trackType == C.TRACK_TYPE_AUDIO diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/SequenceRenderersFactory.java b/libraries/transformer/src/main/java/androidx/media3/transformer/SequenceRenderersFactory.java index 92a253278f..0bdef28060 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/SequenceRenderersFactory.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/SequenceRenderersFactory.java @@ -218,7 +218,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull; @Nullable private EditedMediaItem pendingEditedMediaItem; private long pendingOffsetToCompositionTimeUs; - // TODO - b/320007703: Revisit the abstractions needed here (editedMediaItemProvider and + // TODO: b/320007703 - Revisit the abstractions needed here (editedMediaItemProvider and // Supplier) once we finish all the wiring to support multiple sequences. public SequenceAudioRenderer( Context context, @@ -504,7 +504,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull; super.onEnabled(joining, mayRenderStartOfStream); this.mayRenderStartOfStream = mayRenderStartOfStream; videoSink.onRendererEnabled(mayRenderStartOfStream); - // TODO - b/328444280: Do not set a listener on VideoSink, but MediaCodecVideoRenderer must + // TODO: b/328444280 - Do not set a listener on VideoSink, but MediaCodecVideoRenderer must // unregister itself as a listener too. videoSink.setListener(VideoSink.Listener.NO_OP, /* executor= */ (runnable) -> {}); } diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/SilentAudioGenerator.java b/libraries/transformer/src/main/java/androidx/media3/transformer/SilentAudioGenerator.java index de712da748..24c24827e6 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/SilentAudioGenerator.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/SilentAudioGenerator.java @@ -52,7 +52,7 @@ import java.util.concurrent.atomic.AtomicLong; // If the durationUs maps to a non-integer number of samples, then an extra sample is output. // In the worst case, this is one sample (~22us of audio) per media item. - // TODO(b/260618558): Track leftover duration when generating in mixer. + // TODO: b/260618558 - Track leftover duration when generating in mixer. remainingBytesToOutput.addAndGet(audioFormat.bytesPerFrame * outputFrameCount); } diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/TransformationRequest.java b/libraries/transformer/src/main/java/androidx/media3/transformer/TransformationRequest.java index eae549e010..a02112b38c 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/TransformationRequest.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/TransformationRequest.java @@ -124,7 +124,7 @@ public final class TransformationRequest { } @CanIgnoreReturnValue - // TODO(b/255953153): remove this method once fallback has been refactored. + // TODO: b/255953153 - Remove this method once fallback has been refactored. /* package */ Builder setResolution(int outputHeight) { this.outputHeight = outputHeight; return this; diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/Transformer.java b/libraries/transformer/src/main/java/androidx/media3/transformer/Transformer.java index 9a1fe0fdf0..551c5fe20b 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/Transformer.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/Transformer.java @@ -1665,7 +1665,7 @@ public final class Transformer { exportResultBuilder.setVideoEncoderName(videoEncoderName); } - // TODO(b/213341814): Add event flags for Transformer events. + // TODO: b/213341814 - Add event flags for Transformer events. transformerInternal = null; if (transformerState == TRANSFORMER_STATE_REMUX_PROCESSED_VIDEO) { processRemainingVideo(); diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/TransformerInternal.java b/libraries/transformer/src/main/java/androidx/media3/transformer/TransformerInternal.java index 127df7dfbc..b9176bd9bd 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/TransformerInternal.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/TransformerInternal.java @@ -529,7 +529,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull; int assetLoaderProgressState = sequenceAssetLoaders.get(i).getProgress(internalProgressHolder); if (assetLoaderProgressState != PROGRESS_STATE_AVAILABLE) { - // TODO - b/322136131 : Check for inconsistent state transitions. + // TODO: b/322136131 - Check for inconsistent state transitions. synchronized (progressLock) { progressState = assetLoaderProgressState; progressValue = 0; @@ -704,7 +704,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull; } else { Format firstFormat; if (MimeTypes.isVideo(assetLoaderOutputFormat.sampleMimeType)) { - // TODO(b/267301878): Pass firstAssetLoaderOutputFormat once surface creation not in VSP. + // TODO: b/267301878 - Pass firstAssetLoaderOutputFormat once surface creation not in VSP. boolean isMediaCodecToneMappingRequested = transformationRequest.hdrMode == HDR_MODE_TONE_MAP_HDR_TO_SDR_USING_MEDIACODEC; ColorInfo decoderOutputColor = diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/VideoSampleExporter.java b/libraries/transformer/src/main/java/androidx/media3/transformer/VideoSampleExporter.java index 60a05623b4..b92dec888f 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/VideoSampleExporter.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/VideoSampleExporter.java @@ -93,7 +93,7 @@ import org.checkerframework.dataflow.qual.Pure; boolean portraitEncodingEnabled, int maxFramesInEncoder) throws ExportException { - // TODO(b/278259383) Consider delaying configuration of VideoSampleExporter to use the decoder + // TODO: b/278259383 - Consider delaying configuration of VideoSampleExporter to use the decoder // output format instead of the extractor output format, to match AudioSampleExporter behavior. super(firstInputFormat, muxerWrapper); this.initialTimestampOffsetUs = initialTimestampOffsetUs; @@ -327,7 +327,7 @@ import org.checkerframework.dataflow.qual.Pure; .setCodecs(inputFormat.codecs) .build(); - // TODO - b/324426022: Move logic for supported mime types to DefaultEncoderFactory. + // TODO: b/324426022 - Move logic for supported mime types to DefaultEncoderFactory. encoder = encoderFactory.createForVideoEncoding( requestedEncoderFormat @@ -395,7 +395,7 @@ import org.checkerframework.dataflow.qual.Pure; Format requestedFormat, Format supportedFormat, @Composition.HdrMode int supportedHdrMode) { - // TODO(b/255953153): Consider including bitrate in the revised fallback. + // TODO: b/255953153 - Consider including bitrate in the revised fallback. TransformationRequest.Builder supportedRequestBuilder = transformationRequest.buildUpon(); if (transformationRequest.hdrMode != supportedHdrMode) { diff --git a/libraries/transformer/src/test/java/androidx/media3/transformer/DefaultAudioMixerTest.java b/libraries/transformer/src/test/java/androidx/media3/transformer/DefaultAudioMixerTest.java index d247a13801..d4f7f884c8 100644 --- a/libraries/transformer/src/test/java/androidx/media3/transformer/DefaultAudioMixerTest.java +++ b/libraries/transformer/src/test/java/androidx/media3/transformer/DefaultAudioMixerTest.java @@ -46,7 +46,7 @@ import org.robolectric.ParameterizedRobolectricTestRunner.Parameters; * For example, a buffer containing 4 float values (of {@link #AUDIO_FORMAT_STEREO_PCM_FLOAT}) would * be 2000us of data (4 values = 2 frames). */ -// TODO(b/290002720): Expand and generalize parameterized test cases. +// TODO: b/290002720 - Expand and generalize parameterized test cases. @RunWith(ParameterizedRobolectricTestRunner.class) public final class DefaultAudioMixerTest { diff --git a/libraries/transformer/src/test/java/androidx/media3/transformer/MediaItemExportTest.java b/libraries/transformer/src/test/java/androidx/media3/transformer/MediaItemExportTest.java index 09c4e8596e..74c79c1b43 100644 --- a/libraries/transformer/src/test/java/androidx/media3/transformer/MediaItemExportTest.java +++ b/libraries/transformer/src/test/java/androidx/media3/transformer/MediaItemExportTest.java @@ -152,7 +152,7 @@ public final class MediaItemExportTest { transformer.start(new Composition.Builder(gapSequence).build(), outputDir.newFile().getPath()); ExportResult result = TransformerTestRunner.runLooper(transformer); - // TODO(b/355201372) - Assert 500ms duration. + // TODO: b/355201372 - Assert 500ms duration. assertThat(result.durationMs).isAtLeast(487); assertThat(result.durationMs).isAtMost(500); @@ -992,7 +992,7 @@ public final class MediaItemExportTest { transformer.start(mediaItem, outputDir.newFile("second").getPath()); ExportResult exportResult = TransformerTestRunner.runLooper(transformer); - // TODO(b/264974805): Make export output deterministic and check it against dump file. + // TODO: b/264974805 - Make export output deterministic and check it against dump file. assertThat(exportResult.exportException).isNull(); } diff --git a/libraries/transformer/src/test/java/androidx/media3/transformer/SequenceExportTest.java b/libraries/transformer/src/test/java/androidx/media3/transformer/SequenceExportTest.java index ddb63bd69f..e710745e49 100644 --- a/libraries/transformer/src/test/java/androidx/media3/transformer/SequenceExportTest.java +++ b/libraries/transformer/src/test/java/androidx/media3/transformer/SequenceExportTest.java @@ -518,7 +518,7 @@ public final class SequenceExportTest { assertThat(getRootCause(exception)).hasMessageThat().isEqualTo("Gaps can not be transmuxed."); } - // TODO - b/369154363: Enable test after shouldTranscode inconsistency is resolved. + // TODO: b/369154363 - Enable test after shouldTranscode inconsistency is resolved. @Ignore @Test public void transmuxAudio_gapItem_throws() throws Exception {