Storyboards: Cleanup and document code

This commit is contained in:
Samantaz Fox 2023-10-08 20:29:41 +02:00
parent 8327862697
commit da3d58f03c
No known key found for this signature in database
GPG Key ID: F42821059186176E
3 changed files with 113 additions and 73 deletions

View File

@ -271,17 +271,17 @@ module Invidious::JSONify::APIv1
def storyboards(json, id, storyboards) def storyboards(json, id, storyboards)
json.array do json.array do
storyboards.each do |storyboard| storyboards.each do |sb|
json.object do json.object do
json.field "url", "/api/v1/storyboards/#{id}?width=#{storyboard.width}&height=#{storyboard.height}" json.field "url", "/api/v1/storyboards/#{id}?width=#{sb.width}&height=#{sb.height}"
json.field "templateUrl", storyboard.url json.field "templateUrl", sb.url.to_s
json.field "width", storyboard.width json.field "width", sb.width
json.field "height", storyboard.height json.field "height", sb.height
json.field "count", storyboard.count json.field "count", sb.count
json.field "interval", storyboard.interval json.field "interval", sb.interval
json.field "storyboardWidth", storyboard.storyboard_width json.field "storyboardWidth", sb.columns
json.field "storyboardHeight", storyboard.storyboard_height json.field "storyboardHeight", sb.rows
json.field "storyboardCount", storyboard.storyboard_count json.field "storyboardCount", sb.images_count
end end
end end
end end

View File

