From 6c92402fbb8715864f5dd2827014939f2e489951 Mon Sep 17 00:00:00 2001
From: claincly <claincly@google.com>
Date: Fri, 13 Sep 2024 05:42:05 -0700
Subject: [PATCH] Re-enable audio tests

The tests were flaky because CompositionPlayer registers audio sequences'
formats to the audio pipeline in first-come-first-serve order. With the change
in https://github.com/androidx/media/commit/bc8d82355f83fef9dfab88042ce1ca2d67da6ee1, the audio format is deterministic.

The test is turned off in https://github.com/androidx/media/commit/060356ea0026efa516cc3b2973cf0743d4b3d797

PiperOrigin-RevId: 674261801
---
 ...LoopingSequence_outputsCorrectSamples.dump | 27 ++++-----
 ...LoopingSequence_outputsCorrectSamples.dump | 58 +++++++++----------
 .../CompositionPlayerAudioPlaybackTest.java   | 10 +++-
 3 files changed, 49 insertions(+), 46 deletions(-)

diff --git a/libraries/test_data/src/test/assets/audiosinkdumps/wav/compositionPlayback_withLongLoopingSequence_outputsCorrectSamples.dump b/libraries/test_data/src/test/assets/audiosinkdumps/wav/compositionPlayback_withLongLoopingSequence_outputsCorrectSamples.dump
index 0e744f2ca5..c1a65c79e8 100644
--- a/libraries/test_data/src/test/assets/audiosinkdumps/wav/compositionPlayback_withLongLoopingSequence_outputsCorrectSamples.dump
+++ b/libraries/test_data/src/test/assets/audiosinkdumps/wav/compositionPlayback_withLongLoopingSequence_outputsCorrectSamples.dump
@@ -1,24 +1,21 @@
 AudioSink:
-  buffer count = 6
+  buffer count = 5
   config:
     pcmEncoding = 2
-    channelCount = 1
-    sampleRate = 44100
+    channelCount = 2
+    sampleRate = 48000
   buffer #0:
     time = 0
-    data = -419876658
+    data = -1785476476
   buffer #1:
-    time = 100000
-    data = -1236081112
+    time = 99979
+    data = -995510253
   buffer #2:
-    time = 200000
-    data = -1630460924
+    time = 199979
+    data = -100986875
   buffer #3:
-    time = 300000
-    data = 1478130841
+    time = 299979
+    data = -1230909835
   buffer #4:
-    time = 348616
-    data = -2449
-  buffer #5:
-    time = 348639
-    data = -68458611
+    time = 348625
+    data = 2027536289
diff --git a/libraries/test_data/src/test/assets/audiosinkdumps/wav/compositionPlayback_withShortLoopingSequence_outputsCorrectSamples.dump b/libraries/test_data/src/test/assets/audiosinkdumps/wav/compositionPlayback_withShortLoopingSequence_outputsCorrectSamples.dump
index 763cd8c111..cb0cd31193 100644
--- a/libraries/test_data/src/test/assets/audiosinkdumps/wav/compositionPlayback_withShortLoopingSequence_outputsCorrectSamples.dump
+++ b/libraries/test_data/src/test/assets/audiosinkdumps/wav/compositionPlayback_withShortLoopingSequence_outputsCorrectSamples.dump
@@ -6,49 +6,49 @@ AudioSink:
     sampleRate = 44100
   buffer #0:
     time = 0
-    data = -419876658
+    data = 1706022979
   buffer #1:
-    time = 100000
-    data = -1236081112
+    time = 99977
+    data = 1541115356
   buffer #2:
-    time = 200000
-    data = -1630460924
+    time = 199977
+    data = 341106942
   buffer #3:
-    time = 300000
-    data = 1478130841
+    time = 299977
+    data = -1992982146
   buffer #4:
-    time = 348616
-    data = -2449
+    time = 348594
+    data = 4868
   buffer #5:
-    time = 348639
-    data = 590036013
+    time = 348616
+    data = -1047158121
   buffer #6:
-    time = 448639
-    data = -61907402
+    time = 448594
+    data = -1021252215
   buffer #7:
     time = 500000
-    data = -404977619
+    data = 89001355
   buffer #8:
-    time = 648639
-    data = -1276039913
+    time = 648594
+    data = -1816847093
   buffer #9:
-    time = 697256
-    data = -1085
+    time = 697210
+    data = -2169
   buffer #10:
-    time = 697278
-    data = -317156192
+    time = 697233
+    data = 2010934765
   buffer #11:
-    time = 797278
-    data = -1765342951
+    time = 797210
+    data = -1695720012
   buffer #12:
-    time = 897278
-    data = 1454848200
+    time = 897210
+    data = -442710574
   buffer #13:
-    time = 997278
-    data = -111836408
+    time = 997210
+    data = 1560378480
   buffer #14:
     time = 1000000
-    data = -1471531958
+    data = 727414841
   buffer #15:
-    time = 1045895
-    data = -2263
+    time = 1045827
+    data = -2944
diff --git a/libraries/transformer/src/test/java/androidx/media3/transformer/CompositionPlayerAudioPlaybackTest.java b/libraries/transformer/src/test/java/androidx/media3/transformer/CompositionPlayerAudioPlaybackTest.java
index f72eff563b..59b8d43685 100644
--- a/libraries/transformer/src/test/java/androidx/media3/transformer/CompositionPlayerAudioPlaybackTest.java
+++ b/libraries/transformer/src/test/java/androidx/media3/transformer/CompositionPlayerAudioPlaybackTest.java
@@ -289,7 +289,10 @@ public final class CompositionPlayerAudioPlaybackTest {
     TestPlayerRunHelper.runUntilPlaybackState(player, Player.STATE_ENDED);
     player.release();
 
-    // TODO: b/363229593 - Change dump file after format handling is fixed.
+    DumpFileAsserts.assertOutput(
+        context,
+        capturingAudioSink,
+        "audiosinkdumps/wav/compositionPlayback_withShortLoopingSequence_outputsCorrectSamples.dump");
   }
 
   @Test
@@ -315,7 +318,10 @@ public final class CompositionPlayerAudioPlaybackTest {
     TestPlayerRunHelper.runUntilPlaybackState(player, Player.STATE_ENDED);
     player.release();
 
-    // TODO: b/363229593 - Change dump file after format handling is fixed.
+    DumpFileAsserts.assertOutput(
+        context,
+        capturingAudioSink,
+        "audiosinkdumps/wav/compositionPlayback_withLongLoopingSequence_outputsCorrectSamples.dump");
   }
 
   @Test