hashirama/videoclip
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

add mpv.net support (#28)

Browse source 
* change argument as written in the mpv manual

* include filename in clip saved notification

* add mpvnet to encoder alive check

* revert unnecessary changes

---------

Co-authored-by: Ren Tatsumoto <tatsu@autistici.org>
This commit is contained in:
brainless 2024-02-26 14:49:13 +01:00 committed by GitHub
parent 19f3563702
commit 305dbd2fdf
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 20 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
encoder.lua
View file

@ -55,7 +55,7 @@ end
this.mkargs_video = function(out_clip_path) this.mkargs_video = function(out_clip_path)
local args = { local args = {
'mpv', this.player,
mp.get_property('path'), mp.get_property('path'),
'--loop-file=no', '--loop-file=no',
'--keep-open=no', '--keep-open=no',
@ -82,7 +82,7 @@ this.mkargs_video = function(out_clip_path)
table.concat { '--ovcopts-add=preset=', this.config.preset }, table.concat { '--ovcopts-add=preset=', this.config.preset },
table.concat { '--vf-add=scale=', this.config.video_width, ':', this.config.video_height }, table.concat { '--vf-add=scale=', this.config.video_width, ':', this.config.video_height },
table.concat { '--ytdl-format=', mp.get_property("ytdl-format") }, table.concat { '--ytdl-format=', mp.get_property("ytdl-format") },
table.concat { '-o=', out_clip_path }, table.concat { '--o=', out_clip_path },
table.concat { '--sid=', mp.get_property("sid") }, table.concat { '--sid=', mp.get_property("sid") },
table.concat { '--secondary-sid=', mp.get_property("secondary-sid") }, table.concat { '--secondary-sid=', mp.get_property("secondary-sid") },
table.concat { '--sub-delay=', mp.get_property("sub-delay") }, table.concat { '--sub-delay=', mp.get_property("sub-delay") },
@ -105,7 +105,7 @@ end
this.mkargs_audio = function(out_clip_path) this.mkargs_audio = function(out_clip_path)
return { return {
'mpv', this.player,
mp.get_property('path'), mp.get_property('path'),
'--loop-file=no', '--loop-file=no',
'--keep-open=no', '--keep-open=no',
@ -123,7 +123,7 @@ this.mkargs_audio = function(out_clip_path)
table.concat { '--aid=', mp.get_property("aid") }, -- track number table.concat { '--aid=', mp.get_property("aid") }, -- track number
table.concat { '--oacopts-add=b=', this.config.audio_bitrate }, table.concat { '--oacopts-add=b=', this.config.audio_bitrate },
table.concat { '--ytdl-format=', mp.get_property("ytdl-format") }, table.concat { '--ytdl-format=', mp.get_property("ytdl-format") },
table.concat { '-o=', out_clip_path } table.concat { '--o=', out_clip_path }
} }
end end
@ -161,7 +161,7 @@ this.create_clip = function(clip_type, on_complete)
if ret.status ~= 0 or string.match(ret.stdout, "could not open") then if ret.status ~= 0 or string.match(ret.stdout, "could not open") then
h.notify(string.format("Error: couldn't create clip %s.", output_file_path), "error", 5) h.notify(string.format("Error: couldn't create clip %s.", output_file_path), "error", 5)
else else
h.notify(string.format("Clip saved to %s.", output_dir_path), "info", 2) h.notify(string.format("Clip saved to %s.", output_file_path), "info", 2)
if on_complete then if on_complete then
on_complete(output_file_path) on_complete(output_file_path)
end end
@ -173,12 +173,24 @@ this.create_clip = function(clip_type, on_complete)
end end
this.set_encoder_alive = function() this.set_encoder_alive = function()
local args = { 'mpv', '--version' } local args_mpvnet = { 'mpvnet', '--version' }
local process_result = function(_, ret, _) local process_result_mpvnet = function(_, ret, _)
if ret.status ~= 0 or string.match(ret.stdout, "mpv") == nil then -- for some reason stdout is empty
if ret.status ~= 0 then
this.alive = false this.alive = false
else else
this.alive = true this.alive = true
this.player = 'mpvnet'
end
end
local args = { 'mpv', '--version' }
local process_result = function(_, ret, _)
if ret.status ~= 0 or string.match(ret.stdout, "mpv") == nil then
h.subprocess_async(args_mpvnet, process_result_mpvnet)
else
this.alive = true
this.player = 'mpv'
end end
end end
h.subprocess_async(args, process_result) h.subprocess_async(args, process_result)