1 files changed, 18 insertions, 11 deletions
diff --git a/TOOLS/lua/autocrop.lua b/TOOLS/lua/autocrop.lua
index af6021b75a..3683b9f02a 100644
--- a/TOOLS/lua/autocrop.lua
+++ b/TOOLS/lua/autocrop.lua
@@ -56,6 +56,9 @@ detect_min_ratio: number[0.0-1.0] - The ratio of the minimum clip
 detect_seconds: seconds - How long to gather cropdetect data.
     Increasing this may be desirable to allow cropdetect more
     time to collect data.
+
+suppress_osd: bool - Whether the OSD shouldn't be used when filters
+    are applied and removed.
 --]]
 
 require "mp.msg"
@@ -67,7 +70,8 @@ local options = {
     detect_limit = "24/255",
     detect_round = 2,
     detect_min_ratio = 0.5,
-    detect_seconds = 1
+    detect_seconds = 1,
+    suppress_osd = false,
 }
 read_options(options)
 
@@ -82,6 +86,8 @@ timers = {
     detect_crop = nil
 }
 
+local command_prefix = options.suppress_osd and 'no-osd' or ''
+
 function is_filter_present(label)
     local filters = mp.get_property_native("vf")
     for index, filter in pairs(filters) do
@@ -102,17 +108,18 @@ function is_enough_time(seconds)
 end
 
 function is_cropable()
-    local vid = mp.get_property_native("vid")
-    local is_album = vid and mp.get_property_native(
-        string.format("track-list/%d/albumart", vid)
-    ) or false
+    for _, track in pairs(mp.get_property_native('track-list')) do
+        if track.type == 'video' and track.selected then
+            return not track.albumart
+        end
+    end
 
-    return vid and not is_album
+    return false
 end
 
 function remove_filter(label)
     if is_filter_present(label) then
-        mp.command(string.format('vf remove @%s', label))
+        mp.command(string.format('%s vf remove @%s', command_prefix, label))
         return true
     end
     return false
@@ -156,8 +163,8 @@ function detect_crop()
 
     mp.command(
         string.format(
-            'vf pre @%s:cropdetect=limit=%s:round=%d:reset=0',
-            labels.cropdetect, limit, round
+            '%s vf pre @%s:cropdetect=limit=%s:round=%d:reset=0',
+            command_prefix, labels.cropdetect, limit, round
         )
     )
 
@@ -248,8 +255,8 @@ function apply_crop(meta)
 
     -- Apply crop.
     mp.command(
-        string.format("vf pre @%s:lavfi-crop=w=%s:h=%s:x=%s:y=%s",
-            labels.crop, meta.w, meta.h, meta.x, meta.y
+        string.format("%s vf pre @%s:lavfi-crop=w=%s:h=%s:x=%s:y=%s",
+            command_prefix, labels.crop, meta.w, meta.h, meta.x, meta.y
         )
     )
 end