omxil: Ignore all "secure"/DRM codecs

We can't use any of them since they don't output plain YUV data
but require using direct rendering.

This simplifies the condition and possibly also catches other cases
where it would be needed.

The case where it was added was for a device where the codec ending
with .secure was listed before the normal one. This kind of codec
is available on many other devices as well, but they're normally listed
only after the normal ones so we never pick them.

Signed-off-by: Martin Storsjö <martin@martin.st>

diff --git a/modules/codec/omxil/omxil.c b/modules/codec/omxil/omxil.c
index 8f35c6cc0a67727b0a82ad37b620bccf381dd77f..832582f50ca949685d19639eb5ec74b49e44f35a 100644 (file)
--- a/modules/codec/omxil/omxil.c
+++ b/modules/codec/omxil/omxil.c
@@ -993,8 +993,9 @@ loaded:
          * has got a working OMX.qcom.video.decoder.avc instead though. */
         if (!strncmp(p_sys->ppsz_components[i], "OMX.ARICENT.", 12))
             continue;
-        /* Some nVidia codec with DRM */
-        if (!strncmp(p_sys->ppsz_components[i], "OMX.Nvidia.h264.decode.secure", 29))
+        /* Codecs with DRM, that don't output plain YUV data but only
+         * support direct rendering where the output can't be intercepted. */
+        if (strstr(p_sys->ppsz_components[i], ".secure"))
             continue;
         /* Use VC1 decoder for WMV3 for now */
         if (!strcmp(p_sys->ppsz_components[i], "OMX.SEC.WMV.Decoder"))