From d4ce4480ed093536de7b894c3892f3ab37512a08 Mon Sep 17 00:00:00 2001 From: samrobinson Date: Fri, 20 Jan 2023 17:42:58 +0000 Subject: [PATCH] Move AudioMixer classes from transformer.audio to transformer package. Transformer convention has been to avoid splitting into packages unless necessary. See https://jlbp.dev/JLBP-2: "Prefer fewer packages over more packages to avoid unnecessarily publicizing internal details, since any dependency across package boundaries needs to be public. PiperOrigin-RevId: 503463294 --- .../transformer/{audio => }/AudioMixer.java | 2 +- .../{audio => }/AudioMixerImpl.java | 2 +- .../{audio => }/AudioMixingAlgorithm.java | 2 +- .../{audio => }/ChannelMixingMatrix.java | 2 +- .../FloatAudioMixingAlgorithm.java | 2 +- .../transformer/audio/package-info.java | 19 ------------------- .../{audio => }/AudioMixerImplTest.java | 2 +- .../FloatAudioMixingAlgorithmTest.java | 2 +- 8 files changed, 7 insertions(+), 26 deletions(-) rename libraries/transformer/src/main/java/androidx/media3/transformer/{audio => }/AudioMixer.java (99%) rename libraries/transformer/src/main/java/androidx/media3/transformer/{audio => }/AudioMixerImpl.java (99%) rename libraries/transformer/src/main/java/androidx/media3/transformer/{audio => }/AudioMixingAlgorithm.java (98%) rename libraries/transformer/src/main/java/androidx/media3/transformer/{audio => }/ChannelMixingMatrix.java (99%) rename libraries/transformer/src/main/java/androidx/media3/transformer/{audio => }/FloatAudioMixingAlgorithm.java (99%) delete mode 100644 libraries/transformer/src/main/java/androidx/media3/transformer/audio/package-info.java rename libraries/transformer/src/test/java/androidx/media3/transformer/{audio => }/AudioMixerImplTest.java (99%) rename libraries/transformer/src/test/java/androidx/media3/transformer/{audio => }/FloatAudioMixingAlgorithmTest.java (99%) diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/audio/AudioMixer.java b/libraries/transformer/src/main/java/androidx/media3/transformer/AudioMixer.java similarity index 99% rename from libraries/transformer/src/main/java/androidx/media3/transformer/audio/AudioMixer.java rename to libraries/transformer/src/main/java/androidx/media3/transformer/AudioMixer.java index fffad68444..25e92a58c9 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/audio/AudioMixer.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/AudioMixer.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package androidx.media3.transformer.audio; +package androidx.media3.transformer; import androidx.media3.common.audio.AudioProcessor.AudioFormat; import androidx.media3.common.audio.AudioProcessor.UnhandledAudioFormatException; diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/audio/AudioMixerImpl.java b/libraries/transformer/src/main/java/androidx/media3/transformer/AudioMixerImpl.java similarity index 99% rename from libraries/transformer/src/main/java/androidx/media3/transformer/audio/AudioMixerImpl.java rename to libraries/transformer/src/main/java/androidx/media3/transformer/AudioMixerImpl.java index 57dc923981..5ae4c72c27 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/audio/AudioMixerImpl.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/AudioMixerImpl.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package androidx.media3.transformer.audio; +package androidx.media3.transformer; import static androidx.media3.common.util.Assertions.checkArgument; import static androidx.media3.common.util.Assertions.checkNotNull; diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/audio/AudioMixingAlgorithm.java b/libraries/transformer/src/main/java/androidx/media3/transformer/AudioMixingAlgorithm.java similarity index 98% rename from libraries/transformer/src/main/java/androidx/media3/transformer/audio/AudioMixingAlgorithm.java rename to libraries/transformer/src/main/java/androidx/media3/transformer/AudioMixingAlgorithm.java index 8124f9c337..57e234ccf1 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/audio/AudioMixingAlgorithm.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/AudioMixingAlgorithm.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package androidx.media3.transformer.audio; +package androidx.media3.transformer; import android.annotation.SuppressLint; import androidx.media3.common.C; diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/audio/ChannelMixingMatrix.java b/libraries/transformer/src/main/java/androidx/media3/transformer/ChannelMixingMatrix.java similarity index 99% rename from libraries/transformer/src/main/java/androidx/media3/transformer/audio/ChannelMixingMatrix.java rename to libraries/transformer/src/main/java/androidx/media3/transformer/ChannelMixingMatrix.java index d1a4c010a2..9cc87ada11 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/audio/ChannelMixingMatrix.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/ChannelMixingMatrix.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package androidx.media3.transformer.audio; +package androidx.media3.transformer; import static androidx.media3.common.util.Assertions.checkArgument; diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/audio/FloatAudioMixingAlgorithm.java b/libraries/transformer/src/main/java/androidx/media3/transformer/FloatAudioMixingAlgorithm.java similarity index 99% rename from libraries/transformer/src/main/java/androidx/media3/transformer/audio/FloatAudioMixingAlgorithm.java rename to libraries/transformer/src/main/java/androidx/media3/transformer/FloatAudioMixingAlgorithm.java index 5d9a4d7e30..7ac4199aae 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/audio/FloatAudioMixingAlgorithm.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/FloatAudioMixingAlgorithm.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package androidx.media3.transformer.audio; +package androidx.media3.transformer; import static androidx.media3.common.util.Assertions.checkArgument; diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/audio/package-info.java b/libraries/transformer/src/main/java/androidx/media3/transformer/audio/package-info.java deleted file mode 100644 index 8a705c7e41..0000000000 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/audio/package-info.java +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright 2022 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 androidx.media3.transformer.audio; - -import androidx.media3.common.util.NonNullApi; diff --git a/libraries/transformer/src/test/java/androidx/media3/transformer/audio/AudioMixerImplTest.java b/libraries/transformer/src/test/java/androidx/media3/transformer/AudioMixerImplTest.java similarity index 99% rename from libraries/transformer/src/test/java/androidx/media3/transformer/audio/AudioMixerImplTest.java rename to libraries/transformer/src/test/java/androidx/media3/transformer/AudioMixerImplTest.java index 2f9569d064..ca1fdf66c5 100644 --- a/libraries/transformer/src/test/java/androidx/media3/transformer/audio/AudioMixerImplTest.java +++ b/libraries/transformer/src/test/java/androidx/media3/transformer/AudioMixerImplTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package androidx.media3.transformer.audio; +package androidx.media3.transformer; import static com.google.common.truth.Truth.assertThat; diff --git a/libraries/transformer/src/test/java/androidx/media3/transformer/audio/FloatAudioMixingAlgorithmTest.java b/libraries/transformer/src/test/java/androidx/media3/transformer/FloatAudioMixingAlgorithmTest.java similarity index 99% rename from libraries/transformer/src/test/java/androidx/media3/transformer/audio/FloatAudioMixingAlgorithmTest.java rename to libraries/transformer/src/test/java/androidx/media3/transformer/FloatAudioMixingAlgorithmTest.java index 7f2e903378..095d5e7333 100644 --- a/libraries/transformer/src/test/java/androidx/media3/transformer/audio/FloatAudioMixingAlgorithmTest.java +++ b/libraries/transformer/src/test/java/androidx/media3/transformer/FloatAudioMixingAlgorithmTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package androidx.media3.transformer.audio; +package androidx.media3.transformer; import static com.google.common.truth.Truth.assertThat;