ProjectSegfault/invidious-experimenting
4
0
Fork 0
forked from midou/invidious
Code Pull Requests Activity

Add webm to dash manifests

Browse Source
This commit is contained in:
Omar Roth 2019-04-12 08:04:59 -05:00
parent af1823db8c
commit 98295b85ab
1 changed files with 32 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/invidious.cr
View File

@ -4124,47 +4124,51 @@ get "/api/manifest/dash/id/:id" do |env|
end end
end end
audio_streams = video.audio_streams(adaptive_fmts).select { |stream| stream["type"].starts_with? "audio/mp4" } audio_streams = video.audio_streams(adaptive_fmts)
video_streams = video.video_streams(adaptive_fmts).select { |stream| stream["type"].starts_with? "video/mp4" }.uniq { |stream| stream["size"] } video_streams = video.video_streams(adaptive_fmts)
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",
"profiles": "urn:mpeg:dash:profile:isoff-live:2011", minBufferTime: "PT1.5S", type: "static", "profiles": "urn:mpeg:dash:profile:isoff-live:2011", minBufferTime: "PT1.5S", type: "static",
mediaPresentationDuration: "PT#{video.info["length_seconds"]}S") do mediaPresentationDuration: "PT#{video.info["length_seconds"]}S") do
xml.element("Period") do xml.element("Period") do
xml.element("AdaptationSet", mimeType: "audio/mp4", startWithSAP: 1, subsegmentAlignment: true) do {"audio/mp4", "audio/webm"}.each do |mime_type|
audio_streams.each do |fmt| xml.element("AdaptationSet", mimeType: mime_type, startWithSAP: 1, subsegmentAlignment: true) do
codecs = fmt["type"].split("codecs=")[1].strip('"') audio_streams.select { |stream| stream["type"].starts_with? mime_type }.each do |fmt|
bandwidth = fmt["bitrate"] codecs = fmt["type"].split("codecs=")[1].strip('"')
itag = fmt["itag"] bandwidth = fmt["bitrate"]
url = fmt["url"] itag = fmt["itag"]
url = fmt["url"]
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", xml.element("AudioChannelConfiguration", schemeIdUri: "urn:mpeg:dash:23003:3:audio_channel_configuration:2011",
value: "2") value: "2")
xml.element("BaseURL") { xml.text url } xml.element("BaseURL") { xml.text url }
xml.element("SegmentBase", indexRange: fmt["index"]) do xml.element("SegmentBase", indexRange: fmt["index"]) do
xml.element("Initialization", range: fmt["init"]) xml.element("Initialization", range: fmt["init"])
end
end end
end end
end end
end end
xml.element("AdaptationSet", mimeType: "video/mp4", startWithSAP: 1, subsegmentAlignment: true, {"video/mp4", "video/webm"}.each do |mime_type|
scanType: "progressive") do xml.element("AdaptationSet", mimeType: mime_type, startWithSAP: 1, subsegmentAlignment: true,
video_streams.each do |fmt| scanType: "progressive") do
codecs = fmt["type"].split("codecs=")[1].strip('"') video_streams.select { |stream| stream["type"].starts_with? mime_type }.each do |fmt|
bandwidth = fmt["bitrate"] codecs = fmt["type"].split("codecs=")[1].strip('"')
itag = fmt["itag"] bandwidth = fmt["bitrate"]
url = fmt["url"] itag = fmt["itag"]
width, height = fmt["size"].split("x") url = fmt["url"]
width, height = fmt["size"].split("x")
xml.element("Representation", id: itag, codecs: codecs, width: width, height: height, xml.element("Representation", id: itag, codecs: codecs, width: width, height: height,
startWithSAP: "1", maxPlayoutRate: "1", startWithSAP: "1", maxPlayoutRate: "1",
bandwidth: bandwidth, frameRate: fmt["fps"]) do bandwidth: bandwidth, frameRate: fmt["fps"]) do
xml.element("BaseURL") { xml.text url } xml.element("BaseURL") { xml.text url }
xml.element("SegmentBase", indexRange: fmt["index"]) do xml.element("SegmentBase", indexRange: fmt["index"]) do
xml.element("Initialization", range: fmt["init"]) xml.element("Initialization", range: fmt["init"])
end
end end
end end
end end