From 86bd1df632ebd4ec7bd4e756d60bed3ccd3b8540 Mon Sep 17 00:00:00 2001
From: sheenachhabra <sheenachhabra@google.com>
Date: Fri, 2 Aug 2024 05:07:25 -0700
Subject: [PATCH] Move editable track type constants to container module

This is to share the constants with the extractor.

PiperOrigin-RevId: 658755661
---
 .../androidx/media3/container/Mp4Util.java    | 46 +++++++++++++++++++
 .../java/androidx/media3/muxer/Mp4Muxer.java  | 12 ++---
 2 files changed, 51 insertions(+), 7 deletions(-)
 create mode 100644 libraries/container/src/main/java/androidx/media3/container/Mp4Util.java

diff --git a/libraries/container/src/main/java/androidx/media3/container/Mp4Util.java b/libraries/container/src/main/java/androidx/media3/container/Mp4Util.java
new file mode 100644
index 0000000000..0ebcd1bb6a
--- /dev/null
+++ b/libraries/container/src/main/java/androidx/media3/container/Mp4Util.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.media3.container;
+
+import androidx.media3.common.util.UnstableApi;
+
+/** Utility methods for MP4 containers. */
+@UnstableApi
+public final class Mp4Util {
+  /** The original video track without any depth based effects applied. */
+  public static final int EDITABLE_TRACK_TYPE_SHARP = 0;
+
+  /**
+   * A linear encoded depth video track.
+   *
+   * <p>See https://developer.android.com/static/media/camera/camera2/Dynamic-depth-v1.0.pdf for
+   * linear depth encoding.
+   */
+  public static final int EDITABLE_TRACK_TYPE_DEPTH_LINEAR = 1;
+
+  /**
+   * An inverse encoded depth video track.
+   *
+   * <p>See https://developer.android.com/static/media/camera/camera2/Dynamic-depth-v1.0.pdf for
+   * inverse depth encoding.
+   */
+  public static final int EDITABLE_TRACK_TYPE_DEPTH_INVERSE = 2;
+
+  /** A timed metadata of depth video track. */
+  public static final int EDITABLE_TRACK_TYPE_DEPTH_METADATA = 3;
+
+  private Mp4Util() {}
+}
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 1dae3b2fb4..be35e7fd06 100644
--- a/libraries/muxer/src/main/java/androidx/media3/muxer/Mp4Muxer.java
+++ b/libraries/muxer/src/main/java/androidx/media3/muxer/Mp4Muxer.java
@@ -18,6 +18,10 @@ package androidx.media3.muxer;
 import static androidx.media3.common.util.Assertions.checkArgument;
 import static androidx.media3.common.util.Assertions.checkNotNull;
 import static androidx.media3.common.util.Assertions.checkState;
+import static androidx.media3.container.Mp4Util.EDITABLE_TRACK_TYPE_DEPTH_INVERSE;
+import static androidx.media3.container.Mp4Util.EDITABLE_TRACK_TYPE_DEPTH_LINEAR;
+import static androidx.media3.container.Mp4Util.EDITABLE_TRACK_TYPE_DEPTH_METADATA;
+import static androidx.media3.container.Mp4Util.EDITABLE_TRACK_TYPE_SHARP;
 import static java.lang.annotation.ElementType.TYPE_USE;
 
 import android.media.MediaCodec.BufferInfo;
@@ -272,12 +276,6 @@ public final class Mp4Muxer implements Muxer {
 
   private static final String TAG = "Mp4Muxer";
 
-  // TODO: b/295339654 - Move these constants to container module to share with the extractor.
-  private static final int EDITABLE_TRACK_TYPE_SHARP = 0;
-  private static final int EDITABLE_TRACK_TYPE_DEPTH_LINEAR = 1;
-  private static final int EDITABLE_TRACK_TYPE_DEPTH_INVERSE = 2;
-  private static final int EDITABLE_TRACK_TYPE_DEPTH_METADATA = 3;
-
   // 4 bytes (indicating a 64-bit length field) + 4 byte (box type) + 8 bytes (actual length)
   private static final int EDVD_BOX_HEADER_SIZE_BYTE = 16;
 
@@ -527,7 +525,7 @@ public final class Mp4Muxer implements Muxer {
           break;
         default:
           throw new IllegalArgumentException(
-              "Unsupported editable track type " + track.format.auxiliaryTrackType);
+              "Unsupported auxiliary track type " + track.format.auxiliaryTrackType);
       }
       data[i + 2] = (byte) trackType;
     }