b1541b096f
Both the extension OPUS decoder and the OMX/C2 MediaCodec implementations for OPUS and VORBIS decode into the channel layout defined by VORBIS. See https://www.xiph.org/vorbis/doc/Vorbis_I_spec.html#x1-140001.2.3 While this is technically correct for a stand-alone OPUS or VORBIS decoder, it doesn't match the channel layout expected by Android. See https://developer.android.com/reference/android/media/AudioFormat#channelMask The fix is to apply the channel mapping after decoding if needed. Also add e2e tests with audio dumps for the extension renderer, including a new 5.1 channel test file. Issue: google/ExoPlayer#8396 #minor-release PiperOrigin-RevId: 588004832
40 lines
1.7 KiB
Groovy
40 lines
1.7 KiB
Groovy
// Copyright (C) 2016 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.
|
|
apply from: "$gradle.ext.androidxMediaSettingsDir/common_library_config.gradle"
|
|
|
|
android {
|
|
namespace 'androidx.media3.decoder.opus'
|
|
|
|
sourceSets {
|
|
main {
|
|
jniLibs.srcDir 'src/main/libs'
|
|
jni.srcDirs = [] // Disable the automatic ndk-build call by Android Studio.
|
|
}
|
|
androidTest.assets.srcDir '../test_data/src/test/assets'
|
|
}
|
|
}
|
|
|
|
dependencies {
|
|
implementation project(modulePrefix + 'lib-decoder')
|
|
// TODO(b/203752526): Remove this dependency.
|
|
implementation project(modulePrefix + 'lib-exoplayer')
|
|
implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion
|
|
compileOnly 'org.jetbrains.kotlin:kotlin-annotations-jvm:' + kotlinAnnotationsVersion
|
|
testImplementation project(modulePrefix + 'test-utils')
|
|
testImplementation 'org.robolectric:robolectric:' + robolectricVersion
|
|
androidTestImplementation project(modulePrefix + 'test-utils')
|
|
androidTestImplementation 'androidx.test:runner:' + androidxTestRunnerVersion
|
|
androidTestImplementation 'androidx.test.ext:junit:' + androidxTestJUnitVersion
|
|
}
|