@ -187,15 +187,14 @@ module Invidious::Routes::API::V1::Videos
haltf env, 500 haltf env, 500
end end
storyboards = video.storyboards width = env.params.query["width"]?.try &.to_i
width = env.params.query["width"]? height = env.params.query["height"]?.try &.to_i
height = env.params.query["height"]?
if !width && !height if !width && !height
response = JSON.build do |json| response = JSON.build do |json|
json.object do json.object do
json.field "storyboards" do json.field "storyboards" do
Invidious::JSONify::APIv1.storyboards(json, id, storyboards) Invidious::JSONify::APIv1.storyboards(json, id, video.storyboards)
end end
end end
end end
@ -205,32 +204,37 @@ module Invidious::Routes::API::V1::Videos
env.response.content_type = "text/vtt" env.response.content_type = "text/vtt"
storyboard = storyboards.select { |sb| width == "#{sb.width}" || height == "#{sb.height}" } # Select a storyboard matching the user's provided width/height
storyboard = video.storyboards.select { |x| x.width == width || x.height == height }
haltf env, 404 if storyboard.empty?
if storyboard.empty? # Alias variable, to make the code below esaier to read
haltf env, 404 sb = storyboard[0]
else
storyboard = storyboard[0]
end
WebVTT.build do |vtt| # Some base URL segments that we'll use to craft the final URLs
work_url = sb.proxied_url.dup
template_path = sb.proxied_url.path
# Initialize cue timing variables
time_delta = sb.interval.milliseconds
start_time = 0.milliseconds start_time = 0.milliseconds
end_time = storyboard.interval.milliseconds end_time = time_delta - 1.milliseconds
storyboard.storyboard_count.times do |i| # Build a VTT file for VideoJS-vtt plugin
url = storyboard.url return WebVTT.build do |vtt|
authority = /(i\d?).ytimg.com/.match!(url)[1]? sb.images_count.times do |i|
# Replace the variable component part of the path
work_url.path = template_path.sub("$M", i)
url = url.gsub("$M", i).gsub(%r(https://i\d?.ytimg.com/sb/), "") sb.rows.times do |j|
url = "#{HOST_URL}/sb/#{authority}/#{url}" sb.columns.times do |k|
# The URL fragment represents the offset of the thumbnail inside the storyboard image
work_url.fragment = "xywh=#{sb.width * k},#{sb.height * j},#{sb.width - 2},#{sb.height}"
storyboard.storyboard_height.times do |j| vtt.cue(start_time, end_time, work_url.to_s)
storyboard.storyboard_width.times do |k|
current_cue_url = "#{url}#xywh=#{storyboard.width * k},#{storyboard.height * j},#{storyboard.width - 2},#{storyboard.height}"
vtt.cue(start_time, end_time, current_cue_url)
start_time += storyboard.interval.milliseconds start_time += time_delta
end_time += storyboard.interval.milliseconds end_time += time_delta
end end
end end
end end

View File

@ -3,74 +3,110 @@ require "http/params"
module Invidious::Videos module Invidious::Videos
struct Storyboard struct Storyboard
getter url : String # Template URL
getter url : URI
getter proxied_url : URI
# Thumbnail parameters
getter width : Int32 getter width : Int32
getter height : Int32 getter height : Int32
getter count : Int32 getter count : Int32
getter interval : Int32 getter interval : Int32
getter storyboard_width : Int32
getter storyboard_height : Int32 # Image (storyboard) parameters
getter storyboard_count : Int32 getter rows : Int32
getter columns : Int32
getter images_count : Int32
def initialize( def initialize(
*, @url, @width, @height, @count, @interval, *, @url, @width, @height, @count, @interval,
@storyboard_width, @storyboard_height, @storyboard_count @rows, @columns, @images_count
) )
authority = /(i\d?).ytimg.com/.match(@url.host.not_nil!).not_nil![1]?
@proxied_url = URI.parse(HOST_URL)
@proxied_url.path = "/sb/#{authority}#{@url.path}"
@proxied_url.query = @url.query
end end
# Parse the JSON structure from Youtube # Parse the JSON structure from Youtube
def self.from_yt_json(container : JSON::Any) def self.from_yt_json(container : JSON::Any) : Array(Storyboard)
storyboards = container.dig?("playerStoryboardSpecRenderer", "spec") # Livestream storyboards are a bit different
.try &.as_s.split("|") # TODO: document exactly how
if !storyboards
if storyboard = container.dig?("playerLiveStoryboardSpecRenderer", "spec").try &.as_s if storyboard = container.dig?("playerLiveStoryboardSpecRenderer", "spec").try &.as_s
return [Storyboard.new( return [Storyboard.new(
url: storyboard.split("#")[0], url: URI.parse(storyboard.split("#")[0]),
width: 106, width: 106,
height: 60, height: 60,
count: -1, count: -1,
interval: 5000, interval: 5000,
storyboard_width: 3, rows: 3,
storyboard_height: 3, columns: 3,
storyboard_count: -1, images_count: -1
)] )]
end end
end
items = [] of Storyboard # Split the storyboard string into chunks
#
# General format (whitespaces added for legibility):
# https://i.ytimg.com/sb/<video_id>/storyboard3_L$L/$N.jpg?sqp=<sig0>
# | 48 # 27 # 100 # 10 # 10 # 0 # default # rs$<sig1>
# | 80 # 45 # 95 # 10 # 10 # 10000 # M$M # rs$<sig2>
# | 160 # 90 # 95 # 5 # 5 # 10000 # M$M # rs$<sig3>
#
storyboards = container.dig?("playerStoryboardSpecRenderer", "spec")
.try &.as_s.split("|")
return items if !storyboards return [] of Storyboard if !storyboards
# The base URL is the first chunk
url = URI.parse(storyboards.shift) url = URI.parse(storyboards.shift)
params = HTTP::Params.parse(url.query || "") params = url.query_params
storyboards.each_with_index do |sb, i| return storyboards.map_with_index do |sb, i|
width, height, count, storyboard_width, storyboard_height, interval, _, sigh = sb.split("#") # Separate the different storyboard parameters:
params["sigh"] = sigh # width/height: respective dimensions, in pixels, of a single thumbnail
url.query = params.to_s # count: how many thumbnails are displayed across the full video
# columns/rows: maximum amount of thumbnails that can be stuffed in a
# single image, horizontally and vertically.
# interval: interval between two thumbnails, in milliseconds
# sigh: URL cryptographic signature
width, height, count, columns, rows, interval, _, sigh = sb.split("#")
width = width.to_i width = width.to_i
height = height.to_i height = height.to_i
count = count.to_i count = count.to_i
interval = interval.to_i interval = interval.to_i
storyboard_width = storyboard_width.to_i columns = columns.to_i
storyboard_height = storyboard_height.to_i rows = rows.to_i
storyboard_count = (count / (storyboard_width * storyboard_height)).ceil.to_i
items << Storyboard.new( # Add the signature to the URL
url: url.to_s.sub("$L", i).sub("$N", "M$M"), params["sigh"] = sigh
url.query = params.to_s
# Replace the template parts with what we have
url.path = url.path.sub("$L", i).sub("$N", "M$M")
# This value represents the maximum amount of thumbnails that can fit
# in a single image. The last image (or the only one for short videos)
# will contain less thumbnails than that.
thumbnails_per_image = columns * rows
# This value represents the total amount of storyboards required to
# hold all of the thumbnails. It can't be less than 1.
images_count = (count / thumbnails_per_image).ceil.to_i
Storyboard.new(
url: url,
width: width, width: width,
height: height, height: height,
count: count, count: count,
interval: interval, interval: interval,
storyboard_width: storyboard_width, rows: rows,
storyboard_height: storyboard_height, columns: columns,
storyboard_count: storyboard_count images_count: images_count,
) )
end end
items
end end
end end
end end