From patchwork Tue Mar 6 22:19:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: sfan5 X-Patchwork-Id: 7833 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.181.170 with SMTP id m39csp4281011jaj; Tue, 6 Mar 2018 14:19:45 -0800 (PST) X-Google-Smtp-Source: AG47ELsY36FxnE+i3l9peQ9sSRTFl0WTyFqI7mu7lv+BRdcaW3PpyyfNc3HLz/aFtKlrubD6hGgd X-Received: by 10.28.159.209 with SMTP id i200mr11581229wme.87.1520374785339; Tue, 06 Mar 2018 14:19:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520374785; cv=none; d=google.com; s=arc-20160816; b=t7jkA4AbuHk9MxfZnPGDZPuXY8mlhxOLCEOZX2YHJ8jCL+VSoGQOPwa3mXHZzy+DKl d5xqZdFJBNYIKi5SKmZ5kCXcr4/L96+mIB5je9EfH6ovSM4DLgq4GCydb1+jrlG2IKwb Dm6ArhaCy7BJXCQdjpunQ6R+gjbwRDWBpeizV/+2WGed7nAMXSE+TrhuLQPZ5YYa4ij+ KjDZbLykFfSb3dMwdVw5H64svzBZ6Icp1DUCff0G35zlygksBIxfto1vpy4FmINwFCbh ZWsOMTGz2efGcuer3XQ1HWioe0NcZUm/nfkJrDAtIxNHVamTnQy+MVIbjgcaODpLTIzs TrKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:spamdiagnosticmetadata:spamdiagnosticoutput :content-language:accept-language:message-id:date:thread-index :thread-topic:to:from:delivered-to:arc-authentication-results; bh=rB8pzB9QSuuZJVgKvh1N+GW8MwFV0Eto+qe8nbYQhic=; b=zMS9oeUu6e7kiL/0kZFw6kAvV2DN+F+iDtz8EtLEGP9+aibJFVHXPqLaWRq4nfEoJp CwREWY7HReNGQYl4pB7aGflDyVDsitbNT0qKQm5/pnCT38OXimsdvWQasZ2fsoa3FbKh mNTScrz1eBLkI5oyUGyQk7Bzki+72SzYo5HtZQrrbAGh+Rv6cMClsrzyc+W5HdseBze7 6pnqeIISWaStyRaWQjKuFrHhmCR4FZLvezMMEtLigiliC3lMB3FoQxWK/3XqvvaHf8nP Wv3TaAcW1gFnOdKhPAoMu5MrJM/mTkQMXjSq++q8fuzKLJpOt1TekcIHHbdpeOGRFwLC EcXQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id f19si6734003wmf.143.2018.03.06.14.19.44; Tue, 06 Mar 2018 14:19:45 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C520068A3C9; Wed, 7 Mar 2018 00:19:35 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-oln040092066068.outbound.protection.outlook.com [40.92.66.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id ADDD4689E22 for ; Wed, 7 Mar 2018 00:19:29 +0200 (EET) Received: from VE1EUR01FT044.eop-EUR01.prod.protection.outlook.com (10.152.2.53) by VE1EUR01HT107.eop-EUR01.prod.protection.outlook.com (10.152.3.133) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.20.485.12; Tue, 6 Mar 2018 22:19:36 +0000 Received: from DB3PR0202MB3452.eurprd02.prod.outlook.com (10.152.2.54) by VE1EUR01FT044.mail.protection.outlook.com (10.152.3.137) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.527.22 via Frontend Transport; Tue, 6 Mar 2018 22:19:37 +0000 Received: from DB3PR0202MB3452.eurprd02.prod.outlook.com ([fe80::829:5460:4898:4396]) by DB3PR0202MB3452.eurprd02.prod.outlook.com ([fe80::829:5460:4898:4396%13]) with mapi id 15.20.0548.016; Tue, 6 Mar 2018 22:19:36 +0000 From: Stefan _ To: FFmpeg development discussions and patches Thread-Topic: [PATCH] avcodec/mediacodec_wrapper: fix false positives in swdec blacklist Thread-Index: AQHTtZk1TzRuOeR92UaqObh11/5izA== Date: Tue, 6 Mar 2018 22:19:36 +0000 Message-ID: Accept-Language: de-DE, en-US Content-Language: en-US X-MS-Has-Attach: yes X-MS-TNEF-Correlator: x-incomingtopheadermarker: OriginalChecksum:C4375BF89AC34D2C8502F883E496D5EC132882F1F316BAF2F867BF83BF122A6D; UpperCasedChecksum:425C7BE7A42439FB3EFD07E8BC710A1A7E20B4DEDDBA200FAA8AE4CBB90CBF54; SizeAsReceived:7040; Count:44 x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [TXzryUh4B5B7bivXIaIbR7yJA0toqWgxwdbMtref5IMx/dWNTOYklhoyqPdPleVu] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; VE1EUR01HT107; 6:QLxSpAPVp+Pc2qIAHAO3ZSY6rKRt9z+ucTp0wNAGz4ukE7ya2qLf+trWYRATZ0nJhrTSm/oe5vgY6BN8c1+JdZZ6rvQyh0GMYi1mcYrBsN4sNgnPdHmjW3dHiIG/WYzx7C41PBhmg/1Tf67gY5IiMOGodUxTNv63cuhbpqQVeY3FyObpeGqDKKuHEcfUkwHVw2FCb1d1Pby2oLVy8FrKomaPWF9Wo1+sjsfi9yiGHNL+djAC1AIk1zAeLYpPRd10R6b+AjU3N5ptpU2/eBPqXaW/tzyEG8jO2AISJtXOZ2cbEG8kP82lV7APzHOyzjTJG8VJ4nJMfPPulMi7dYQpzSQIZu8EKDYg66eLKSVVDmE=; 5:TpPMXUEXsUwTBLal1glzO4dzUvAHrKDUxjADdY1h300XtYpD/4oTUlrgJSDDGj2CgIEWlQoBy3Bsew7hkdBHaFSvRDykCOXQ4qyCvNTXzZ2DRnF1wQsKkrKiG0TXLRKYI2uHBR9a1m+VAB7UXosE0FdQ6ie4CMLZERVUPGmdto4=; 24:saN1+DIEp3ss3wb91UOL7lvjOcQMEuz46zk5J6MG6Rr+jybQvdzC5IARSHNO2pJkcAsWsoU+Yb0KR7caF9cOBLcVmsMPQ1gO7Yb9WurFcVA=; 7:RRwUGQ4ObEeagfaJqC5UqIz+WbtZMAp4/R96cMt5Bs2se3S9G+o/NWGvIKCy24Q8KunZWOPsewtgTu0OGrGdshY3R7KasKV7kIVm4GUxRN8MkA1pWhd7y0EIiBsZU1PnkqUUyfjqUjxTEvMYpnw7hIOII1olDB1gLBELm8w0JC2DHzboScqeoks0O6s7S2rbR7n7QVBQ+y/3wDZFoxDcFd7CScc+h/SM/I5jiOHPB2fkLB/NYwMWYByUOCblf6xC x-incomingheadercount: 44 x-eopattributedmessage: 0 x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(201702061078)(5061506573)(5061507331)(1603103135)(2017031320274)(2017031324274)(2017031323274)(2017031322404)(1601125374)(1603101448)(1701031045); SRVR:VE1EUR01HT107; x-ms-traffictypediagnostic: VE1EUR01HT107: x-ms-office365-filtering-correlation-id: 872c995b-9449-4f3d-5e03-08d583b05813 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(444000031); SRVR:VE1EUR01HT107; BCL:0; PCL:0; RULEID:; SRVR:VE1EUR01HT107; x-forefront-prvs: 06036BD506 x-forefront-antispam-report: SFV:NSPM; SFS:(7070007)(98901004); DIR:OUT; SFP:1901; SCL:1; SRVR:VE1EUR01HT107; H:DB3PR0202MB3452.eurprd02.prod.outlook.com; FPR:; SPF:None; LANG:; x-microsoft-antispam-message-info: wLuMR9xzRhbmMzJImi5TkF5NHMxHpqY/9+MpJtMvH9vs31Ru9EGwu32qTJ7X+nO+AIjS4ZkBbJHpojT0LYdJWws/Gf5iKKvl+E7dW6ZJHjUtQzrS5Nx7TKGNfXxNgzJFXwwwq2hVsnfW1pSN71frvgMiQbGqxf1QwRM4IPvPwYpHQ2w88PD2Dr9/DYBdMEmv spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 872c995b-9449-4f3d-5e03-08d583b05813 X-MS-Exchange-CrossTenant-originalarrivaltime: 06 Mar 2018 22:19:36.1377 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Internet X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1EUR01HT107 Subject: [FFmpeg-devel] [PATCH] avcodec/mediacodec_wrapper: fix false positives in swdec blacklist X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Hi, attached patch fixes an issue with the previous mediacodec patch. From b6a8721679483900b4f824504fdb1f7944ec268f Mon Sep 17 00:00:00 2001 From: sfan5 Date: Tue, 6 Mar 2018 23:14:09 +0100 Subject: [PATCH] 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'. --- 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 8381128..11d7f66 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; -- 2.16.2