Upstream/invidious
1
0
Fork 0
mirror of https://github.com/iv-org/invidious.git synced 2024-11-08 09:20:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update DASH format to serve 2 audio to player

Browse Source 
player.audioTracks() can successfully show
tracks_: Array(2)
This commit is contained in:
138138138 2022-06-24 17:26:30 +08:00 committed by GitHub
parent 3013782b7b
commit c75bf35f59
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/invidious/routes/api/manifest.cr
View File

@ -46,7 +46,7 @@ module Invidious::Routes::API::Manifest
end end
end end
audio_streams = video.audio_streams audio_streams = video.audio_streams.sort_by { |stream| {stream["bitrate"].as_i} }.reverse!
video_streams = video.video_streams.sort_by { |stream| {stream["width"].as_i, stream["fps"].as_i} }.reverse! video_streams = video.video_streams.sort_by { |stream| {stream["width"].as_i, stream["fps"].as_i} }.reverse!
manifest = XML.build(indent: " ", encoding: "UTF-8") do |xml| manifest = XML.build(indent: " ", encoding: "UTF-8") do |xml|
@ -60,19 +60,8 @@ module Invidious::Routes::API::Manifest
mime_streams = audio_streams.select { |stream| stream["mimeType"].as_s.starts_with? mime_type } mime_streams = audio_streams.select { |stream| stream["mimeType"].as_s.starts_with? mime_type }
next if mime_streams.empty? next if mime_streams.empty?
xml.element("AdaptationSet", id: i, mimeType: mime_type, startWithSAP: 1, subsegmentAlignment: true) do
# ignore the 64k m4a stream, only consider the 128k m4a stream
best_m4a_stream = mime_streams[0]
best_m4a_stream_bitrate = 0
mime_streams.each do |fmt| mime_streams.each do |fmt|
bandwidth = fmt["bitrate"].as_i xml.element("AdaptationSet", id: i, mimeType: mime_type, startWithSAP: 1, subsegmentAlignment: true, lang: i.to_s) do
if (bandwidth > best_m4a_stream_bitrate)
best_m4a_stream_bitrate = bandwidth
best_m4a_stream = fmt
end
end
[best_m4a_stream].each do |fmt|
# OTF streams aren't supported yet (See https://github.com/TeamNewPipe/NewPipe/issues/2415) # OTF streams aren't supported yet (See https://github.com/TeamNewPipe/NewPipe/issues/2415)
next if !(fmt.has_key?("indexRange") && fmt.has_key?("initRange")) next if !(fmt.has_key?("indexRange") && fmt.has_key?("initRange"))
@ -90,10 +79,9 @@ module Invidious::Routes::API::Manifest
end end
end end
end end
end
i += 1 i += 1
end end
end
potential_heights = {4320, 2160, 1440, 1080, 720, 480, 360, 240, 144} potential_heights = {4320, 2160, 1440, 1080, 720, 480, 360, 240, 144}