From 7b62b33127a617cc3b7b23f21c385f2329e402a3 Mon Sep 17 00:00:00 2001
From: sheenachhabra <sheenachhabra@google.com>
Date: Wed, 17 May 2023 15:41:16 +0100
Subject: [PATCH] Move Mp4LocationData from extractor module to container
 module

This class will be shared between extractor and muxer module.

PiperOrigin-RevId: 532784415
---
 .../main/java/androidx/media3/container}/Mp4LocationData.java   | 2 +-
 .../main/java/androidx/media3/extractor/mp4/AtomParsers.java    | 2 +-
 libraries/transformer/build.gradle                              | 1 +
 .../main/java/androidx/media3/transformer/FrameworkMuxer.java   | 2 +-
 .../src/main/java/androidx/media3/transformer/InAppMuxer.java   | 2 +-
 5 files changed, 5 insertions(+), 4 deletions(-)
 rename libraries/{extractor/src/main/java/androidx/media3/extractor/metadata/mp4 => container/src/main/java/androidx/media3/container}/Mp4LocationData.java (98%)

diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/metadata/mp4/Mp4LocationData.java b/libraries/container/src/main/java/androidx/media3/container/Mp4LocationData.java
similarity index 98%
rename from libraries/extractor/src/main/java/androidx/media3/extractor/metadata/mp4/Mp4LocationData.java
rename to libraries/container/src/main/java/androidx/media3/container/Mp4LocationData.java
index 7ae6dd25e6..f645dc2eca 100644
--- a/libraries/extractor/src/main/java/androidx/media3/extractor/metadata/mp4/Mp4LocationData.java
+++ b/libraries/container/src/main/java/androidx/media3/container/Mp4LocationData.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package androidx.media3.extractor.metadata.mp4;
+package androidx.media3.container;
 
 import android.os.Parcel;
 import android.os.Parcelable;
diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/mp4/AtomParsers.java b/libraries/extractor/src/main/java/androidx/media3/extractor/mp4/AtomParsers.java
index 6c79e5f3d6..e950696b2b 100644
--- a/libraries/extractor/src/main/java/androidx/media3/extractor/mp4/AtomParsers.java
+++ b/libraries/extractor/src/main/java/androidx/media3/extractor/mp4/AtomParsers.java
@@ -33,6 +33,7 @@ import androidx.media3.common.util.CodecSpecificDataUtil;
 import androidx.media3.common.util.Log;
 import androidx.media3.common.util.ParsableByteArray;
 import androidx.media3.common.util.Util;
+import androidx.media3.container.Mp4LocationData;
 import androidx.media3.extractor.AacUtil;
 import androidx.media3.extractor.Ac3Util;
 import androidx.media3.extractor.Ac4Util;
@@ -42,7 +43,6 @@ import androidx.media3.extractor.ExtractorUtil;
 import androidx.media3.extractor.GaplessInfoHolder;
 import androidx.media3.extractor.HevcConfig;
 import androidx.media3.extractor.OpusUtil;
-import androidx.media3.extractor.metadata.mp4.Mp4LocationData;
 import androidx.media3.extractor.metadata.mp4.SmtaMetadataEntry;
 import androidx.media3.extractor.mp4.Atom.LeafAtom;
 import com.google.common.base.Function;
diff --git a/libraries/transformer/build.gradle b/libraries/transformer/build.gradle
index 66662035b0..790effdffd 100644
--- a/libraries/transformer/build.gradle
+++ b/libraries/transformer/build.gradle
@@ -37,6 +37,7 @@ android {
 dependencies {
     implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion
     implementation project(modulePrefix + 'lib-datasource')
+    implementation project(modulePrefix + 'lib-container')
     implementation project(modulePrefix + 'lib-exoplayer')
     implementation project(modulePrefix + 'lib-effect')
     implementation project(modulePrefix + 'lib-muxer')
diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/FrameworkMuxer.java b/libraries/transformer/src/main/java/androidx/media3/transformer/FrameworkMuxer.java
index a78234984b..6a3a86f49e 100644
--- a/libraries/transformer/src/main/java/androidx/media3/transformer/FrameworkMuxer.java
+++ b/libraries/transformer/src/main/java/androidx/media3/transformer/FrameworkMuxer.java
@@ -31,7 +31,7 @@ import androidx.media3.common.Metadata;
 import androidx.media3.common.MimeTypes;
 import androidx.media3.common.util.MediaFormatUtil;
 import androidx.media3.common.util.Util;
-import androidx.media3.extractor.metadata.mp4.Mp4LocationData;
+import androidx.media3.container.Mp4LocationData;
 import com.google.common.collect.ImmutableList;
 import java.io.IOException;
 import java.lang.reflect.Field;
diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/InAppMuxer.java b/libraries/transformer/src/main/java/androidx/media3/transformer/InAppMuxer.java
index 42e9f9118b..31d5cefbb4 100644
--- a/libraries/transformer/src/main/java/androidx/media3/transformer/InAppMuxer.java
+++ b/libraries/transformer/src/main/java/androidx/media3/transformer/InAppMuxer.java
@@ -24,7 +24,7 @@ import androidx.media3.common.Format;
 import androidx.media3.common.Metadata;
 import androidx.media3.common.MimeTypes;
 import androidx.media3.common.util.UnstableApi;
-import androidx.media3.extractor.metadata.mp4.Mp4LocationData;
+import androidx.media3.container.Mp4LocationData;
 import androidx.media3.muxer.Mp4Muxer;
 import androidx.media3.muxer.Mp4Muxer.TrackToken;
 import com.google.common.collect.ImmutableList;