Skip to content

V
vlc-gpu
Commit fa83703f authored by Pierre Ynard's avatar Pierre Ynard
Browse files
Options

youtube.lua: clean up

parent 5a09c805
Show whitespace changes
Inline Side-by-side
Showing with 19 additions and 62 deletions
share/lua/playlist/youtube.lua
View file @ fa83703f
--[[ --[[
$Id$ $Id$
Copyright © 2007-2009 the VideoLAN team Copyright © 2007-2011 the VideoLAN team
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
...@@ -58,7 +58,8 @@ end ...@@ -58,7 +58,8 @@ end
function parse() function parse()
if string.match( vlc.path, "watch%?v=" ) if string.match( vlc.path, "watch%?v=" )
then -- This is the HTML page's URL then -- This is the HTML page's URL
-- fmt is the format of the video: 18 is HQ (mp4) -- fmt is the format of the video
-- (cf. http://en.wikipedia.org/wiki/YouTube#Quality_and_codecs)
fmt = get_url_param( vlc.path, "fmt" ) fmt = get_url_param( vlc.path, "fmt" )
while true do while true do
-- Try to find the video's title -- Try to find the video's title
...@@ -71,27 +72,21 @@ function parse() ...@@ -71,27 +72,21 @@ function parse()
end end
if string.match( line, "<meta name=\"description\"" ) then if string.match( line, "<meta name=\"description\"" ) then
-- Don't ask me why they double encode ... -- Don't ask me why they double encode ...
_,_,description = vlc.strings.resolve_xml_special_chars(vlc.strings.resolve_xml_special_chars(string.find( line, "content=\"(.-)\"" ))) _,_,description = string.find( line, "content=\"(.-)\"" )
description = vlc.strings.resolve_xml_special_chars( description )
description = vlc.strings.resolve_xml_special_chars( description )
end end
if string.match( line, "subscribe_to_user=" ) then if string.match( line, "subscribe_to_user=" ) then
_,_,artist = string.find( line, "subscribe_to_user=([^&]*)" ) _,_,artist = string.find( line, "subscribe_to_user=([^&]*)" )
end end
-- CURRENT: var swfConfig = { [a lot of stuff...], "video_id": "OHVvVmUNBFc", "sk": "WswKuJzDBsdD6oG3IakCXgC", "t": "OEgsToPDskK3zO44y0QN8Fr5ZSAZwCQp", "plid": "AARGnwWMrmGkbpOxAAAA4AT4IAA"}; -- JSON parameters, also formerly known as "swfConfig",
-- OLD 1: var swfArgs = {hl:'en',BASE_YT_URL:'http://youtube.com/',video_id:'XPJ7d8dq0t8',l:'292',t:'OEgsToPDskLFdOYrrlDm3FQPoQBYaCP1',sk:'0gnr-AE6QZJEZmCMd3lq_AC'}; -- "SWF_ARGS", "swfArgs" ...
-- OLD 2: var swfArgs = { "BASE_YT_URL": "http://youtube.com", "video_id": "OHVvVmUNBFc", "l": 88, "sk": "WswKuJzDBsdD6oG3IakCXgC", "t": "OEgsToPDskK3zO44y0QN8Fr5ZSAZwCQp", "plid": "AARGnwWMrmGkbpOxAAAA4AT4IAA", "tk": "mEL4E7PqHeaZp5OG19NQThHt9mXJU4PbRTOw6lz9osHi4Hixp7RE1w=="}; if string.match( line, "PLAYER_CONFIG" ) then
-- OLD 3: 'SWF_ARGS': { [a lot of stuff...], "video_id": "OHVvVmUNBFc", "sk": "WswKuJzDBsdD6oG3IakCXgC", "t": "OEgsToPDskK3zO44y0QN8Fr5ZSAZwCQp", "plid": "AARGnwWMrmGkbpOxAAAA4AT4IAA"}; url_map = string.match( line, "\"url_encoded_fmt_stream_map\": \"(.-)\"" )
if ( string.match( line, "PLAYER_CONFIG" ) or string.match( line, "swfConfig" ) or string.match( line, "SWF_ARGS" ) or string.match( line, "swfArgs" ) ) and string.match( line, "video_id" ) then if url_map then
if string.match( line, "BASE_YT_URL" ) then
_,_,base_yt_url = string.find( line, "\"BASE_YT_URL\": \"(.-)\"" )
end
_,_,t = string.find( line, "\"t\": \"(.-)\"" )
-- vlc.msg.err( t )
-- video_id = string.gsub( line, ".*&video_id:'([^']*)'.*", "%1" )
fmt_url_map = string.match( line, "\"url_encoded_fmt_stream_map\": \"(.-)\"" )
if fmt_url_map then
-- FIXME: do this properly -- FIXME: do this properly
fmt_url_map = string.gsub( fmt_url_map, "\\u0026", "&" ) url_map = string.gsub( url_map, "\\u0026", "&" )
for url,itag in string.gmatch( fmt_url_map, "url=([^&,]+).-&itag=(%d+)" ) do for url,itag in string.gmatch( url_map, "url=([^&,]+).-&itag=(%d+)" ) do
-- Apparently formats are listed in quality order, -- Apparently formats are listed in quality order,
-- so we can afford to simply take the first one -- so we can afford to simply take the first one
if not fmt or tonumber( itag ) == tonumber( fmt ) then if not fmt or tonumber( itag ) == tonumber( fmt ) then
...@@ -101,56 +96,18 @@ function parse() ...@@ -101,56 +96,18 @@ function parse()
end end
end end
end end
-- Also available on non-HTML5 pages: var swfHTML = (isIE) ? "<object [...]><param name=\"flashvars\" value=\"rv.2.thumbnailUrl=http%3A%2F%2Fi4.ytimg.com%2Fvi%2F3MLp7YNTznE%2Fdefault.jpg&rv.7.length_seconds=384 [...] &video_id=OHVvVmUNBFc [...] &t=OEgsToPDskK3zO44y0QN8Fr5ZSAZwCQp [...] -- There is also another version of the parameters, encoded
elseif string.match( line, "swfHTML" ) and string.match( line, "video_id" ) then -- differently, as an HTML attribute of an <object> or <embed>
_,_,t = string.find( line, "&t=(.-)&" ) -- tag; but we don't need it now
-- Also available in HTML5 pages: videoPlayer.setAvailableFormat("http://v6.lscache4.c.youtube.com/videoplayback?ip=82.0.0.0&sparams=id%2Cexpire%2Cip%2Cipbits%2Citag%2Calgorithm%2Cburst%2Cfactor&algorithm=throttle-factor&itag=45&ipbits=8&burst=40&sver=3&expire=1275688800&key=yt1&signature=6ED860441298D1157FF3013A5D72727F25831F09.4C196BEA9F8F9B83CE678D79AD918B83D5E98B46&factor=1.25&id=7117715cf57d18d4", "video/webm; codecs=&quot;vp8.0, vorbis&quot;", "hd720");
elseif string.match( line, "videoPlayer%.setAvailableFormat" ) then
url,itag = string.match( line, "videoPlayer%.setAvailableFormat%(\"(.-itag=(%d+).-)\",.+%)" )
if url then
-- For now, WebM formats are listed only in the HTML5
-- section, that is also only when HTML5 is enabled.
-- Format 45 is 720p, and 43 is lower resolution.
if tonumber( itag ) == 45 or ( tonumber( itag ) == 43 and not webm_path ) then
webm_path = url
end
-- Grab something if fmt_url_map failed
if not path and ( not fmt or tonumber( itag ) == tonumber( fmt ) ) then
path = url
end
end
end end
end end
if not video_id then
video_id = get_url_param( vlc.path, "v" ) video_id = get_url_param( vlc.path, "v" )
end
arturl = get_arturl( vlc.path, video_id ) arturl = get_arturl( vlc.path, video_id )
if not fmt then
-- Prefer WebM formats if this is an &html5=True URL
html5 = get_url_param( vlc.path, "html5" )
if html5 == "True" and webm_path then
path = webm_path
end
end
if not path then if not path then
if not base_yt_url then vlc.msg.err( "Couldn't extract youtube video URL, please check for updates to this script" )
base_yt_url = "http://youtube.com/" return { }
end
if fmt then
format = "&fmt=" .. fmt
else
format = ""
end
if t then
path = base_yt_url .. "get_video?video_id="..video_id.."&t="..t..format
else
-- This shouldn't happen ... but keep it as a backup.
path = "http://www.youtube.com/v/"..video_id
end
end end
return { { path = path; name = name; description = description; artist = artist; arturl = arturl } } return { { path = path; name = name; description = description; artist = artist; arturl = arturl } }
else -- This is the flash player's URL else -- This is the flash player's URL
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment