Repository navigation
fix(ffmpeg): 恢复 #171 原生会话串行化供重新审阅 - #179
Closed
3316891527 wants to merge 1 commit into
Closed
3316891527 wants to merge 1 commit into
3316891527 wants to merge 1 commit into
Conversation
2 of 5 tasks
3316891527
added
the
ci:full-android
3316891527
force-pushed
the
fix/reopen-pr-171-ffmpeg-sessions
branch
from
November 9, 2026 03:16
c4752b0 to
4d7b99e
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
变更说明 / Description
FFmpeg 执行与 FFprobe 共用原生会话锁，避免并发访问 FFmpegKit 会话状态；媒体转换复用首次探测结果，减少重复探测。
背景与动机 / Context and motivation
维护者要求撤销 #170–#176 并恢复 open 审阅。已合并的原 PR 无法重开，本 PR 对应原 #171。未经维护者明确允许不得合并或启用自动合并。
改动范围 / Changes
完整恢复 #171 的 3 文件补丁：FFmpegUtil、StandardFFmpegTool 和对应回归测试，保留当前包结构适配。
兼容性与风险 / Compatibility and risks
原生会话将串行执行，并发请求可能等待同一把锁。当前暂以撤销 PR #177 的分支为目标，仅展示本项差异；待 #177 获准进入 dev 后应将目标改为 dev 并重新检查，不能合入临时基准分支。
关联 Issue / Related issue
原 #171；撤销与恢复审阅要求见 #177。
验证方式 / Verification
初次重建时已逐项核对原完整合并补丁。本轮在清理历史空白并补齐 CI 的共同回滚基准上重放该项，保持独立功能差异。当前 PR 启用 ci:full-android，要求固定合并候选实际运行 assembleDebug 与 :app:testDebugUnitTest，Candidate checks 必须检查两项真实成功。新的结果以本 PR Checks 为准；历史 CI 不代替本轮构建和测试。
证据 / Evidence
原实现及历史检查见 #171；当前回滚基准见 #177。
检查清单 / Checklist
本项已随 集成 PR #191 合入
dev，并经 发布同步 PR #193 同步到main。原来源提交4d7b99e82649aa5ae434096784103313a9765360已核对保留。本 PR 原目标为
fix/revert-pr-170-176；由于dev已包含全部来源提交，GitHub 拒绝将目标改到dev。关闭此重复待合并条目，代码与原始审阅记录均保留。