New function Decoder.decodeIrSignalWithFallback(...)

to fix bengtmartensson/IrScrutinizer#531.
bengtmartensson · Jun 1, 2024 · b9510d1 · b9510d1
1 parent 977c2b4
commit b9510d1
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/src/main/java/org/harctoolbox/irp/Decoder.java b/src/main/java/org/harctoolbox/irp/Decoder.java
@@ -263,6 +263,18 @@ public AbstractDecodesCollection<? extends ElementaryDecode> decodeLoose(IrSigna
             return decodeIrSignal(irSignal, decoderParams);
     }
 
+    public AbstractDecodesCollection<? extends ElementaryDecode> decodeIrSignalWithFallback(IrSignal irSignal, DecoderParameters decoderParams) {
+        SimpleDecodesSet decodes = decodeIrSignal(irSignal, decoderParams);
+        if (!decodes.isEmpty())
+            return decodes;
+
+        if (decoderParams.ignoreLeadingGarbage || (!decoderParams.strict && (irSignal.introOnly() || irSignal.repeatOnly()))) {
+            ModulatedIrSequence sequence = irSignal.toModulatedIrSequence();
+            return decode(sequence, decoderParams);
+        }
+        return decodes; // empty
+    }
+
     public static final class DecoderParameters {
 
         private boolean strict;