[FFmpeg-cvslog] avcodec/mediacodec_wrapper: fix false positives in swdec blacklist

Stefan _ git at videolan.org
Wed Mar 7 14:56:19 EET 2018


ffmpeg | branch: master | Stefan _ <sfan5 at live.de> | Tue Mar  6 22:19:36 2018 +0000| [5ab0ecf2830fd7a864bb21f7fe247594872932fa] | committer: Matthieu Bouron

avcodec/mediacodec_wrapper: fix false positives in swdec blacklist

'OMX.SEC.avc.dec' is a valid hardware decoder, while the decoders
we seek to blacklist all match 'OMX.SEC.*.sw.dec'.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5ab0ecf2830fd7a864bb21f7fe247594872932fa
---

 libavcodec/mediacodec_wrapper.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/mediacodec_wrapper.c b/libavcodec/mediacodec_wrapper.c
index 83811281a5..11d7f665c7 100644
--- a/libavcodec/mediacodec_wrapper.c
+++ b/libavcodec/mediacodec_wrapper.c
@@ -473,7 +473,7 @@ char *ff_AMediaCodecList_getCodecNameByType(const char *mime, int profile, int e
                 if (
                     strstr(name, "OMX.google") ||
                     strstr(name, "OMX.ffmpeg") ||
-                    strstr(name, "OMX.SEC") ||
+                    (strstr(name, "OMX.SEC") && strstr(name, ".sw.")) ||
                     !strcmp(name, "OMX.qcom.video.decoder.hevcswvdec")) {
                     av_freep(&name);
                     goto done_with_type;



More information about the ffmpeg-cvslog mailing list