From 6d014cbfd220504c80fb531f84182c458fa8266b Mon Sep 17 00:00:00 2001 From: bachinger Date: Wed, 29 Sep 2021 13:23:43 +0100 Subject: [PATCH] Move SubtitleExtractor to text package PiperOrigin-RevId: 399661676 --- .../source/DefaultMediaSourceFactory.java | 2 +- .../extractor/text/package-info.java | 19 ------------------- .../text/SubtitleExtractor.java | 8 +------- .../text/SubtitleExtractorTest.java | 4 +--- 4 files changed, 3 insertions(+), 30 deletions(-) delete mode 100644 library/extractor/src/main/java/com/google/android/exoplayer2/extractor/text/package-info.java rename library/extractor/src/main/java/com/google/android/exoplayer2/{extractor => }/text/SubtitleExtractor.java (95%) rename library/extractor/src/test/java/com/google/android/exoplayer2/{extractor => }/text/SubtitleExtractorTest.java (98%) diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/DefaultMediaSourceFactory.java b/library/core/src/main/java/com/google/android/exoplayer2/source/DefaultMediaSourceFactory.java index b301a3d2d1..bdba5330c1 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/source/DefaultMediaSourceFactory.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/source/DefaultMediaSourceFactory.java @@ -28,10 +28,10 @@ import com.google.android.exoplayer2.drm.DrmSessionManagerProvider; import com.google.android.exoplayer2.extractor.DefaultExtractorsFactory; import com.google.android.exoplayer2.extractor.Extractor; import com.google.android.exoplayer2.extractor.ExtractorsFactory; -import com.google.android.exoplayer2.extractor.text.SubtitleExtractor; import com.google.android.exoplayer2.offline.StreamKey; import com.google.android.exoplayer2.source.ads.AdsLoader; import com.google.android.exoplayer2.source.ads.AdsMediaSource; +import com.google.android.exoplayer2.text.SubtitleExtractor; import com.google.android.exoplayer2.text.webvtt.WebvttDecoder; import com.google.android.exoplayer2.ui.AdViewProvider; import com.google.android.exoplayer2.upstream.DataSource; diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/text/package-info.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/text/package-info.java deleted file mode 100644 index dc920e8302..0000000000 --- a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/text/package-info.java +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright 2021 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. - */ -@NonNullApi -package com.google.android.exoplayer2.extractor.text; - -import com.google.android.exoplayer2.util.NonNullApi; diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/text/SubtitleExtractor.java b/library/extractor/src/main/java/com/google/android/exoplayer2/text/SubtitleExtractor.java similarity index 95% rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/text/SubtitleExtractor.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/text/SubtitleExtractor.java index 1552dd1c4a..3642ff177e 100644 --- a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/text/SubtitleExtractor.java +++ b/library/extractor/src/main/java/com/google/android/exoplayer2/text/SubtitleExtractor.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.exoplayer2.extractor.text; +package com.google.android.exoplayer2.text; import static com.google.android.exoplayer2.util.Assertions.checkState; import static com.google.android.exoplayer2.util.Assertions.checkStateNotNull; @@ -29,12 +29,6 @@ import com.google.android.exoplayer2.extractor.ExtractorOutput; import com.google.android.exoplayer2.extractor.IndexSeekMap; import com.google.android.exoplayer2.extractor.PositionHolder; import com.google.android.exoplayer2.extractor.TrackOutput; -import com.google.android.exoplayer2.text.Cue; -import com.google.android.exoplayer2.text.CueEncoder; -import com.google.android.exoplayer2.text.SubtitleDecoder; -import com.google.android.exoplayer2.text.SubtitleDecoderException; -import com.google.android.exoplayer2.text.SubtitleInputBuffer; -import com.google.android.exoplayer2.text.SubtitleOutputBuffer; import com.google.android.exoplayer2.util.MimeTypes; import com.google.android.exoplayer2.util.ParsableByteArray; import com.google.android.exoplayer2.util.Util; diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/text/SubtitleExtractorTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/text/SubtitleExtractorTest.java similarity index 98% rename from library/extractor/src/test/java/com/google/android/exoplayer2/extractor/text/SubtitleExtractorTest.java rename to library/extractor/src/test/java/com/google/android/exoplayer2/text/SubtitleExtractorTest.java index 2427790dce..8e09ef0662 100644 --- a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/text/SubtitleExtractorTest.java +++ b/library/extractor/src/test/java/com/google/android/exoplayer2/text/SubtitleExtractorTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.exoplayer2.extractor.text; +package com.google.android.exoplayer2.text; import static com.google.common.truth.Truth.assertThat; import static org.junit.Assert.assertThrows; @@ -24,8 +24,6 @@ import com.google.android.exoplayer2.extractor.Extractor; import com.google.android.exoplayer2.testutil.FakeExtractorInput; import com.google.android.exoplayer2.testutil.FakeExtractorOutput; import com.google.android.exoplayer2.testutil.FakeTrackOutput; -import com.google.android.exoplayer2.text.Cue; -import com.google.android.exoplayer2.text.CueDecoder; import com.google.android.exoplayer2.text.webvtt.WebvttDecoder; import com.google.android.exoplayer2.util.MimeTypes; import com.google.android.exoplayer2.util.Util;