diff --git a/README.md b/README.md index 1966ffb47e..d335fc79bc 100644 --- a/README.md +++ b/README.md @@ -360,11 +360,12 @@ keyPassword=your_key_password - `app/libs/*.aar`:内置 Hook、TVBus、Thunder、ForceTech、JianPian 播放能力依赖。 - `third_party/maven`:已生成的 `androidx.media3:*:1.11.0-alpha01-fongmi` 本地 Maven 产物,以及定制 `nextlib-media3ext`。 -- `third_party/media-lock.json`:记录 Media3 锁定版本,升级 Media3 时使用(配套脚本 `scripts/build_media_deps.sh`)。 +- `third_party/media-lock.json`:记录 Media3、nextlib、FFmpeg、NDK 与 CMake 的精确构建输入,配套脚本为 `scripts/build_media_deps.sh`。 - `third_party/patches/media3-*.patch`:在锁定的 FongMi Media3 源码上叠加本项目补丁;`media3-upstream-playback-fixes-2026-08.patch` 选择性移植 AV1/HEVC HDR 元数据、scrub、DASH、LL-HLS、MP4 IT.35、MediaSession 和 detached Surface 等上游修复,`media3-danmaku-live.patch` 提供 WebSocket 实时弹幕的批量接收、有界队列、TTL、每帧处理上限和聚合统计。 +- `third_party/patches/nextlib-*.patch`:在 `anilbeesetti/nextlib@6ff6cf9d0820382b3c233d018c52e4163b09d345` 上叠加 FFmpeg 软解负载控制和 AV3A/libarcdav3a 支持。 - `third_party/mpv-player-jni`:MPV `libplayer.so` JNI 桥接源码,修改后用 `scripts/build_mpv_player_jni.sh` 重建。 - `app/src/*/assets/mpv-libs/*`:随 APK 打包的 MPV native 库和 JNI 桥接库。 -- `nextlib-media3ext`:`io.github.anilbeesetti:nextlib-media3ext:1.10.0-0.12.1-fongmi-softload`,提供 FFmpeg renderer。 +- `nextlib-media3ext`:`io.github.anilbeesetti:nextlib-media3ext:1.10.0-0.12.1-fongmi-softload-av3a-r1`,提供 FFmpeg renderer;内置 FongMi FFmpeg `04482c8d13ac27b2a9fe93f5d388929eef8af5f4` 和静态链接的 `libarcdav3a`,Exo 可软解 `audio/av3a`,并在输出设备不接受源多声道 PCM 时下混到立体声。 `settings.gradle` 中的依赖顺序是仓库本地 `third_party/maven`、Maven Central、Google Maven、`app/libs` 和 JitPack。`app/build.gradle` 会强制所有 `androidx.media3` 依赖使用 `1.11.0-alpha01-fongmi`,避免传递依赖拉回官方版本。 @@ -378,6 +379,15 @@ bash gradlew :app:assembleMobileArm64_v8aDebug :app:assembleLeanbackArm64_v8aDeb 脚本会按 `third_party/media-lock.json` 检出锁定提交、应用全部 Media3 补丁并发布到 `third_party/maven`。上游播放器修复及其精确移植方式记录在 lock 和[相关仓库提交审计](docs/fongmi-related-repos-audit-2026-08-09.md)中;`media3-danmaku-live.patch` 还包含 Media3 渲染侧 Robolectric 压力测试。App 测试使用 MockWebServer 模拟 WebSocket,MockWebServer 仅属于 `testImplementation`,不会进入正式 APK。发布 GitHub Action 会先运行完整 WebSocket 弹幕单测,再构建四个 release APK。 +只重建 nextlib/FFmpeg AV3A 扩展时使用: + +```bash +export ANDROID_HOME="$HOME/Library/Android/sdk" +scripts/build_media_deps.sh --nextlib-only +``` + +该命令使用 NDK `28.2.13676358`、CMake `3.22.1` 为 `arm64-v8a` 和 `armeabi-v7a` 重编 FFmpeg/libarcdav3a,校验两端 `libavcodec.so` 的 AV3A 标记后发布到 `third_party/maven`。真实样片来源、SHA-256、实机步骤和验收结果见 [Exo AV3A 验收记录](docs/exo-av3a-acceptance-2026-08-11.md)。 + ### 常见构建失败 - `Unsupported class file major version`、`invalid source release: 21`:当前终端没有使用 JDK 21。 diff --git a/app/src/main/java/io/github/anilbeesetti/nextlib/media3ext/ffdecoder/CompatFfmpegAudioRenderer.java b/app/src/main/java/io/github/anilbeesetti/nextlib/media3ext/ffdecoder/CompatFfmpegAudioRenderer.java index 94a88f6878..33146a2066 100644 --- a/app/src/main/java/io/github/anilbeesetti/nextlib/media3ext/ffdecoder/CompatFfmpegAudioRenderer.java +++ b/app/src/main/java/io/github/anilbeesetti/nextlib/media3ext/ffdecoder/CompatFfmpegAudioRenderer.java @@ -1,5 +1,7 @@ package io.github.anilbeesetti.nextlib.media3ext.ffdecoder; +import static androidx.media3.exoplayer.audio.AudioSink.SINK_FORMAT_SUPPORTED_DIRECTLY; + import android.content.Context; import android.os.Handler; @@ -21,6 +23,8 @@ public final class CompatFfmpegAudioRenderer extends DecoderAudioRenderer STEREO_CHANNEL_COUNT + && (sinkSupportsFormat(format, C.ENCODING_PCM_16BIT, STEREO_CHANNEL_COUNT) + || sinkSupportsFormat(format, C.ENCODING_PCM_FLOAT, STEREO_CHANNEL_COUNT))) { + return STEREO_CHANNEL_COUNT; + } + return Format.NO_VALUE; + } + + private boolean shouldOutputFloat(Format format, int outputChannelCount) { + if (!sinkSupportsFormat(format, C.ENCODING_PCM_16BIT, outputChannelCount)) return true; + int floatSupport = getSinkFormatSupport(Util.getPcmFormat(C.ENCODING_PCM_FLOAT, outputChannelCount, format.sampleRate)); + return floatSupport == SINK_FORMAT_SUPPORTED_DIRECTLY && !MimeTypes.AUDIO_AC3.equals(format.sampleMimeType); } } diff --git a/docs/exo-av3a-acceptance-2026-08-11.md b/docs/exo-av3a-acceptance-2026-08-11.md new file mode 100644 index 0000000000..4e352647b8 --- /dev/null +++ b/docs/exo-av3a-acceptance-2026-08-11.md @@ -0,0 +1,50 @@ +# Exo AV3A 实机验收记录(2026-08-11) + +## 构建输入 + +- nextlib:`https://github.com/anilbeesetti/nextlib.git` commit `6ff6cf9d0820382b3c233d018c52e4163b09d345` +- FFmpeg:`https://github.com/FongMi/FFmpeg.git` commit `04482c8d13ac27b2a9fe93f5d388929eef8af5f4` +- nextlib 版本:`1.10.0-0.12.1-fongmi-softload-av3a-r1` +- Android ABI:`arm64-v8a`、`armeabi-v7a` +- NDK:`28.2.13676358` +- CMake:`3.22.1` + +两端 AAR 内的 `libavcodec.so` 均包含 `libarcdav3a AV3A` 和 `AV3A Audio Vivid`。`libarcdav3a` 静态链接进 `libavcodec.so`,ELF `DT_NEEDED` 不包含独立 `libarcdav3a.so`。 + +## 公开测试资源 + +- 项目:`https://github.com/nilaoda/av3a_decoder` +- 原始下载:`https://github.com/nilaoda/av3a_decoder/releases/download/v0.2/sample2_ts.zip` +- 国内代理下载:`https://ghfast.top/https://github.com/nilaoda/av3a_decoder/releases/download/v0.2/sample2_ts.zip` +- ZIP SHA-256:`7a533e9e74fb09b3a480c08500f3f886991947280bd1cb6cb25097ed2dfd096a` +- 样片:`playlist_761477780_1710946736.ts` + +样片视频为 3840×2160、50 fps、HEVC/HLG;音频为 AV3A、48 kHz、10 声道(5.1.4)。 + +## 实机结果 + +设备:vivo V2453A,Android 15,arm64-v8a。 + +将同一 TS 片段重复组成约 65 秒本地 HLS 列表并使用 Exo 播放,结果如下: + +- 播放参数识别:`av3a 10ch 48kHz 384Kbps` +- 音频解码器:`ffmpegLavc63.3.100-libarcdav3a` +- 播放状态:正常到达 `ENDED` +- 重缓冲:0 次 +- 视频掉帧:13 帧(4K 50 fps 样片) +- AudioFlinger:为 App 创建 48 kHz、10 声道 PCM AudioTrack,约 59 秒内服务端帧计数持续增长 +- 日志:无 `PlaybackException`、SIGSEGV、ANR 或 Java/native crash + +首次实机运行曾在 `swr_alloc_set_opts2()` 内触发 SIGSEGV。根因是 JNI 下混路径中的 `SwrContext *resampleContext` 未初始化,随机栈值被当作已有上下文传入 `av_opt_find2()`。修复为显式初始化 `nullptr` 后,完整验收通过。 + +## 复测步骤 + +```bash +curl -L 'https://ghfast.top/https://github.com/nilaoda/av3a_decoder/releases/download/v0.2/sample2_ts.zip' -o /tmp/sample2_ts.zip +shasum -a 256 /tmp/sample2_ts.zip +unzip /tmp/sample2_ts.zip -d /tmp/av3a-sample +adb push /tmp/av3a-sample/playlist_761477780_1710946736.ts /sdcard/Download/av3a-sample2-5.1.4.ts +adb shell am start -a android.intent.action.VIEW -c android.intent.category.DEFAULT -d file:///sdcard/Download/av3a-sample2-5.1.4.ts -t video/mp2t -n com.fongmi.android.tv/.ui.activity.HomeActivity +``` + +进入全屏后打开“播放参数”,应看到音频格式 `av3a`,解码器名称以 `ffmpeg` 开头并以 `libarcdav3a` 结尾。若设备不接受源多声道 PCM,renderer 会请求 FFmpeg 下混为双声道;支持源通道布局的设备则保留多声道交给 Android 音频栈。 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index cbf69e03db..40ad946ec3 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -44,7 +44,7 @@ materialdesigncolors = "1.0.0" media3 = "1.11.0-alpha01-fongmi" nanohttpd = "2.3.1" newpipeextractor = "v0.26.3" -nextlib = "1.10.0-0.12.1-fongmi-softload" +nextlib = "1.10.0-0.12.1-fongmi-softload-av3a-r1" okhttp = "5.4.0" permissionx = "1.8.1" quickjs = "3.2.3" diff --git a/scripts/build_media_deps.sh b/scripts/build_media_deps.sh index 77dc40fec5..db93c04333 100755 --- a/scripts/build_media_deps.sh +++ b/scripts/build_media_deps.sh @@ -4,16 +4,16 @@ set -euo pipefail usage() { cat <<'USAGE' Usage: - scripts/build_media_deps.sh [--clean] [--with-nextlib] [--use-aliyun-mirrors] + scripts/build_media_deps.sh [--clean] [--with-nextlib|--nextlib-only] [--use-aliyun-mirrors] Builds the locked FongMi Media3 artifacts into third_party/maven so the app can depend on normal Maven coordinates instead of embedding external source trees. Options: --clean Remove generated third_party/maven before publishing. - --with-nextlib Also prepare the locked FongMi/nextlib source checkout. - The app normally consumes nextlib-media3ext from Maven Central; - local nextlib publishing needs Android NDK/CMake/FFmpeg setup. + --with-nextlib Also build and publish the locked nextlib FFmpeg extension. + This rebuilds FFmpeg/libarcdav3a for both Android ARM ABIs. + --nextlib-only Build and publish only nextlib-media3ext. --use-aliyun-mirrors Add temporary Aliyun Gradle/Google/Maven mirrors to the generated Media3 checkout. Useful when Plugin Portal or Google Maven is @@ -31,6 +31,7 @@ NEXTLIB_DIR="$SOURCE_DIR/nextlib" CLEAN=0 WITH_NEXTLIB=0 +BUILD_MEDIA=1 USE_ALIYUN_MIRRORS=0 while [[ $# -gt 0 ]]; do @@ -41,6 +42,10 @@ while [[ $# -gt 0 ]]; do --with-nextlib) WITH_NEXTLIB=1 ;; + --nextlib-only) + WITH_NEXTLIB=1 + BUILD_MEDIA=0 + ;; --use-aliyun-mirrors) USE_ALIYUN_MIRRORS=1 ;; @@ -234,6 +239,23 @@ apply_media_patches() { done } +apply_nextlib_patches() { + local patch_file + local patches=( + "$THIRD_PARTY_DIR/patches/nextlib-ffmpeg-soft-load-shedding.patch" + "$THIRD_PARTY_DIR/patches/nextlib-av3a.patch" + ) + for patch_file in "${patches[@]}"; do + if [[ ! -f "$patch_file" ]]; then + echo "Missing nextlib patch: $patch_file" >&2 + exit 1 + fi + echo "Applying nextlib patch $(basename "$patch_file")" + git -C "$NEXTLIB_DIR" apply --check "$patch_file" + git -C "$NEXTLIB_DIR" apply "$patch_file" + done +} + apply_media_build_mirrors() { if [[ "$USE_ALIYUN_MIRRORS" != "1" ]]; then return 0 @@ -357,35 +379,94 @@ publish_media() { echo "Installed complete Media3 publication into $LOCAL_MAVEN" } -prepare_nextlib() { +verify_nextlib_aar() { + local aar="$1" + local temp_dir + local abi + [[ -f "$aar" ]] || { + echo "Missing nextlib AAR: $aar" >&2 + return 1 + } + temp_dir="$(mktemp -d "$ROOT_DIR/.gradle/nextlib-aar-verify.XXXXXX")" + unzip -q "$aar" -d "$temp_dir" + for abi in arm64-v8a armeabi-v7a; do + [[ -f "$temp_dir/jni/$abi/libmedia3ext.so" ]] || { + echo "Missing $abi libmedia3ext.so in $aar" >&2 + return 1 + } + [[ -f "$temp_dir/jni/$abi/libavcodec.so" ]] || { + echo "Missing $abi libavcodec.so in $aar" >&2 + return 1 + } + if ! grep -aFq "libarcdav3a AV3A" "$temp_dir/jni/$abi/libavcodec.so"; then + echo "Missing $abi libarcdav3a decoder marker in $aar" >&2 + return 1 + fi + if ! grep -aFq "AV3A Audio Vivid" "$temp_dir/jni/$abi/libavcodec.so"; then + echo "Missing $abi AV3A Audio Vivid marker in $aar" >&2 + return 1 + fi + done + rm -rf "$temp_dir" +} + +publish_nextlib() { local repo branch commit version - repo="$(json_get fongmi_nextlib repo)" - branch="$(json_get fongmi_nextlib branch)" - commit="$(json_get fongmi_nextlib commit)" - version="$(json_get fongmi_nextlib version)" - require_value fongmi_nextlib.repo "$repo" - require_value fongmi_nextlib.branch "$branch" - require_value fongmi_nextlib.commit "$commit" - require_value fongmi_nextlib.version "$version" + repo="$(json_get nextlib repo)" + branch="$(json_get nextlib branch)" + commit="$(json_get nextlib commit)" + version="$(json_get nextlib version)" + require_value nextlib.repo "$repo" + require_value nextlib.branch "$branch" + require_value nextlib.commit "$commit" + require_value nextlib.version "$version" clone_or_update "$repo" "$branch" "$commit" "$NEXTLIB_DIR" + apply_nextlib_patches prepare_nextlib_compile_sdk - echo "Prepared FongMi/nextlib $version source at $NEXTLIB_DIR" - echo "The app consumes io.github.anilbeesetti:nextlib-media3ext:$version from Maven Central by default." - echo "Local nextlib publishing is intentionally not run here because it requires Android NDK/CMake and FFmpeg setup." + if ! grep -Fq "version = \"$version\"" "$NEXTLIB_DIR/build.gradle.kts"; then + echo "nextlib patch version does not match lock version $version" >&2 + exit 1 + fi + + local publish_repo + local artifact_dir + local aar + publish_repo="$(mktemp -d "$ROOT_DIR/.gradle/nextlib-maven-publish.XXXXXX")" + echo "Building nextlib-media3ext $version with FFmpeg/libarcdav3a" + if ! (cd "$NEXTLIB_DIR" && ./gradlew --no-daemon --console=plain \ + -Dmaven.repo.local="$publish_repo" \ + :media3ext:publishMavenPublicationToMavenLocal); then + echo "nextlib publishing failed; staged output retained at $publish_repo" >&2 + return 1 + fi + artifact_dir="$publish_repo/io/github/anilbeesetti/nextlib-media3ext/$version" + aar="$artifact_dir/nextlib-media3ext-$version.aar" + verify_nextlib_aar "$aar" + mkdir -p "$LOCAL_MAVEN/io/github/anilbeesetti" + cp -R "$publish_repo"/io/github/anilbeesetti/nextlib-media3ext "$LOCAL_MAVEN/io/github/anilbeesetti/" + rm -rf "$publish_repo" + echo "Installed verified nextlib-media3ext $version into $LOCAL_MAVEN" } prepare_android_env mkdir -p "$THIRD_PARTY_DIR" if [[ "$CLEAN" == "1" ]]; then - echo "Cleaning $LOCAL_MAVEN" - rm -rf "$LOCAL_MAVEN" + if [[ "$BUILD_MEDIA" == "1" ]]; then + echo "Cleaning $LOCAL_MAVEN" + rm -rf "$LOCAL_MAVEN" + else + echo "Cleaning local nextlib publication" + rm -rf "$LOCAL_MAVEN/io/github/anilbeesetti/nextlib-media3ext" + fi fi mkdir -p "$LOCAL_MAVEN" -publish_media +if [[ "$BUILD_MEDIA" == "1" ]]; then + publish_media +fi if [[ "$WITH_NEXTLIB" == "1" ]]; then - prepare_nextlib + publish_nextlib fi -echo "Done. Local Media3 artifacts are available under $LOCAL_MAVEN" +echo "Done. Local media dependencies are available under $LOCAL_MAVEN" diff --git a/third_party/maven/io/github/anilbeesetti/nextlib-media3ext/1.10.0-0.12.1-fongmi-softload-av3a-r1/nextlib-media3ext-1.10.0-0.12.1-fongmi-softload-av3a-r1-javadoc.jar b/third_party/maven/io/github/anilbeesetti/nextlib-media3ext/1.10.0-0.12.1-fongmi-softload-av3a-r1/nextlib-media3ext-1.10.0-0.12.1-fongmi-softload-av3a-r1-javadoc.jar new file mode 100644 index 0000000000..e5b3b80089 Binary files /dev/null and b/third_party/maven/io/github/anilbeesetti/nextlib-media3ext/1.10.0-0.12.1-fongmi-softload-av3a-r1/nextlib-media3ext-1.10.0-0.12.1-fongmi-softload-av3a-r1-javadoc.jar differ diff --git a/third_party/maven/io/github/anilbeesetti/nextlib-media3ext/1.10.0-0.12.1-fongmi-softload-av3a-r1/nextlib-media3ext-1.10.0-0.12.1-fongmi-softload-av3a-r1-sources.jar b/third_party/maven/io/github/anilbeesetti/nextlib-media3ext/1.10.0-0.12.1-fongmi-softload-av3a-r1/nextlib-media3ext-1.10.0-0.12.1-fongmi-softload-av3a-r1-sources.jar new file mode 100644 index 0000000000..f0ba3ff42e Binary files /dev/null and b/third_party/maven/io/github/anilbeesetti/nextlib-media3ext/1.10.0-0.12.1-fongmi-softload-av3a-r1/nextlib-media3ext-1.10.0-0.12.1-fongmi-softload-av3a-r1-sources.jar differ diff --git a/third_party/maven/io/github/anilbeesetti/nextlib-media3ext/1.10.0-0.12.1-fongmi-softload-av3a-r1/nextlib-media3ext-1.10.0-0.12.1-fongmi-softload-av3a-r1.aar b/third_party/maven/io/github/anilbeesetti/nextlib-media3ext/1.10.0-0.12.1-fongmi-softload-av3a-r1/nextlib-media3ext-1.10.0-0.12.1-fongmi-softload-av3a-r1.aar new file mode 100644 index 0000000000..a7d3f12c53 Binary files /dev/null and b/third_party/maven/io/github/anilbeesetti/nextlib-media3ext/1.10.0-0.12.1-fongmi-softload-av3a-r1/nextlib-media3ext-1.10.0-0.12.1-fongmi-softload-av3a-r1.aar differ diff --git a/third_party/maven/io/github/anilbeesetti/nextlib-media3ext/1.10.0-0.12.1-fongmi-softload-av3a-r1/nextlib-media3ext-1.10.0-0.12.1-fongmi-softload-av3a-r1.module b/third_party/maven/io/github/anilbeesetti/nextlib-media3ext/1.10.0-0.12.1-fongmi-softload-av3a-r1/nextlib-media3ext-1.10.0-0.12.1-fongmi-softload-av3a-r1.module new file mode 100644 index 0000000000..ff8ff952a7 --- /dev/null +++ b/third_party/maven/io/github/anilbeesetti/nextlib-media3ext/1.10.0-0.12.1-fongmi-softload-av3a-r1/nextlib-media3ext-1.10.0-0.12.1-fongmi-softload-av3a-r1.module @@ -0,0 +1,137 @@ +{ + "formatVersion": "1.1", + "component": { + "group": "io.github.anilbeesetti", + "module": "nextlib-media3ext", + "version": "1.10.0-0.12.1-fongmi-softload-av3a-r1", + "attributes": { + "org.gradle.status": "release" + } + }, + "createdBy": { + "gradle": { + "version": "9.4.1" + } + }, + "variants": [ + { + "name": "releaseVariantReleaseApiPublication", + "attributes": { + "org.gradle.category": "library", + "org.gradle.dependency.bundling": "external", + "org.gradle.libraryelements": "aar", + "org.gradle.usage": "java-api" + }, + "dependencies": [ + { + "group": "org.jetbrains.kotlin", + "module": "kotlin-stdlib", + "version": { + "requires": "2.2.10" + } + } + ], + "files": [ + { + "name": "nextlib-media3ext-1.10.0-0.12.1-fongmi-softload-av3a-r1.aar", + "url": "nextlib-media3ext-1.10.0-0.12.1-fongmi-softload-av3a-r1.aar", + "size": 6288112, + "sha512": "b9e4111dc04935b643479193e839c7356d380f6a9b3e01ac7a05be0ca434be9a806915c4668f81f4cb0daad0a4d2cdbf95bbce8ef6905764f2dca16b057c1267", + "sha256": "7f6c1922a3e9b54f65b193fb415bb8d6c1f201719ed223711ab10d22f45501e9", + "sha1": "75115e7cdf9ab458967d5ec3ffaba5aaeddb8559", + "md5": "55c11f96d91dcd196d2f5be43729c69f" + } + ] + }, + { + "name": "releaseVariantReleaseRuntimePublication", + "attributes": { + "org.gradle.category": "library", + "org.gradle.dependency.bundling": "external", + "org.gradle.libraryelements": "aar", + "org.gradle.usage": "java-runtime" + }, + "dependencies": [ + { + "group": "androidx.media3", + "module": "media3-exoplayer", + "version": { + "requires": "1.10.0" + } + }, + { + "group": "com.google.errorprone", + "module": "error_prone_annotations", + "version": { + "requires": "2.48.0" + } + }, + { + "group": "androidx.annotation", + "module": "annotation", + "version": { + "requires": "1.9.1" + } + }, + { + "group": "org.jetbrains.kotlin", + "module": "kotlin-stdlib", + "version": { + "requires": "2.2.10" + } + } + ], + "files": [ + { + "name": "nextlib-media3ext-1.10.0-0.12.1-fongmi-softload-av3a-r1.aar", + "url": "nextlib-media3ext-1.10.0-0.12.1-fongmi-softload-av3a-r1.aar", + "size": 6288112, + "sha512": "b9e4111dc04935b643479193e839c7356d380f6a9b3e01ac7a05be0ca434be9a806915c4668f81f4cb0daad0a4d2cdbf95bbce8ef6905764f2dca16b057c1267", + "sha256": "7f6c1922a3e9b54f65b193fb415bb8d6c1f201719ed223711ab10d22f45501e9", + "sha1": "75115e7cdf9ab458967d5ec3ffaba5aaeddb8559", + "md5": "55c11f96d91dcd196d2f5be43729c69f" + } + ] + }, + { + "name": "releaseVariantReleaseSourcePublication", + "attributes": { + "org.gradle.category": "documentation", + "org.gradle.dependency.bundling": "external", + "org.gradle.docstype": "sources", + "org.gradle.usage": "java-runtime" + }, + "files": [ + { + "name": "nextlib-media3ext-1.10.0-0.12.1-fongmi-softload-av3a-r1-sources.jar", + "url": "nextlib-media3ext-1.10.0-0.12.1-fongmi-softload-av3a-r1-sources.jar", + "size": 20442, + "sha512": "514eb43ded3390d1da1f2b0da1e1a22711252908a9806deda7c0463095aaf64f01ff5ea2bb49b6da3b7cf6c3859ac8f85df31da871412fc19527cfeb5e37bc63", + "sha256": "043fe28b6c6faeecf58e9168ac92c61b2ed9c0c3010da5a5430af3c59d7741a4", + "sha1": "89a1b13b03e9415182dda3c9c95816bc5cee4c0c", + "md5": "e63687a2d7048145ac6bceb2a80a37c4" + } + ] + }, + { + "name": "releaseVariantReleaseJavaDocPublication", + "attributes": { + "org.gradle.category": "documentation", + "org.gradle.dependency.bundling": "external", + "org.gradle.docstype": "javadoc", + "org.gradle.usage": "java-runtime" + }, + "files": [ + { + "name": "nextlib-media3ext-1.10.0-0.12.1-fongmi-softload-av3a-r1-javadoc.jar", + "url": "nextlib-media3ext-1.10.0-0.12.1-fongmi-softload-av3a-r1-javadoc.jar", + "size": 328836, + "sha512": "f7b4e8e40b6cdad5bab691969de0e4b8abcc7720fdb1df57b79dc4409a61c30aeb22d4a388698478129e7158affd4256fc702bd625a4d20330d78d313cf83e90", + "sha256": "fec4d75645d279c75dd18dee54d276cb1c65192566602f87b271a72faee3f186", + "sha1": "35ffd146804aab0a0ebaa275098978135b663973", + "md5": "ea725f8f9b30486f4180eb8576281a82" + } + ] + } + ] +} diff --git a/third_party/maven/io/github/anilbeesetti/nextlib-media3ext/1.10.0-0.12.1-fongmi-softload-av3a-r1/nextlib-media3ext-1.10.0-0.12.1-fongmi-softload-av3a-r1.pom b/third_party/maven/io/github/anilbeesetti/nextlib-media3ext/1.10.0-0.12.1-fongmi-softload-av3a-r1/nextlib-media3ext-1.10.0-0.12.1-fongmi-softload-av3a-r1.pom new file mode 100644 index 0000000000..1c428310d1 --- /dev/null +++ b/third_party/maven/io/github/anilbeesetti/nextlib-media3ext/1.10.0-0.12.1-fongmi-softload-av3a-r1/nextlib-media3ext-1.10.0-0.12.1-fongmi-softload-av3a-r1.pom @@ -0,0 +1,59 @@ + + + + + + + + 4.0.0 + io.github.anilbeesetti + nextlib-media3ext + 1.10.0-0.12.1-fongmi-softload-av3a-r1 + aar + NextLib Media3 Extensions + Android library providing ffmpeg extensions for Media3 + https://github.com/anilbeesetti/nextlib + + + GNU General Public License v3.0 + https://www.gnu.org/licenses/gpl-3.0.html + repo + + + + + anilbeesetti + Anil Kumar Beesetti + + + + https://github.com/anilbeesetti/nextlib + + + + org.jetbrains.kotlin + kotlin-stdlib + 2.2.10 + compile + + + androidx.media3 + media3-exoplayer + 1.10.0 + runtime + + + com.google.errorprone + error_prone_annotations + 2.48.0 + runtime + + + androidx.annotation + annotation + 1.9.1 + runtime + + + diff --git a/third_party/media-lock.json b/third_party/media-lock.json index 0bcccf0d82..9e0c60027a 100644 --- a/third_party/media-lock.json +++ b/third_party/media-lock.json @@ -24,10 +24,23 @@ } ] }, - "fongmi_nextlib": { - "repo": "https://github.com/FongMi/nextlib.git", - "branch": "fongmi", + "nextlib": { + "repo": "https://github.com/anilbeesetti/nextlib.git", + "branch": "release/1.10.0-0.12.1", "commit": "6ff6cf9d0820382b3c233d018c52e4163b09d345", - "version": "1.10.0-0.12.1" + "version": "1.10.0-0.12.1-fongmi-softload-av3a-r1", + "upstream_version": "1.10.0-0.12.1", + "patches": [ + "third_party/patches/nextlib-ffmpeg-soft-load-shedding.patch", + "third_party/patches/nextlib-av3a.patch" + ], + "ffmpeg_repo": "https://github.com/FongMi/FFmpeg.git", + "ffmpeg_commit": "04482c8d13ac27b2a9fe93f5d388929eef8af5f4", + "ndk": "28.2.13676358", + "cmake": "3.22.1", + "abis": [ + "arm64-v8a", + "armeabi-v7a" + ] } } diff --git a/third_party/patches/nextlib-av3a.patch b/third_party/patches/nextlib-av3a.patch new file mode 100644 index 0000000000..b0fd1f9b64 --- /dev/null +++ b/third_party/patches/nextlib-av3a.patch @@ -0,0 +1,581 @@ +diff --git a/build.gradle.kts b/build.gradle.kts +index 18acf58..0366f56 100644 +--- a/build.gradle.kts ++++ b/build.gradle.kts +@@ -11,7 +11,7 @@ subprojects { + coordinates( + groupId = "io.github.anilbeesetti", + artifactId = property("POM_ARTIFACT_ID") as String, +- version = "1.10.0-0.12.1-fongmi-softload" ++ version = "1.10.0-0.12.1-fongmi-softload-av3a-r1" + ) + + pom { +diff --git a/ffmpeg/setup.sh b/ffmpeg/setup.sh +index 09f6fcd..1c764ce 100755 +--- a/ffmpeg/setup.sh ++++ b/ffmpeg/setup.sh +@@ -3,21 +3,22 @@ + # Versions + VPX_VERSION=1.13.0 + MBEDTLS_VERSION=3.4.1 +-FFMPEG_VERSION=6.0 ++FFMPEG_VERSION=9.0-fongmi ++FFMPEG_COMMIT=04482c8d13ac27b2a9fe93f5d388929eef8af5f4 + + # Directories + BASE_DIR=$(cd "$(dirname "$0")" && pwd) + BUILD_DIR=$BASE_DIR/build + OUTPUT_DIR=$BASE_DIR/output + SOURCES_DIR=$BASE_DIR/sources +-FFMPEG_DIR=$SOURCES_DIR/ffmpeg-$FFMPEG_VERSION ++FFMPEG_DIR=$SOURCES_DIR/FFmpeg-$FFMPEG_COMMIT + VPX_DIR=$SOURCES_DIR/libvpx-$VPX_VERSION + MBEDTLS_DIR=$SOURCES_DIR/mbedtls-$MBEDTLS_VERSION + + # Configuration +-ANDROID_ABIS="x86 x86_64 armeabi-v7a arm64-v8a" ++ANDROID_ABIS="armeabi-v7a arm64-v8a" + ANDROID_PLATFORM=21 +-ENABLED_DECODERS="vorbis opus flac alac pcm_mulaw pcm_alaw mp3 amrnb amrwb aac ac3 eac3 dca mlp truehd h264 hevc mpeg2video mpegvideo libvpx_vp8 libvpx_vp9" ++ENABLED_DECODERS="vorbis opus flac alac pcm_mulaw pcm_alaw mp3 amrnb amrwb aac ac3 eac3 dca mlp truehd libarcdav3a h264 hevc mpeg2video mpegvideo libvpx_vp8 libvpx_vp9" + JOBS=$(nproc 2>/dev/null || sysctl -n hw.ncpu 2>/dev/null || sysctl -n hw.pysicalcpu || echo 4) + + # Set up host platform variables +@@ -37,8 +38,10 @@ esac + TOOLCHAIN_PREFIX="${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/${HOST_PLATFORM}" + CMAKE_EXECUTABLE="${ANDROID_SDK_HOME}/cmake/${ANDROID_CMAKE_VERSION}/bin/cmake" + +-# Check if sdkmanager is in PATH +-if command -v sdkmanager &> /dev/null; then ++# Install CMake only when the requested version is not already available. ++if [[ -x "$CMAKE_EXECUTABLE" ]]; then ++ echo "Using installed CMake ${ANDROID_CMAKE_VERSION}" ++elif command -v sdkmanager &> /dev/null; then + # Use sdkmanager from PATH + echo "Using sdkmanager from PATH" + echo y | sdkmanager --sdk_root="${ANDROID_SDK_HOME}" "cmake;${ANDROID_CMAKE_VERSION}" +@@ -80,15 +83,42 @@ function downloadMbedTLS() { + + function downloadFfmpeg() { + pushd $SOURCES_DIR +- echo "Downloading FFmpeg source code of version $FFMPEG_VERSION..." +- FFMPEG_FILE=ffmpeg-$FFMPEG_VERSION.tar.gz +- curl -L "https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.gz" -o $FFMPEG_FILE ++ echo "Downloading FongMi FFmpeg source code at $FFMPEG_COMMIT..." ++ FFMPEG_FILE=ffmpeg-$FFMPEG_COMMIT.tar.gz ++ curl -L "https://github.com/FongMi/FFmpeg/archive/${FFMPEG_COMMIT}.tar.gz" -o $FFMPEG_FILE + [ -e $FFMPEG_FILE ] || { echo "$FFMPEG_FILE does not exist. Exiting..."; exit 1; } + tar -zxf $FFMPEG_FILE + rm $FFMPEG_FILE + popd + } + ++function buildArcDav3a() { ++ pushd $FFMPEG_DIR ++ ++ [ -f dependency/avs3a/CMakeLists.txt ] || { ++ echo "FongMi FFmpeg source does not contain dependency/avs3a. Exiting..." ++ exit 1 ++ } ++ ++ for ABI in $ANDROID_ABIS; do ++ CMAKE_BUILD_DIR=$FFMPEG_DIR/arcdav3a_build_${ABI} ++ rm -rf ${CMAKE_BUILD_DIR} ++ ++ ${CMAKE_EXECUTABLE} -S dependency/avs3a -B ${CMAKE_BUILD_DIR} \ ++ -DANDROID_PLATFORM=${ANDROID_PLATFORM} \ ++ -DANDROID_ABI=$ABI \ ++ -DCMAKE_TOOLCHAIN_FILE=${ANDROID_NDK_HOME}/build/cmake/android.toolchain.cmake \ ++ -DCMAKE_INSTALL_PREFIX=$BUILD_DIR/external/$ABI \ ++ -DCMAKE_POSITION_INDEPENDENT_CODE=ON \ ++ -DBUILD_SHARED_LIBS=OFF ++ ++ ${CMAKE_EXECUTABLE} --build ${CMAKE_BUILD_DIR} --parallel $JOBS ++ ${CMAKE_EXECUTABLE} --install ${CMAKE_BUILD_DIR} ++ done ++ ++ popd ++} ++ + function buildLibVpx() { + pushd $VPX_DIR + +@@ -232,7 +262,7 @@ function buildFfmpeg() { + DEP_LD_FLAGS="-L$BUILD_DIR/external/$ABI/lib" + + # Configure FFmpeg build +- ./configure \ ++ PKG_CONFIG_PATH="$BUILD_DIR/external/$ABI/lib/pkgconfig" ./configure \ + --prefix=$BUILD_DIR/$ABI \ + --enable-cross-compile \ + --arch=$ARCH \ +@@ -245,6 +275,7 @@ function buildFfmpeg() { + --extra-cflags="-O3 -fPIC $DEP_CFLAGS" \ + --extra-ldflags="$DEP_LD_FLAGS -Wl,-z,max-page-size=16384" \ + --pkg-config="$(which pkg-config)" \ ++ --pkg-config-flags=--static \ + --target-os=android \ + --enable-shared \ + --disable-static \ +@@ -254,7 +285,6 @@ function buildFfmpeg() { + --disable-vulkan \ + --disable-avdevice \ + --disable-avformat \ +- --disable-postproc \ + --disable-avfilter \ + --disable-symver \ + --enable-parsers \ +@@ -262,6 +292,7 @@ function buildFfmpeg() { + --enable-swresample \ + --enable-avformat \ + --enable-libvpx \ ++ --enable-libarcdav3a \ + --enable-protocol=file,http,https,mmsh,mmst,pipe,rtmp,rtmps,rtmpt,rtmpts,rtp,tls \ + --enable-version3 \ + --enable-mbedtls \ +@@ -288,6 +319,11 @@ function buildFfmpeg() { + popd + } + ++if [[ "${1:-}" == "--ffmpeg-only" ]]; then ++ buildFfmpeg ++ exit $? ++fi ++ + if [[ ! -d "$OUTPUT_DIR" && ! -d "$BUILD_DIR" ]]; then + # Download MbedTLS source code if it doesn't exist + if [[ ! -d "$MBEDTLS_DIR" ]]; then +@@ -307,5 +343,6 @@ if [[ ! -d "$OUTPUT_DIR" && ! -d "$BUILD_DIR" ]]; then + # Building library + buildMbedTLS + buildLibVpx ++ buildArcDav3a + buildFfmpeg + fi +diff --git a/media3ext/build.gradle.kts b/media3ext/build.gradle.kts +index 3bb9d4f..fc17421 100644 +--- a/media3ext/build.gradle.kts ++++ b/media3ext/build.gradle.kts +@@ -22,7 +22,7 @@ android { + } + + ndk { +- abiFilters += listOf("x86", "x86_64", "armeabi-v7a", "arm64-v8a") ++ abiFilters += listOf("armeabi-v7a", "arm64-v8a") + } + } + +@@ -63,4 +63,4 @@ dependencies { + implementation(libs.androidx.annotation) + compileOnly(libs.checker.qual) + compileOnly(libs.kotlin.annotations.jvm) +-} +\ No newline at end of file ++} +diff --git a/media3ext/src/main/cpp/ffaudio.cpp b/media3ext/src/main/cpp/ffaudio.cpp +index 6d6169a..443faef 100644 +--- a/media3ext/src/main/cpp/ffaudio.cpp ++++ b/media3ext/src/main/cpp/ffaudio.cpp +@@ -2,6 +2,7 @@ + #include + #include + #include ++#include + #include + #include + #include "ffcommon.h" +@@ -33,6 +34,7 @@ static const int AUDIO_DECODER_ERROR_OTHER = -2; + + static jmethodID growOutputBufferMethod; + ++struct GrowOutputBufferCallback; + + /** + * Allocates and opens a new AVCodecContext for the specified codec, passing the +@@ -49,7 +51,9 @@ AVCodecContext *createContext(JNIEnv *env, AVCodec *codec, jbyteArray extraData, + * error. + */ + int decodePacket(AVCodecContext *context, AVPacket *packet, +- uint8_t *outputBuffer, int outputSize); ++ uint8_t *outputBuffer, int outputSize, ++ int requestedOutputChannelCount, ++ GrowOutputBufferCallback growBuffer); + + /** + * Transforms ffmpeg AVERROR into a negative AUDIO_DECODER_ERROR constant value. +@@ -113,7 +117,9 @@ AVCodecContext *createContext(JNIEnv *env, AVCodec *codec, jbyteArray extraData, + } + + int decodePacket(AVCodecContext *context, AVPacket *packet, +- uint8_t *outputBuffer, int outputSize, GrowOutputBufferCallback growBuffer) { ++ uint8_t *outputBuffer, int outputSize, ++ int requestedOutputChannelCount, ++ GrowOutputBufferCallback growBuffer) { + int result = 0; + // Queue input data. + result = avcodec_send_packet(context, packet); +@@ -140,45 +146,83 @@ int decodePacket(AVCodecContext *context, AVPacket *packet, + return transformError(result); + } + +- // Resample output. +- AVSampleFormat sampleFormat = context->sample_fmt; +- int channelCount = context->ch_layout.nb_channels; +- AVChannelLayout channelLayout = context->ch_layout; +- int sampleRate = context->sample_rate; ++ // Resample output. AV3A commonly outputs more than eight planar channels, so use ++ // AVFrame.extended_data rather than the fixed-size AVFrame.data array. ++ AVSampleFormat sampleFormat = static_cast(frame->format); ++ int inputChannelCount = frame->ch_layout.nb_channels; ++ int sampleRate = frame->sample_rate > 0 ? frame->sample_rate : context->sample_rate; + int sampleCount = frame->nb_samples; +- int dataSize = av_samples_get_buffer_size(nullptr, channelCount, sampleCount, +- sampleFormat, 1); +- SwrContext *resampleContext; ++ if (inputChannelCount <= 0 || sampleRate <= 0) { ++ LOGE("Invalid decoded audio format: channels=%d sampleRate=%d.", ++ inputChannelCount, sampleRate); ++ av_frame_free(&frame); ++ return AUDIO_DECODER_ERROR_INVALID_DATA; ++ } ++ int outputChannelCount = requestedOutputChannelCount > 0 ++ ? requestedOutputChannelCount : inputChannelCount; ++ SwrContext *resampleContext = nullptr; + if (context->opaque) { + resampleContext = (SwrContext *) context->opaque; + } else { +- resampleContext = swr_alloc(); +- av_opt_set_chlayout(resampleContext, "in_chlayout", &channelLayout, 0); +- av_opt_set_chlayout(resampleContext, "out_chlayout", &channelLayout, 0); +- av_opt_set_int(resampleContext, "in_sample_rate", sampleRate, 0); +- av_opt_set_int(resampleContext, "out_sample_rate", sampleRate, 0); +- av_opt_set_int(resampleContext, "in_sample_fmt", sampleFormat, 0); +- // The output format is always the requested format. +- av_opt_set_int(resampleContext, "out_sample_fmt", +- context->request_sample_fmt, 0); +- result = swr_init(resampleContext); ++ AVChannelLayout inputLayout{}; ++ AVChannelLayout outputLayout{}; ++ result = av_channel_layout_copy(&inputLayout, &frame->ch_layout); ++ if (result < 0) { ++ logError("av_channel_layout_copy", result); ++ av_frame_free(&frame); ++ return transformError(result); ++ } ++ if (outputChannelCount == inputChannelCount) { ++ result = av_channel_layout_copy(&outputLayout, &inputLayout); ++ } else { ++ av_channel_layout_default(&outputLayout, outputChannelCount); ++ result = av_channel_layout_check(&outputLayout) ? 0 : AVERROR(EINVAL); ++ LOGD("Downmixing FFmpeg audio from %d to %d channels.", ++ inputChannelCount, outputChannelCount); ++ } ++ if (result >= 0) { ++ result = swr_alloc_set_opts2( ++ &resampleContext, ++ &outputLayout, ++ context->request_sample_fmt, ++ sampleRate, ++ &inputLayout, ++ sampleFormat, ++ sampleRate, ++ 0, ++ nullptr); ++ } ++ av_channel_layout_uninit(&inputLayout); ++ av_channel_layout_uninit(&outputLayout); ++ if (result >= 0) { ++ result = swr_init(resampleContext); ++ } + if (result < 0) { +- logError("swr_init", result); ++ logError("swr initialization", result); ++ swr_free(&resampleContext); + av_frame_free(&frame); + return transformError(result); + } + context->opaque = resampleContext; + } +- int inSampleSize = av_get_bytes_per_sample(sampleFormat); +- int outSampleSize = av_get_bytes_per_sample(context->request_sample_fmt); + int outSamples = swr_get_out_samples(resampleContext, sampleCount); +- int bufferOutSize = outSampleSize * channelCount * outSamples; +- if (outSize + bufferOutSize > outputSize) { ++ int requiredFrameSize = av_samples_get_buffer_size( ++ nullptr, ++ outputChannelCount, ++ outSamples, ++ context->request_sample_fmt, ++ 1); ++ if (requiredFrameSize < 0) { ++ logError("av_samples_get_buffer_size", requiredFrameSize); ++ av_frame_free(&frame); ++ return transformError(requiredFrameSize); ++ } ++ if (outSize + requiredFrameSize > outputSize) { + LOGD( + "Output buffer size (%d) too small for output data (%d), " + "reallocating buffer.", +- outputSize, outSize + bufferOutSize); +- outputSize = outSize + bufferOutSize; ++ outputSize, outSize + requiredFrameSize); ++ outputSize = outSize + requiredFrameSize; + outputBuffer = growBuffer(outputSize); + if (!outputBuffer) { + LOGE("Failed to reallocate output buffer."); +@@ -186,21 +230,29 @@ int decodePacket(AVCodecContext *context, AVPacket *packet, + return AUDIO_DECODER_ERROR_OTHER; + } + } +- result = swr_convert(resampleContext, &outputBuffer, bufferOutSize, +- (const uint8_t **) frame->data, frame->nb_samples); ++ uint8_t *outputPlanes[] = {outputBuffer + outSize}; ++ result = swr_convert( ++ resampleContext, ++ outputPlanes, ++ outSamples, ++ (const uint8_t **) frame->extended_data, ++ sampleCount); + av_frame_free(&frame); + if (result < 0) { + logError("swr_convert", result); + return AUDIO_DECODER_ERROR_INVALID_DATA; + } +- int available = swr_get_out_samples(resampleContext, 0); +- if (available != 0) { +- LOGE("Expected no samples remaining after resampling, but found %d.", +- available); +- return AUDIO_DECODER_ERROR_INVALID_DATA; ++ int convertedSize = av_samples_get_buffer_size( ++ nullptr, ++ outputChannelCount, ++ result, ++ context->request_sample_fmt, ++ 1); ++ if (convertedSize < 0) { ++ logError("av_samples_get_buffer_size", convertedSize); ++ return transformError(convertedSize); + } +- outputBuffer += bufferOutSize; +- outSize += bufferOutSize; ++ outSize += convertedSize; + } + return outSize; + } +@@ -239,7 +291,8 @@ Java_io_github_anilbeesetti_nextlib_media3ext_ffdecoder_FfmpegAudioDecoder_ffmpe + jint input_size, + jobject decoderOutputBuffer, + jobject output_data, +- jint output_size) { ++ jint output_size, ++ jint output_channel_count) { + if (!context) { + LOGE("Context must be non-NULL."); + return -1; +@@ -269,7 +322,8 @@ Java_io_github_anilbeesetti_nextlib_media3ext_ffdecoder_FfmpegAudioDecoder_ffmpe + packet->data = inputBuffer; + packet->size = input_size; + int decodedPacket = decodePacket((AVCodecContext *) context, packet, outputBuffer, +- output_size, GrowOutputBufferCallback{env, thiz, decoderOutputBuffer}); ++ output_size, output_channel_count, ++ GrowOutputBufferCallback{env, thiz, decoderOutputBuffer}); + av_packet_free(&packet); + return decodedPacket; + } +@@ -338,4 +392,4 @@ Java_io_github_anilbeesetti_nextlib_media3ext_ffdecoder_FfmpegAudioDecoder_ffmpe + if (context) { + releaseContext((AVCodecContext *) context); + } +-} +\ No newline at end of file ++} +diff --git a/media3ext/src/main/java/io/github/anilbeesetti/nextlib/media3ext/ffdecoder/FfmpegAudioDecoder.java b/media3ext/src/main/java/io/github/anilbeesetti/nextlib/media3ext/ffdecoder/FfmpegAudioDecoder.java +index 962a408..c9a1e4a 100644 +--- a/media3ext/src/main/java/io/github/anilbeesetti/nextlib/media3ext/ffdecoder/FfmpegAudioDecoder.java ++++ b/media3ext/src/main/java/io/github/anilbeesetti/nextlib/media3ext/ffdecoder/FfmpegAudioDecoder.java +@@ -34,6 +34,7 @@ final class FfmpegAudioDecoder + private final String codecName; + @Nullable private final byte[] extraData; + private final @C.PcmEncoding int encoding; ++ private final int outputChannelCount; + private int outputBufferSize; + + private long nativeContext; // May be reassigned on resetting the codec. +@@ -48,6 +49,23 @@ final class FfmpegAudioDecoder + int initialInputBufferSize, + boolean outputFloat) + throws FfmpegDecoderException { ++ this( ++ format, ++ numInputBuffers, ++ numOutputBuffers, ++ initialInputBufferSize, ++ outputFloat, ++ Format.NO_VALUE); ++ } ++ ++ public FfmpegAudioDecoder( ++ Format format, ++ int numInputBuffers, ++ int numOutputBuffers, ++ int initialInputBufferSize, ++ boolean outputFloat, ++ int outputChannelCount) ++ throws FfmpegDecoderException { + super(new DecoderInputBuffer[numInputBuffers], new SimpleDecoderOutputBuffer[numOutputBuffers]); + if (!FfmpegLibrary.isAvailable()) { + throw new FfmpegDecoderException("Failed to load decoder native libraries."); +@@ -56,6 +74,7 @@ final class FfmpegAudioDecoder + codecName = checkNotNull(FfmpegLibrary.getCodecName(format.sampleMimeType)); + extraData = getExtraData(format.sampleMimeType, format.initializationData); + encoding = outputFloat ? C.ENCODING_PCM_FLOAT : C.ENCODING_PCM_16BIT; ++ this.outputChannelCount = outputChannelCount; + outputBufferSize = outputFloat ? INITIAL_OUTPUT_BUFFER_SIZE_32BIT : INITIAL_OUTPUT_BUFFER_SIZE_16BIT; + nativeContext = + ffmpegInitialize(codecName, extraData, outputFloat, format.sampleRate, format.channelCount); +@@ -100,7 +119,15 @@ final class FfmpegAudioDecoder + ByteBuffer inputData = Util.castNonNull(inputBuffer.data); + int inputSize = inputData.limit(); + ByteBuffer outputData = outputBuffer.init(inputBuffer.timeUs, outputBufferSize); +- int result = ffmpegDecode(nativeContext, inputData, inputSize, outputBuffer, outputData, outputBufferSize); ++ int result = ++ ffmpegDecode( ++ nativeContext, ++ inputData, ++ inputSize, ++ outputBuffer, ++ outputData, ++ outputBufferSize, ++ outputChannelCount); + if (result == AUDIO_DECODER_ERROR_OTHER) { + return new FfmpegDecoderException("Error decoding (see logcat)."); + } else if (result == AUDIO_DECODER_ERROR_INVALID_DATA) { +@@ -115,7 +142,8 @@ final class FfmpegAudioDecoder + return null; + } + if (!hasOutputFormat) { +- channelCount = ffmpegGetChannelCount(nativeContext); ++ channelCount = ++ outputChannelCount > 0 ? outputChannelCount : ffmpegGetChannelCount(nativeContext); + sampleRate = ffmpegGetSampleRate(nativeContext); + if (sampleRate == 0 && "alac".equals(codecName)) { + checkNotNull(extraData); +@@ -221,7 +249,13 @@ final class FfmpegAudioDecoder + int rawChannelCount); + + private native int ffmpegDecode( +- long context, ByteBuffer inputData, int inputSize, SimpleDecoderOutputBuffer decoderOutputBuffer, ByteBuffer outputData, int outputSize); ++ long context, ++ ByteBuffer inputData, ++ int inputSize, ++ SimpleDecoderOutputBuffer decoderOutputBuffer, ++ ByteBuffer outputData, ++ int outputSize, ++ int outputChannelCount); + + private native int ffmpegGetChannelCount(long context); + +diff --git a/media3ext/src/main/java/io/github/anilbeesetti/nextlib/media3ext/ffdecoder/FfmpegAudioRenderer.java b/media3ext/src/main/java/io/github/anilbeesetti/nextlib/media3ext/ffdecoder/FfmpegAudioRenderer.java +index f6ce6c1..90a910d 100644 +--- a/media3ext/src/main/java/io/github/anilbeesetti/nextlib/media3ext/ffdecoder/FfmpegAudioRenderer.java ++++ b/media3ext/src/main/java/io/github/anilbeesetti/nextlib/media3ext/ffdecoder/FfmpegAudioRenderer.java +@@ -31,6 +31,8 @@ public final class FfmpegAudioRenderer extends DecoderAudioRenderer STEREO_CHANNEL_COUNT ++ && (sinkSupportsFormat(inputFormat, C.ENCODING_PCM_16BIT, STEREO_CHANNEL_COUNT) ++ || sinkSupportsFormat(inputFormat, C.ENCODING_PCM_FLOAT, STEREO_CHANNEL_COUNT))) { ++ return STEREO_CHANNEL_COUNT; ++ } ++ return Format.NO_VALUE; ++ } ++ ++ private boolean shouldOutputFloat(Format inputFormat, int outputChannelCount) { ++ if (!sinkSupportsFormat(inputFormat, C.ENCODING_PCM_16BIT, outputChannelCount)) { + // We have no choice because the sink doesn't support 16-bit integer PCM. + return true; + } +@@ -148,7 +170,7 @@ public final class FfmpegAudioRenderer extends DecoderAudioRenderer "alac"; + case MimeTypes.AUDIO_MLAW -> "pcm_mulaw"; + case MimeTypes.AUDIO_ALAW -> "pcm_alaw"; ++ case AUDIO_AV3A -> "libarcdav3a"; + + // Video codecs + case MimeTypes.VIDEO_H264 -> "h264"; diff --git a/webhome-devkit/docs/应用完整开发文档.md b/webhome-devkit/docs/应用完整开发文档.md index 14e76e17f0..4839d6ddf1 100644 --- a/webhome-devkit/docs/应用完整开发文档.md +++ b/webhome-devkit/docs/应用完整开发文档.md @@ -61,7 +61,7 @@ app/src/main/assets 内置局域网页面和解析页 | targetSdk | `28` | | Android NDK | MPV/FFmpeg/libplacebo/JNI 使用 `29.0.14206865`(r29);IJK/DVD 使用 `28.2.13676358`(r28c)。普通 Gradle 打包直接复用仓库已提交二进制,不要求安装 NDK | | Media3 | `androidx.media3:*:1.11.0-alpha01-fongmi` | -| FFmpeg renderer | `io.github.anilbeesetti:nextlib-media3ext:1.10.0-0.12.1-fongmi-softload` | +| FFmpeg renderer | `io.github.anilbeesetti:nextlib-media3ext:1.10.0-0.12.1-fongmi-softload-av3a-r1`;内置 FongMi FFmpeg 9 与 libarcdav3a | | MPV native/JNI | `third_party/mpv-player-jni` 保存 JNI 源码,`app/src/*/assets/mpv-libs/*` 保存随 APK 打包的整套 MPV/FFmpeg native 库 | | Chaquo Python | `17.0.0`,Python 运行时版本 `3.10` | @@ -120,7 +120,7 @@ python3.10 --version - `app/libs/*.aar`:Hook、TVBus、Thunder、ForceTech、JianPian 播放能力依赖。 - `third_party/maven`:定制 Media3 `1.11.0-alpha01-fongmi` 和定制 nextlib。 - `third_party/fongmi-repositories-lock.json`:统一记录 TV、FFmpeg、mpv-android、media、mpv、libplacebo 和 CatVodSpider 当前审查/采用的精确 commit。 -- `third_party/media-lock.json`:Media3 版本锁定记录,升级时配合 `scripts/build_media_deps.sh`。 +- `third_party/media-lock.json`:Media3、nextlib、FFmpeg、NDK、CMake 和双 ARM ABI 的精确锁定记录,升级或重编时配合 `scripts/build_media_deps.sh`。 - `third_party/mpv-native-lock.json`:MPV/FFmpeg/libplacebo、构建框架、NDK、工具和全部 native 子依赖的可复现构建输入。 - `third_party/mpv-player-jni`:MPV `libplayer.so` JNI 桥接源码,当前 JNI 可上报 native `END_FILE reason/error`。 - `app/src/arm64_v8a/assets/mpv-libs/arm64-v8a`、`app/src/armeabi_v7a/assets/mpv-libs/armeabi-v7a`:随 APK 打包的 MPV native 库和 JNI 桥接库。 @@ -229,7 +229,7 @@ bash gradlew :app:assembleMobileArm64_v8aRelease -PfastRelease=true bash gradlew :app:assembleMobileArm64_v8aDebug :app:assembleLeanbackArmeabi_v7aDebug :app:assembleLeanbackArm64_v8aDebug ``` -### 3.4.1 Media3 自编译依赖与实时弹幕补丁 +### 3.4.1 Media3、nextlib/FFmpeg 自编译依赖 普通 App 构建不会现场编译 Media3。仓库已经在 `third_party/maven` 提交 `androidx.media3:*:1.11.0-alpha01-fongmi` 的完整 AAR、sources、POM、Gradle module metadata 和校验文件;`settings.gradle` 优先从该目录解析,`app/build.gradle` 统一锁定版本,CI 和新机器 clone 后可直接使用。 @@ -238,6 +238,8 @@ bash gradlew :app:assembleMobileArm64_v8aDebug :app:assembleLeanbackArmeabi_v7aD - `third_party/media-lock.json`:锁定 FongMi Media3 仓库、分支、提交和发布版本。 - `third_party/patches/media3-*.patch`:本项目在锁定提交上叠加的补丁。 - `third_party/patches/media3-danmaku-live.patch`:实时弹幕批量入口、后台测量、有界 `livePending`、TTL、每帧处理上限、generation 清理和聚合统计,以及对应 Media3 渲染压力测试。 +- `third_party/patches/nextlib-ffmpeg-soft-load-shedding.patch`:FFmpeg 视频软解负载控制与当前 Android/NDK 构建适配。 +- `third_party/patches/nextlib-av3a.patch`:把 nextlib FFmpeg 升级到 FongMi FFmpeg `04482c8d13ac27b2a9fe93f5d388929eef8af5f4`,编译并静态链接 `dependency/avs3a`,映射 `audio/av3a -> libarcdav3a`,支持 10 声道 planar PCM 和必要时立体声下混。 - `scripts/build_media_deps.sh`:检出锁定源码、应用补丁并把模块发布到 `third_party/maven`。 修改 Media3 fork、补丁或锁定版本后执行: @@ -249,9 +251,21 @@ bash gradlew :app:testMobileArm64_v8aDebugUnitTest --tests 'com.fongmi.android.t bash gradlew :app:assembleMobileArm64_v8aDebug :app:assembleLeanbackArm64_v8aDebug ``` +只修改 nextlib、FFmpeg 音频扩展或 AV3A 适配时,不需要重编整套 Media3,可执行: + +```bash +export ANDROID_HOME="$HOME/Library/Android/sdk" +scripts/build_media_deps.sh --nextlib-only +bash gradlew :app:assembleMobileArm64_v8aDebug :app:assembleLeanbackArmeabi_v7aDebug +``` + +nextlib 重建使用 `anilbeesetti/nextlib@6ff6cf9d0820382b3c233d018c52e4163b09d345`、NDK `28.2.13676358`、CMake `3.22.1`,为 `arm64-v8a` 和 `armeabi-v7a` 生成 AAR。脚本会验证两个 ABI 的 `libavcodec.so` 同时包含 `libarcdav3a AV3A` 与 `AV3A Audio Vivid`,然后才写入 `third_party/maven`。普通 App/CI 打包继续直接使用已提交 AAR,不会现场编译 FFmpeg。 + +Exo AV3A 实机验收使用公开样片 `sample2_ts.zip`。播放参数应显示 `av3a 10ch 48kHz` 和 `ffmpeg...-libarcdav3a`;完整资源地址、校验值和验收结果见 `docs/exo-av3a-acceptance-2026-08-11.md`。 + WebSocket 弹幕 App 单测使用 MockWebServer 验证握手、突发消息、切源、停止重连和服务端错误重试;该依赖只声明为 `testImplementation`,不会打入 APK。Media3 补丁内的 Robolectric 测试验证 300 条/秒持续输入、300 条瞬时突发、144 条待处理容量、每帧最多 16 次激活、TTL 和清理隔离。发布 GitHub Action 会在四端 release 构建前运行 App 侧完整弹幕测试集。 -只修改 App 侧 WebSocket 连接、解析或设置界面时,不需要重编 Media3 AAR;只有 Media3 API、渲染队列或补丁内容发生变化时才重建并提交新的本地 Maven 产物。 +只修改 App 侧 WebSocket 连接、解析或设置界面时,不需要重编 Media3 AAR;只有 Media3 API、渲染队列或补丁内容发生变化时才重建 Media3。修改 AV3A 解码、FFmpeg 音频 JNI、nextlib renderer 或其锁定版本时必须重建并提交 nextlib AAR。 ### 3.5 MPV native/JNI 重建