merge+review(C97): 合并 origin/beta 3203ca9da0 并复评 E-SP11 掉帧归因，修复输入侧丢帧计数未进诊断白名单导致整条 video.output.summary 被丢弃

Verification: merge origin/beta 3203ca9da0 into dev2: 0 conflicts, B=0/A=0, beta->merge=10 files +463-19, dev2->merge=32 files +2269-123; :app:compileLeanback+MobileArm64_v8aDebugJavaWithJavac BUILD SUCCESSFUL; targeted unit tests 633/1 skipped/0 failed (incl. new DiagnosticEventFieldAllowlistTest 2); full leanback suite 4492/3 skipped/8 failed with all 8 failing test names identical to pre-merge baseline 14a45844fd worktree run => 0 new failures Task-Guard: C97-beta-merge-dev2-20261022
2026-10-25 10:16:33 +00:00 · 2026-10-22 16:34:43 +08:00 · 2026-10-22 16:34:43 +08:00 · ae923e1312
commit ae923e1312
parent 14a45844fd 3203ca9da0
35 changed files with 2521 additions and 123 deletions
--- a/README.md
+++ b/README.md
--- a/app/src/leanback/res/layout/activity_crash.xml
+++ b/app/src/leanback/res/layout/activity_crash.xml
--- a/app/src/main/java/com/fongmi/android/tv/Startup.java
+++ b/app/src/main/java/com/fongmi/android/tv/Startup.java
--- a/app/src/main/java/com/fongmi/android/tv/player/PlaybackOwnershipKeys.java
+++ b/app/src/main/java/com/fongmi/android/tv/player/PlaybackOwnershipKeys.java
--- a/app/src/main/java/com/fongmi/android/tv/player/SurfaceDiagnosticCollector.java
+++ b/app/src/main/java/com/fongmi/android/tv/player/SurfaceDiagnosticCollector.java
--- a/app/src/main/java/com/fongmi/android/tv/server/process/DebugLogs.java
+++ b/app/src/main/java/com/fongmi/android/tv/server/process/DebugLogs.java
--- a/app/src/main/java/com/fongmi/android/tv/service/PlaybackService.java
+++ b/app/src/main/java/com/fongmi/android/tv/service/PlaybackService.java
--- a/app/src/main/java/com/fongmi/android/tv/ui/activity/CrashActivity.java
+++ b/app/src/main/java/com/fongmi/android/tv/ui/activity/CrashActivity.java
--- a/app/src/main/java/com/fongmi/android/tv/ui/activity/PlaybackActivity.java
+++ b/app/src/main/java/com/fongmi/android/tv/ui/activity/PlaybackActivity.java
--- a/app/src/main/java/com/fongmi/android/tv/ui/activity/VideoSurfaceBinding.java
+++ b/app/src/main/java/com/fongmi/android/tv/ui/activity/VideoSurfaceBinding.java
--- a/app/src/main/java/com/fongmi/android/tv/utils/CrashLogSession.java
+++ b/app/src/main/java/com/fongmi/android/tv/utils/CrashLogSession.java
--- a/app/src/main/java/com/fongmi/android/tv/utils/CrashLogText.java
+++ b/app/src/main/java/com/fongmi/android/tv/utils/CrashLogText.java
--- a/app/src/main/java/com/fongmi/android/tv/utils/CrashReport.java
+++ b/app/src/main/java/com/fongmi/android/tv/utils/CrashReport.java
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
--- a/app/src/mobile/res/layout/activity_crash.xml
+++ b/app/src/mobile/res/layout/activity_crash.xml
--- a/app/src/test/java/com/fongmi/android/tv/player/PlaybackOwnershipKeysTest.java
+++ b/app/src/test/java/com/fongmi/android/tv/player/PlaybackOwnershipKeysTest.java
--- a/app/src/test/java/com/fongmi/android/tv/player/SurfaceRebindDiagnosticTest.java
+++ b/app/src/test/java/com/fongmi/android/tv/player/SurfaceRebindDiagnosticTest.java
--- a/app/src/test/java/com/fongmi/android/tv/player/exo/DiagnosticEventFieldAllowlistTest.java
+++ b/app/src/test/java/com/fongmi/android/tv/player/exo/DiagnosticEventFieldAllowlistTest.java
--- a/app/src/test/java/com/fongmi/android/tv/ui/activity/PlaybackOwnershipSourceTest.java
+++ b/app/src/test/java/com/fongmi/android/tv/ui/activity/PlaybackOwnershipSourceTest.java
--- a/app/src/test/java/com/fongmi/android/tv/ui/activity/VideoSurfaceBindingTest.java
+++ b/app/src/test/java/com/fongmi/android/tv/ui/activity/VideoSurfaceBindingTest.java
--- a/app/src/test/java/com/fongmi/android/tv/utils/CrashLogTextTest.java
+++ b/app/src/test/java/com/fongmi/android/tv/utils/CrashLogTextTest.java
--- a/app/src/test/java/com/fongmi/android/tv/utils/CrashLogWiringTest.java
+++ b/app/src/test/java/com/fongmi/android/tv/utils/CrashLogWiringTest.java
--- a/app/src/testMobile/java/com/fongmi/android/tv/ui/activity/CrashActivityDetailsTest.java
+++ b/app/src/testMobile/java/com/fongmi/android/tv/ui/activity/CrashActivityDetailsTest.java
--- a/catvod/src/main/java/com/github/catvod/crawler/DebugLogStore.java
+++ b/catvod/src/main/java/com/github/catvod/crawler/DebugLogStore.java
--- a/catvod/src/main/java/com/github/catvod/crawler/diagnostics/DiagnosticEvent.java
+++ b/catvod/src/main/java/com/github/catvod/crawler/diagnostics/DiagnosticEvent.java
--- a/catvod/src/main/java/com/github/catvod/crawler/diagnostics/InMemoryDiagnosticFile.java
+++ b/catvod/src/main/java/com/github/catvod/crawler/diagnostics/InMemoryDiagnosticFile.java
--- a/docs/AUTONEXT-02-episode-next-video-surface.md
+++ b/docs/AUTONEXT-02-episode-next-video-surface.md
--- a/docs/C95-beta-merge-review-dev3-20261021.md
+++ b/docs/C95-beta-merge-review-dev3-20261021.md
--- a/docs/C96-beta-merge-review-dev1-20261022.md
+++ b/docs/C96-beta-merge-review-dev1-20261022.md
--- a/docs/C97-beta-merge-review-dev2-20261022.md
+++ b/docs/C97-beta-merge-review-dev2-20261022.md
--- a/docs/E-SP11-exo-tv-frame-drop-defaults.md
+++ b/docs/E-SP11-exo-tv-frame-drop-defaults.md
--- a/docs/crash-log-address-20261021.md
+++ b/docs/crash-log-address-20261021.md
--- a/docs/upstream-player-dependency-merge-assessment-2026-08-20.md
+++ b/docs/upstream-player-dependency-merge-assessment-2026-08-20.md