From 598ec00c5d7b2e7f6dc5c1c3711db54aaf67100a Mon Sep 17 00:00:00 2001
From: Googler <noreply@google.com>
Date: Wed, 26 Mar 2025 02:41:53 -0700
Subject: [PATCH] DolbyVisionConfig: Move file to the container library.

For usage of instance of `DolbyVisionConfig` used in Muxer to support Dolby Vision codec, move `DolbyVisionConfig` file from extractor library to container library.

PiperOrigin-RevId: 740689000
---
 .../main/java/androidx/media3/container}/DolbyVisionConfig.java | 2 +-
 .../java/androidx/media3/extractor/mkv/MatroskaExtractor.java   | 2 +-
 .../src/main/java/androidx/media3/extractor/mp4/BoxParser.java  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename libraries/{extractor/src/main/java/androidx/media3/extractor => container/src/main/java/androidx/media3/container}/DolbyVisionConfig.java (98%)

diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/DolbyVisionConfig.java b/libraries/container/src/main/java/androidx/media3/container/DolbyVisionConfig.java
similarity index 98%
rename from libraries/extractor/src/main/java/androidx/media3/extractor/DolbyVisionConfig.java
rename to libraries/container/src/main/java/androidx/media3/container/DolbyVisionConfig.java
index 461c6f35e8..7af4f691d8 100644
--- a/libraries/extractor/src/main/java/androidx/media3/extractor/DolbyVisionConfig.java
+++ b/libraries/container/src/main/java/androidx/media3/container/DolbyVisionConfig.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package androidx.media3.extractor;
+package androidx.media3.container;
 
 import androidx.annotation.Nullable;
 import androidx.media3.common.util.ParsableByteArray;
diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/mkv/MatroskaExtractor.java b/libraries/extractor/src/main/java/androidx/media3/extractor/mkv/MatroskaExtractor.java
index 405951074c..d88d1abe92 100644
--- a/libraries/extractor/src/main/java/androidx/media3/extractor/mkv/MatroskaExtractor.java
+++ b/libraries/extractor/src/main/java/androidx/media3/extractor/mkv/MatroskaExtractor.java
@@ -41,11 +41,11 @@ import androidx.media3.common.util.NullableType;
 import androidx.media3.common.util.ParsableByteArray;
 import androidx.media3.common.util.UnstableApi;
 import androidx.media3.common.util.Util;
+import androidx.media3.container.DolbyVisionConfig;
 import androidx.media3.container.NalUnitUtil;
 import androidx.media3.extractor.AacUtil;
 import androidx.media3.extractor.AvcConfig;
 import androidx.media3.extractor.ChunkIndex;
-import androidx.media3.extractor.DolbyVisionConfig;
 import androidx.media3.extractor.Extractor;
 import androidx.media3.extractor.ExtractorInput;
 import androidx.media3.extractor.ExtractorOutput;
diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/mp4/BoxParser.java b/libraries/extractor/src/main/java/androidx/media3/extractor/mp4/BoxParser.java
index f8f9a82474..d61b5fd8bf 100644
--- a/libraries/extractor/src/main/java/androidx/media3/extractor/mp4/BoxParser.java
+++ b/libraries/extractor/src/main/java/androidx/media3/extractor/mp4/BoxParser.java
@@ -36,6 +36,7 @@ import androidx.media3.common.util.ParsableBitArray;
 import androidx.media3.common.util.ParsableByteArray;
 import androidx.media3.common.util.UnstableApi;
 import androidx.media3.common.util.Util;
+import androidx.media3.container.DolbyVisionConfig;
 import androidx.media3.container.Mp4Box;
 import androidx.media3.container.Mp4Box.LeafBox;
 import androidx.media3.container.Mp4LocationData;
@@ -45,7 +46,6 @@ import androidx.media3.extractor.AacUtil;
 import androidx.media3.extractor.Ac3Util;
 import androidx.media3.extractor.Ac4Util;
 import androidx.media3.extractor.AvcConfig;
-import androidx.media3.extractor.DolbyVisionConfig;
 import androidx.media3.extractor.ExtractorUtil;
 import androidx.media3.extractor.GaplessInfoHolder;
 import androidx.media3.extractor.HevcConfig;