Git-Mirrors/invidious
1
0
Fork 0
mirror of https://github.com/iv-org/invidious.git synced 2024-10-01 01:25:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix dash endpoint

Browse Source
This commit is contained in:
Omar Roth 2018-06-06 17:55:51 -05:00
parent 208f32661b
commit e0dd56f4ff
1 changed files with 38 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/invidious.cr
View File

@ -594,7 +594,8 @@ get "/redirect" do |env|
end end
end end
# Return dash manifest for the given video ID # Return dash manifest for the given video ID, note this will not work on
# videos that already have a dashmpd in video info.
get "/api/manifest/dash/id/:id" do |env| get "/api/manifest/dash/id/:id" do |env|
env.response.headers.add("Access-Control-Allow-Origin", "*") env.response.headers.add("Access-Control-Allow-Origin", "*")
env.response.content_type = "application/dash+xml" env.response.content_type = "application/dash+xml"
@ -644,9 +645,10 @@ get "/api/manifest/dash/id/:id" do |env|
end end
manifest = XML.build(indent: " ", encoding: "UTF-8") do |xml| manifest = XML.build(indent: " ", encoding: "UTF-8") do |xml|
xml.element("MPD", "xmlns:xsi": "http://www.w3.org/2001/XMLSchema-instance", "xsi:schemaLocation": "urn:mpeg:DASH:schema:MPD:2011 DASH-MPD.xsd", xml.element("MPD", "xmlns:xsi": "http://www.w3.org/2001/XMLSchema-instance", "xmlns": "urn:mpeg:DASH:schema:MPD:2011",
xmlns: "urn:mpeg:dash:schema:mpd:2011", profiles: "urn:mpeg:dash:profile:isoff-main:2011", "xmlns:yt": "http://youtube.com/yt/2012/10/10", "xsi:schemaLocation": "urn:mpeg:DASH:schema:MPD:2011 DASH-MPD.xsd",
mediaPresentationDuration: "PT#{video.info["length_seconds"]}S", minBufferTime: "PT2S", type: "static") do minBufferTime: "PT1.5S", profiles: "urn:mpeg:dash:profile:isoff-main:2011", type: "static",
mediaPresentationDuration: "PT#{video.info["length_seconds"]}S") do
xml.element("Period") do xml.element("Period") do
xml.element("AdaptationSet", id: 0, mimeType: "audio/mp4", subsegmentAlignment: true) do xml.element("AdaptationSet", id: 0, mimeType: "audio/mp4", subsegmentAlignment: true) do
xml.element("Role", schemeIdUri: "urn:mpeg:DASH:role:2011", value: "main") xml.element("Role", schemeIdUri: "urn:mpeg:DASH:role:2011", value: "main")
@ -657,8 +659,12 @@ get "/api/manifest/dash/id/:id" do |env|
bandwidth = fmt["bitrate"] bandwidth = fmt["bitrate"]
itag = fmt["itag"] itag = fmt["itag"]
url = fmt["url"] url = fmt["url"]
url = url.gsub("?", "/")
url = url.gsub("&", "/")
url = url.gsub("=", "/")
xml.element("Representation", id: fmt["itag"], codecs: codecs, bandwidth: bandwidth) do xml.element("Representation", id: fmt["itag"], codecs: codecs, bandwidth: bandwidth) do
xml.element("AudioChannelConfiguration", schemeIdUri: "urn:mpeg:dash:23003:3:audio_channel_configuration:2011", value: "2")
xml.element("BaseURL") { xml.text url } xml.element("BaseURL") { xml.text url }
xml.element("SegmentBase", indexRange: fmt["init"]) do xml.element("SegmentBase", indexRange: fmt["init"]) do
xml.element("Initialization", range: fmt["index"]) xml.element("Initialization", range: fmt["index"])
@ -672,13 +678,16 @@ get "/api/manifest/dash/id/:id" do |env|
video_streams.each do |fmt| video_streams.each do |fmt|
mimetype, codecs = fmt["type"].split(";") mimetype, codecs = fmt["type"].split(";")
codecs = codecs[9..-2] codecs = codecs[9..-2]
fmt_type = mimetype.split("/")[0]
bandwidth = fmt["bitrate"] bandwidth = fmt["bitrate"]
itag = fmt["itag"] itag = fmt["itag"]
url = fmt["url"] url = fmt["url"]
url = url.gsub("?", "/")
url = url.gsub("&", "/")
url = url.gsub("=", "/")
height, width = fmt["size"].split("x") height, width = fmt["size"].split("x")
xml.element("Representation", id: itag, codecs: codecs, width: width, height: height, bandwidth: bandwidth, frameRate: fmt["fps"]) do xml.element("Representation", id: itag, codecs: codecs, width: width, startWithSAP: "1", maxPlayoutRate: "1",
height: height, bandwidth: bandwidth, frameRate: fmt["fps"]) do
xml.element("BaseURL") { xml.text url } xml.element("BaseURL") { xml.text url }
xml.element("SegmentBase", indexRange: fmt["init"]) do xml.element("SegmentBase", indexRange: fmt["init"]) do
xml.element("Initialization", range: fmt["index"]) xml.element("Initialization", range: fmt["index"])
@ -862,8 +871,29 @@ get "/modify_theme" do |env|
env.redirect referer env.redirect referer
end end
get "/videoplayback" do |env| get "/videoplayback*" do |env|
query_params = env.params.query path = env.request.path
if path != "/videoplayback"
path = path.lchop("/videoplayback/")
path = path.split("/")
# puts path
raw_params = {} of String => Array(String)
path.each_slice(2) do |pair|
key, value = pair
value = URI.unescape(value)
if raw_params[key]?
raw_params[key] << value
else
raw_params[key] = [value]
end
end
query_params = HTTP::Params.new(raw_params)
else
query_params = env.params.query
end
fvip = query_params["fvip"] fvip = query_params["fvip"]
mn = query_params["mn"].split(",")[0] mn = query_params["mn"].split(",")[0]