Update OSC to upstream osc.lua

Author: TheAMM

src/patched_osc.lua

@@ -2,7 +2,7 @@
 This is mpv's original player/lua/osc.lua patched to display thumbnails
 
 Sections are denoted with -- mpv_thumbnail_script.lua --
-
+Current osc.lua version: 97816bbef0f97cfda7abdbe560707481d5f68ccd
 ]]--
 
 local assdraw = require 'mp.assdraw'
@@ -47,6 +47,7 @@ local user_opts = {
     tooltipborder = 1,          -- border of tooltip in bottom/topbar
     timetotal = false,          -- display total time instead of remaining time?
     timems = false,             -- display timecodes with milliseconds?
+    seekranges = true,          -- display seek ranges?
     visibility = "auto",        -- only used at init to set visibility_mode(...)
     boxmaxchars = 80,           -- title crop threshold for box layout
 }
@@ -64,6 +65,11 @@ end
 
 -- mpv_thumbnail_script.lua --
 
+-- Patch in msg.trace
+if not msg.trace then
+    msg.trace = function(...) return mp.log("trace", ...) end
+end
+
 Thumbnailer:register_client()
 
 function get_thumbnail_y_offset(thumb_size, msy)
@@ -1931,6 +1937,9 @@ function osc_init()
         end
     end
     ne.slider.seekRangesF = function()
+        if not (user_opts.seekranges) then
+            return nil
+        end
         local cache_state = mp.get_property_native("demuxer-cache-state", nil)
         if not cache_state then
             return nil
@@ -2010,25 +2019,23 @@ function osc_init()
     ne.content = function ()
         local dmx_cache = mp.get_property_number("demuxer-cache-duration")
         local cache_used = mp.get_property_number("cache-used")
+        local dmx_cache_state = mp.get_property_native("demuxer-cache-state", {})
         local is_network = mp.get_property_native("demuxer-via-network")
+        local show_cache = cache_used and not dmx_cache_state["eof"]
         if dmx_cache then
             dmx_cache = string.format("%3.0fs", dmx_cache)
         end
-        if cache_used then
-            local suffix = " KiB"
-            if (cache_used >= 1024) then
-                cache_used = cache_used/1024
-                suffix = " MiB"
-            end
-            cache_used = string.format("%5.1f%s", cache_used, suffix)
+        if dmx_cache_state["fw-bytes"] then
+            cache_used = (cache_used or 0)*1024 + dmx_cache_state["fw-bytes"]
         end
-        if (is_network and dmx_cache) or cache_used then
+        if (is_network and dmx_cache) or show_cache then
             -- Only show dmx-cache-duration by itself if it's a network file.
             -- Cache can be forced even for local files, so always show that.
             return string.format("Cache: %s%s%s",
                 (dmx_cache and dmx_cache or ""),
-                ((dmx_cache and cache_used) and " + " or ""),
-                (cache_used or ""))
+                ((dmx_cache and show_cache) and " | " or ""),
+                (show_cache and
+                    utils.format_bytes_humanized(cache_used) or ""))
         else
             return ""
         end
@@ -2076,7 +2083,7 @@ function show_osc()
     -- show when disabled can happen (e.g. mouse_move) due to async/delayed unbinding
     if not state.enabled then return end
 
-    msg.debug("show_osc")
+    msg.trace("show_osc")
     --remember last time of invocation (mouse move)
     state.showtime = mp.get_time()
 
@@ -2088,7 +2095,7 @@ function show_osc()
 end
 
 function hide_osc()
-    msg.debug("hide_osc")
+    msg.trace("hide_osc")
     if not state.enabled then
         -- typically hide happens at render() from tick(), but now tick() is
         -- no-op and won't render again to remove the osc, so do that manually.
@@ -2132,7 +2139,7 @@ end
 
 function timer_start()
     if not (state.timer_active) then
-        msg.debug("timer start")
+        msg.trace("timer start")
 
         if (state.timer == nil) then
             -- create new timer
@@ -2148,7 +2155,7 @@ end
 
 function timer_stop()
     if (state.timer_active) then
-        msg.debug("timer stop")
+        msg.trace("timer stop")
 
         if not (state.timer == nil) then
             -- kill timer
@@ -2174,12 +2181,12 @@ function request_init()
 end
 
 function render_wipe()
-    msg.debug("render_wipe()")
+    msg.trace("render_wipe()")
     mp.set_osd_ass(0, 0, "{}")
 end
 
 function render()
-    msg.debug("rendering")
+    msg.trace("rendering")
     local current_screen_sizeX, current_screen_sizeY, aspect = mp.get_osd_size()
     local mouseX, mouseY = get_virt_mouse_pos()
     local now = mp.get_time()
@@ -2393,7 +2400,7 @@ function tick()
     if (state.idle) then
 
         -- render idle message
-        msg.debug("idle message")
+        msg.trace("idle message")
         local icon_x, icon_y = 320 - 26, 140
 
         local ass = assdraw.ass_new()