edde746
6c14049e95
Groundwork for #1300. Establishes the session, buffering and route handling Dolby's application guide prescribes, and adds the diagnostic arm needed to find out whether Apple's sample-buffer renderer can carry Atmos objects at all. Audio session, per the guide's sequence: - Adopt the long-form playback profile in one atomic call at app launch and activate the session there. The SDK only accepts that policy with category Playback, a Default/MoviePlayback/SpokenAudio mode and no options, so it cannot be assembled from separate calls. - Report the resolved rendering mode in the player, hidden unless the system resolves it. Apple only resolves it for CarPlay and AirPlay, so an unresolved value means unknown, never "not Dolby". Diagnostics (Apple TV only, Settings > Video Playback > Atmos Output Test): - Add a sample-buffer arm. It reads the asset with AVAssetReader at outputSettings nil and hands the untouched compressed buffers and the untouched format description straight to the renderer, with a variant that rebuilds the description the way playback builds it. Every existing mode went through AVPlayer, so nothing exercised the path playback actually uses; this is what tells us whether the renderer or our construction is at fault. - Add an AirPlay route picker. AirPlay is the only route where the system resolves the rendering mode and the supported channel layouts, so it is what makes those observations reachable at all, and the AVPlayer arms now allow external playback so every arm can be compared on the same destination. - Add a session-mode toggle for the one profile difference between the guide and previous playback behaviour. - Report the session profile, supported layouts, both format descriptions, the magic cookie and the renderer status, and release the session on stop so a failed run cannot contaminate the next one. Also bumps MPVKit to 1.0.14, which carries the matching audio output work: the channel layout AVFoundation itself uses for Dolby content, a renderer-failure observer so the fallback to PCM can actually run, the prescribed feed ordering and preroll, flush recovery that re-supplies the discarded audio instead of shifting later audio into its place, and capability-driven fallback on route and capability changes. This does not yet fix #1300. Whether the sample-buffer renderer can carry JOC is still unknown; it removes every difference from the documented setup that could explain the failure, and gives us the arm to answer it on real hardware.
88 lines
3.8 KiB
Ruby
Executable File
88 lines
3.8 KiB
Ruby
Executable File
#!/usr/bin/env ruby
|
|
# Adds the Plezy MpvPlayer Swift sources and the MPVKit Swift Package
|
|
# dependency to tvos/Runner.xcodeproj so it matches the iOS project's
|
|
# linkage. Idempotent: re-running skips already-added entries.
|
|
|
|
require 'xcodeproj'
|
|
|
|
PROJECT_PATH = File.expand_path('../Runner.xcodeproj', __dir__)
|
|
project = Xcodeproj::Project.open(PROJECT_PATH)
|
|
runner_target = project.targets.find { |t| t.name == 'Runner' }
|
|
raise "Runner target not found" unless runner_target
|
|
|
|
# Find or create the MpvPlayer group under Runner.
|
|
main_group = project.main_group['Runner']
|
|
raise "Runner group not found" unless main_group
|
|
mpv_group = main_group['MpvPlayer'] || main_group.new_group('MpvPlayer', 'Runner/MpvPlayer')
|
|
|
|
# File references.
|
|
# path is relative to the group's path (Runner/MpvPlayer → ../..).
|
|
# For files elsewhere in the repo, use SOURCE_ROOT with the absolute-ish path.
|
|
sources = [
|
|
{ name: 'MpvPlayerCoreBase.swift', path: '../shared/apple/MpvPlayer/MpvPlayerCoreBase.swift', tree: '<source_root>' },
|
|
{ name: 'MpvPlayerPluginShared.swift', path: '../shared/apple/MpvPlayer/MpvPlayerPluginShared.swift', tree: '<source_root>' },
|
|
{ name: 'MpvPlayerCore.swift', path: '../ios/Runner/MpvPlayer/MpvPlayerCore.swift', tree: '<source_root>' },
|
|
{ name: 'MpvPlayerPlugin.swift', path: '../ios/Runner/MpvPlayer/MpvPlayerPlugin.swift', tree: '<source_root>' },
|
|
{ name: 'MpvPipController.swift', path: '../ios/Runner/MpvPlayer/MpvPipController.swift', tree: '<source_root>' },
|
|
{ name: 'MpvAudioPlayerCore.swift', path: '../shared/apple/MpvPlayer/MpvAudioPlayerCore.swift', tree: '<source_root>' },
|
|
{ name: 'MpvAudioPlayerPlugin.swift', path: '../shared/apple/MpvPlayer/MpvAudioPlayerPlugin.swift', tree: '<source_root>' },
|
|
{ name: 'AtmosProbePlugin.swift', path: '../shared/apple/AtmosProbe/AtmosProbePlugin.swift', tree: '<source_root>' },
|
|
]
|
|
|
|
sources_phase = runner_target.source_build_phase
|
|
sources.each do |src|
|
|
ref = mpv_group.files.find { |file| file.display_name == src[:name] }
|
|
unless ref
|
|
ref = mpv_group.new_file(src[:path])
|
|
ref.name = src[:name]
|
|
ref.source_tree = src[:tree]
|
|
puts "[add ] #{src[:name]} reference"
|
|
end
|
|
|
|
if sources_phase.files_references.include?(ref)
|
|
puts "[skip] #{src[:name]} source membership already present"
|
|
else
|
|
sources_phase.add_file_reference(ref, true)
|
|
puts "[add ] #{src[:name]} source membership"
|
|
end
|
|
end
|
|
|
|
# Swift Package: MPVKit. Restore each graph edge independently so a project
|
|
# with a surviving package reference cannot silently omit the Runner linkage.
|
|
pkg_url = 'https://github.com/edde746/MPVKit'
|
|
pkg_version = '1.0.14'
|
|
pkg = project.root_object.package_references.find do |candidate|
|
|
candidate.repositoryURL == pkg_url rescue false
|
|
end
|
|
|
|
unless pkg
|
|
pkg = project.new(Xcodeproj::Project::Object::XCRemoteSwiftPackageReference)
|
|
pkg.repositoryURL = pkg_url
|
|
project.root_object.package_references << pkg
|
|
puts "[add ] MPVKit SPM package reference"
|
|
end
|
|
pkg.requirement = { 'kind' => 'exactVersion', 'version' => pkg_version }
|
|
puts "[set ] MPVKit SPM package version"
|
|
|
|
product = runner_target.package_product_dependencies.find do |candidate|
|
|
candidate.product_name == 'MPVKit'
|
|
end
|
|
unless product
|
|
product = project.new(Xcodeproj::Project::Object::XCSwiftPackageProductDependency)
|
|
product.product_name = 'MPVKit'
|
|
runner_target.package_product_dependencies << product
|
|
puts "[add ] MPVKit Runner product dependency"
|
|
end
|
|
product.package = pkg
|
|
|
|
frameworks_phase = runner_target.frameworks_build_phase
|
|
unless frameworks_phase.files.any? { |build_file| build_file.product_ref == product }
|
|
build_file = project.new(Xcodeproj::Project::Object::PBXBuildFile)
|
|
build_file.product_ref = product
|
|
frameworks_phase.files << build_file
|
|
puts "[add ] MPVKit framework linkage"
|
|
end
|
|
|
|
project.save
|
|
puts "Saved #{PROJECT_PATH}"
|