iv-org
/
invidious
mirror of https://gitea.invidious.io/iv-org/invidious
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Filter video streams to avoid duplicates in DASH player

This commit is contained in:
Omar Roth 2019-02-08 09:49:40 -06:00
parent 29af5fc4a6
commit 9698988be3
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/invidious.cr
View File

@ -3530,7 +3530,12 @@ get "/api/manifest/dash/id/:id" do |env|
begin begin
video = get_video(id, PG_DB, proxies, region: region) video = get_video(id, PG_DB, proxies, region: region)
rescue ex : VideoRedirect rescue ex : VideoRedirect
next env.redirect "/api/manifest/dash/id/#{ex.message}" url = "/api/manifest/dash/id/#{ex.message}"
if local
url += "?local=true"
end
next env.redirect url
rescue ex rescue ex
halt env, status_code: 403 halt env, status_code: 403
end end
@ -3560,8 +3565,8 @@ get "/api/manifest/dash/id/:id" do |env|
end end
end end
video_streams = video.video_streams(adaptive_fmts).select { |stream| stream["type"].starts_with? "video/mp4" }
audio_streams = video.audio_streams(adaptive_fmts).select { |stream| stream["type"].starts_with? "audio/mp4" } audio_streams = video.audio_streams(adaptive_fmts).select { |stream| stream["type"].starts_with? "audio/mp4" }
video_streams = video.video_streams(adaptive_fmts).select { |stream| stream["type"].starts_with? "video/mp4" }.uniq { |stream| stream["size"] }
manifest = XML.build(indent: " ", encoding: "UTF-8") do |xml| manifest = XML.build(indent: " ", encoding: "UTF-8") do |xml|
xml.element("MPD", "xmlns": "urn:mpeg:dash:schema:mpd:2011", xml.element("MPD", "xmlns": "urn:mpeg:dash:schema:mpd:2011",
@ -3570,9 +3575,7 @@ get "/api/manifest/dash/id/:id" do |env|
xml.element("Period") do xml.element("Period") do
xml.element("AdaptationSet", mimeType: "audio/mp4", startWithSAP: 1, subsegmentAlignment: true) do xml.element("AdaptationSet", mimeType: "audio/mp4", startWithSAP: 1, subsegmentAlignment: true) do
audio_streams.each do |fmt| audio_streams.each do |fmt|
mimetype = fmt["type"].split(";")[0]
codecs = fmt["type"].split("codecs=")[1].strip('"') codecs = fmt["type"].split("codecs=")[1].strip('"')
fmt_type = mimetype.split("/")[0]
bandwidth = fmt["bitrate"] bandwidth = fmt["bitrate"]
itag = fmt["itag"] itag = fmt["itag"]
url = fmt["url"] url = fmt["url"]
@ -3591,7 +3594,6 @@ get "/api/manifest/dash/id/:id" do |env|
xml.element("AdaptationSet", mimeType: "video/mp4", startWithSAP: 1, subsegmentAlignment: true, xml.element("AdaptationSet", mimeType: "video/mp4", startWithSAP: 1, subsegmentAlignment: true,
scanType: "progressive") do scanType: "progressive") do
video_streams.each do |fmt| video_streams.each do |fmt|
mimetype = fmt["type"].split(";")
codecs = fmt["type"].split("codecs=")[1].strip('"') codecs = fmt["type"].split("codecs=")[1].strip('"')
bandwidth = fmt["bitrate"] bandwidth = fmt["bitrate"]
itag = fmt["itag"] itag = fmt["itag"]