From 307655f6d5f2dc3ba03430cded6f7d5be431f129 Mon Sep 17 00:00:00 2001
From: sheenachhabra <sheenachhabra@google.com>
Date: Thu, 20 Jun 2024 06:15:51 -0700
Subject: [PATCH] Move component initialization from Mp4Muxer.Builder to
 Mp4Muxer

PiperOrigin-RevId: 645004885
---
 .../java/androidx/media3/muxer/Mp4Muxer.java  | 39 +++++++++++--------
 1 file changed, 23 insertions(+), 16 deletions(-)

diff --git a/libraries/muxer/src/main/java/androidx/media3/muxer/Mp4Muxer.java b/libraries/muxer/src/main/java/androidx/media3/muxer/Mp4Muxer.java
index bf1df7419d..4d7a654f83 100644
--- a/libraries/muxer/src/main/java/androidx/media3/muxer/Mp4Muxer.java
+++ b/libraries/muxer/src/main/java/androidx/media3/muxer/Mp4Muxer.java
@@ -167,27 +167,34 @@ public final class Mp4Muxer implements Muxer {
 
     /** Builds an {@link Mp4Muxer} instance. */
     public Mp4Muxer build() {
-      MetadataCollector metadataCollector = new MetadataCollector();
-      Mp4MoovStructure moovStructure =
-          new Mp4MoovStructure(metadataCollector, lastFrameDurationBehavior);
-      Mp4Writer mp4Writer =
-          new Mp4Writer(
-              fileOutputStream,
-              moovStructure,
-              annexBToAvccConverter == null ? AnnexBToAvccConverter.DEFAULT : annexBToAvccConverter,
-              sampleCopyEnabled,
-              attemptStreamableOutputEnabled);
-
-      return new Mp4Muxer(mp4Writer, metadataCollector);
+      return new Mp4Muxer(
+          fileOutputStream,
+          lastFrameDurationBehavior,
+          annexBToAvccConverter == null ? AnnexBToAvccConverter.DEFAULT : annexBToAvccConverter,
+          sampleCopyEnabled,
+          attemptStreamableOutputEnabled);
     }
   }
 
-  private final Mp4Writer mp4Writer;
   private final MetadataCollector metadataCollector;
+  private final Mp4Writer mp4Writer;
 
-  private Mp4Muxer(Mp4Writer mp4Writer, MetadataCollector metadataCollector) {
-    this.mp4Writer = mp4Writer;
-    this.metadataCollector = metadataCollector;
+  private Mp4Muxer(
+      FileOutputStream fileOutputStream,
+      @LastFrameDurationBehavior int lastFrameDurationBehavior,
+      AnnexBToAvccConverter annexBToAvccConverter,
+      boolean sampleCopyEnabled,
+      boolean attemptStreamableOutputEnabled) {
+    metadataCollector = new MetadataCollector();
+    Mp4MoovStructure moovStructure =
+        new Mp4MoovStructure(metadataCollector, lastFrameDurationBehavior);
+    mp4Writer =
+        new Mp4Writer(
+            fileOutputStream,
+            moovStructure,
+            annexBToAvccConverter,
+            sampleCopyEnabled,
+            attemptStreamableOutputEnabled);
   }
 
   /**