From f440fea7382fc5f1a956205d777d4f0128b4b15b 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 library/transformer/src/main/java/com/google/android/exoplayer2/transformer/{audio => }/AudioMixer.java (99%) rename library/transformer/src/main/java/com/google/android/exoplayer2/transformer/{audio => }/AudioMixerImpl.java (99%) rename library/transformer/src/main/java/com/google/android/exoplayer2/transformer/{audio => }/AudioMixingAlgorithm.java (98%) rename library/transformer/src/main/java/com/google/android/exoplayer2/transformer/{audio => }/ChannelMixingMatrix.java (99%) rename library/transformer/src/main/java/com/google/android/exoplayer2/transformer/{audio => }/FloatAudioMixingAlgorithm.java (99%) delete mode 100644 library/transformer/src/main/java/com/google/android/exoplayer2/transformer/audio/package-info.java rename library/transformer/src/test/java/com/google/android/exoplayer2/transformer/{audio => }/AudioMixerImplTest.java (99%) rename library/transformer/src/test/java/com/google/android/exoplayer2/transformer/{audio => }/FloatAudioMixingAlgorithmTest.java (99%) diff --git a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/audio/AudioMixer.java b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/AudioMixer.java similarity index 99% rename from library/transformer/src/main/java/com/google/android/exoplayer2/transformer/audio/AudioMixer.java rename to library/transformer/src/main/java/com/google/android/exoplayer2/transformer/AudioMixer.java index c01aca6f4a..72e6f4087f 100644 --- a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/audio/AudioMixer.java +++ b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/AudioMixer.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.exoplayer2.transformer.audio; +package com.google.android.exoplayer2.transformer; import com.google.android.exoplayer2.audio.AudioProcessor.AudioFormat; import com.google.android.exoplayer2.audio.AudioProcessor.UnhandledAudioFormatException; diff --git a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/audio/AudioMixerImpl.java b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/AudioMixerImpl.java similarity index 99% rename from library/transformer/src/main/java/com/google/android/exoplayer2/transformer/audio/AudioMixerImpl.java rename to library/transformer/src/main/java/com/google/android/exoplayer2/transformer/AudioMixerImpl.java index 5ea1b9e247..4f8ba8e0ca 100644 --- a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/audio/AudioMixerImpl.java +++ b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/AudioMixerImpl.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.exoplayer2.transformer.audio; +package com.google.android.exoplayer2.transformer; import static com.google.android.exoplayer2.util.Assertions.checkArgument; import static com.google.android.exoplayer2.util.Assertions.checkNotNull; diff --git a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/audio/AudioMixingAlgorithm.java b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/AudioMixingAlgorithm.java similarity index 98% rename from library/transformer/src/main/java/com/google/android/exoplayer2/transformer/audio/AudioMixingAlgorithm.java rename to library/transformer/src/main/java/com/google/android/exoplayer2/transformer/AudioMixingAlgorithm.java index 5c0d4de4be..47741cafa5 100644 --- a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/audio/AudioMixingAlgorithm.java +++ b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/AudioMixingAlgorithm.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.exoplayer2.transformer.audio; +package com.google.android.exoplayer2.transformer; import android.annotation.SuppressLint; import com.google.android.exoplayer2.C; diff --git a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/audio/ChannelMixingMatrix.java b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/ChannelMixingMatrix.java similarity index 99% rename from library/transformer/src/main/java/com/google/android/exoplayer2/transformer/audio/ChannelMixingMatrix.java rename to library/transformer/src/main/java/com/google/android/exoplayer2/transformer/ChannelMixingMatrix.java index 27a039e955..2f429efa06 100644 --- a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/audio/ChannelMixingMatrix.java +++ b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/ChannelMixingMatrix.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.exoplayer2.transformer.audio; +package com.google.android.exoplayer2.transformer; import static com.google.android.exoplayer2.util.Assertions.checkArgument; diff --git a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/audio/FloatAudioMixingAlgorithm.java b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/FloatAudioMixingAlgorithm.java similarity index 99% rename from library/transformer/src/main/java/com/google/android/exoplayer2/transformer/audio/FloatAudioMixingAlgorithm.java rename to library/transformer/src/main/java/com/google/android/exoplayer2/transformer/FloatAudioMixingAlgorithm.java index a120a3566f..78c53b3d92 100644 --- a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/audio/FloatAudioMixingAlgorithm.java +++ b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/FloatAudioMixingAlgorithm.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.exoplayer2.transformer.audio; +package com.google.android.exoplayer2.transformer; import static com.google.android.exoplayer2.util.Assertions.checkArgument; diff --git a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/audio/package-info.java b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/audio/package-info.java deleted file mode 100644 index 82a3414539..0000000000 --- a/library/transformer/src/main/java/com/google/android/exoplayer2/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 com.google.android.exoplayer2.transformer.audio; - -import com.google.android.exoplayer2.util.NonNullApi; diff --git a/library/transformer/src/test/java/com/google/android/exoplayer2/transformer/audio/AudioMixerImplTest.java b/library/transformer/src/test/java/com/google/android/exoplayer2/transformer/AudioMixerImplTest.java similarity index 99% rename from library/transformer/src/test/java/com/google/android/exoplayer2/transformer/audio/AudioMixerImplTest.java rename to library/transformer/src/test/java/com/google/android/exoplayer2/transformer/AudioMixerImplTest.java index 901c0f69b7..6c008ebbac 100644 --- a/library/transformer/src/test/java/com/google/android/exoplayer2/transformer/audio/AudioMixerImplTest.java +++ b/library/transformer/src/test/java/com/google/android/exoplayer2/transformer/AudioMixerImplTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.exoplayer2.transformer.audio; +package com.google.android.exoplayer2.transformer; import static com.google.common.truth.Truth.assertThat; diff --git a/library/transformer/src/test/java/com/google/android/exoplayer2/transformer/audio/FloatAudioMixingAlgorithmTest.java b/library/transformer/src/test/java/com/google/android/exoplayer2/transformer/FloatAudioMixingAlgorithmTest.java similarity index 99% rename from library/transformer/src/test/java/com/google/android/exoplayer2/transformer/audio/FloatAudioMixingAlgorithmTest.java rename to library/transformer/src/test/java/com/google/android/exoplayer2/transformer/FloatAudioMixingAlgorithmTest.java index d81a3b9f3d..b27e8d8410 100644 --- a/library/transformer/src/test/java/com/google/android/exoplayer2/transformer/audio/FloatAudioMixingAlgorithmTest.java +++ b/library/transformer/src/test/java/com/google/android/exoplayer2/transformer/FloatAudioMixingAlgorithmTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.exoplayer2.transformer.audio; +package com.google.android.exoplayer2.transformer; import static com.google.common.truth.Truth.assertThat;