[vlc-commits] omxil: Ignore all "secure"/DRM codecs

[Martin Storsjö]

vlc | branch: master | Martin Storsjö <martin at martin.st> | Tue Feb 26 12:52:32 2013 +0200| [03d6a4e29246a978a073a398d6ab8642d733ea1f] | committer: Martin Storsjö

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 at martin.st>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=03d6a4e29246a978a073a398d6ab8642d733ea1f
---

 modules/codec/omxil/omxil.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/codec/omxil/omxil.c b/modules/codec/omxil/omxil.c
index 8f35c6c..832582f 100644
--- 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"))