From patchwork Tue Mar 6 18:00:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: sfan5 X-Patchwork-Id: 7823 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.181.170 with SMTP id m39csp4045784jaj; Tue, 6 Mar 2018 10:00:33 -0800 (PST) X-Google-Smtp-Source: AG47ELur5ionOEdnV1TyYOagMnTqArrBHYkBxcPJjs6nMI0ftQq5Aw+Wm0kDZyZb7Y47TumvkF6w X-Received: by 10.223.187.72 with SMTP id x8mr15917574wrg.217.1520359233405; Tue, 06 Mar 2018 10:00:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520359233; cv=none; d=google.com; s=arc-20160816; b=PM3/FBQnXWLsNR7ksYr/qX6DnFCvvq57MfqQ1LwtgJuHPsMHBRncDcsZKD+DCAxzhK 7qIgRy/JcqAJNdLpowSaKup9bJ4zftqU2JOrGmZyHTmOuW7Oyj7CCD22R4Mh9hqcW96V c5j8iwUSqJ3iVskdQ3bPG6KwYT5y1Xk2raGXIiCdzBq6tME9DosVJkFivQPUF+G4Gv80 c2fo/ve0h5L4xy9GgbkdWFVqmKsqQVpliHTFrmA/ddwlYddyVpr6+6oyqNfT7regI3ew kYOiOZam45yhEVVPIErXxAujiucZFbVrrqCE/fhdHgaIloNqDam0XGJvQd0xvfc5j3D+ 8PkQ== 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=CngBSHF8aAWsheCI60mJzqtz1dDiIX+1Fl6s0GLkq0Q=; b=g0+atMzZDJedOLE/HT6nFfmORZDrwOyaQay8DXp3JPLgpKPporfU35S8v6IHVh0Z/a BU6yFp2PiVvsSmtfh9FFzzWh17Yz65i3s+Xg9BEMJj0rYehdyjkBFg5U2btabvitBkCI ZTg+umRKZqKOD2zr28TaCG5JueA1nv0XAvULi4Azw+gJ5LiD9RjL3Wn9inwb0sG1qiiM Rlq4qs516k4xF563x7u/3r6h91kf9+UmQT5t5UKSo3SKr/RADPmgtMhVIb1CGvHT/Ert 04ek1U5T1Fskgl0pwv3fEyAvx6LyE5LHaIa3hnBw0Y9EFkh1IU7ek6//wacz/KkT1Nvg C/HQ== 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 i15si6640308wmg.134.2018.03.06.10.00.32; Tue, 06 Mar 2018 10:00:33 -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 1FC2668A18D; Tue, 6 Mar 2018 20:00:23 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-DB5-obe.outbound.protection.outlook.com (mail-oln040092071083.outbound.protection.outlook.com [40.92.71.83]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 61E7868A08B for ; Tue, 6 Mar 2018 20:00:21 +0200 (EET) Received: from DB5EUR03FT026.eop-EUR03.prod.protection.outlook.com (10.152.20.60) by DB5EUR03HT005.eop-EUR03.prod.protection.outlook.com (10.152.20.78) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.506.19; Tue, 6 Mar 2018 18:00:28 +0000 Received: from DB3PR0202MB3452.eurprd02.prod.outlook.com (10.152.20.59) by DB5EUR03FT026.mail.protection.outlook.com (10.152.20.159) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.20.527.18 via Frontend Transport; Tue, 6 Mar 2018 18:00:27 +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 18:00:27 +0000 From: Stefan _ To: FFmpeg development discussions and patches Thread-Topic: [PATCH] avcodec/mediacodec_wrapper: blacklist more software decoders Thread-Index: AQHTtXUCRfQ6WepxGEuRIhq7KFyUTQ== Date: Tue, 6 Mar 2018 18:00:27 +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:A4C0A50851C6C77B77ED311302E49DD97A3AABDCF9E545CBA81AF13EE8DB08A6; UpperCasedChecksum:50831BE6D61B5C57239AB47F2F4002127F884C25DC5C8370FA9D6B803097197E; SizeAsReceived:6965; Count:44 x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [YDsLjcG5FBOfOJTZdu61ZcsOZ3jGytWq] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; DB5EUR03HT005; 6:UjvAeqJ1Sndbj8Y0ZcVqBChBRDDAFsMp2M1Xk3Gpe3Lx8PzuKYjFNa35QK20pCPAJ9qEqkcdk+fxp/Uqtmg6HMyWjPdxg4XMoYj8kX6QOIks1fUBrx99v0NZL8MrCs5IKKTeRI3hgdXus3AbTZW2oXotz+hqaivqwRElZV+ENdq6jmCE3tSzd2BO07/r5J/AYMM0ozwIKXHXZz8CT7bq7aifEB730vLiknpxYS/MFtWqiN/qJal1VDq+ilp+7L+ET5utnQWLmdwTD0X79WtTW0IYXeCot6nxPP7bUSBefWC7/2+p6fIVU2Rd3aLoGC31UauZEWMyy3ekIe4tRmN5r378tOl89R8Z6VgoqPd3mes=; 5:fGdvwp+cBKZeaBiZcL0YCVzp6Sww9Fnw6wj04G25qny1KYhrK3pyBZr/NWbea7HL5URGMLxJmgv+dnyhyI4hzL9k53KykGfdiRxv45lSv/ifHRfdX9mh89qeNYtU+XwmdaQQI53zeYUOSQbUMTHh+3vp4awFePJRpZOX9Ao83tk=; 24:ppSWVqt2gGnewpeLISHasVqKxHrrPRc8TneLlJ9y1ycCVfc/d9+m9ItMOu+hC0M10GAXB0vEf235fUWEe0tD0JkIGDMQG1PBcHXLnDxAIXQ=; 7:H2usqHwhIBuB58XwoccEIozFXw5EcMkxrveZgUWIgHwTrK7KqM9RC0y4hSpIJfkztDyltwOyof7kZrg1MgKavdN6UzOLBAALye5OkhBiQpQJJskf0+TUK3/fiDVH2/+vYGlMmOWeuHW6MuDkxucpd9lPB/aZ+DUc+LSZXMkfU4PU8dsbrRb6Z4x74eAx/Dj4+PHshDa97nXqwAMeHykNxBY6T0/FVvdjUJScEeVO5QVHl7/RWWxYTn+ZpKbhhibp 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:DB5EUR03HT005; x-ms-traffictypediagnostic: DB5EUR03HT005: x-ms-office365-filtering-correlation-id: 61bc225a-d227-4145-9419-08d5838c241f x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(444000031); SRVR:DB5EUR03HT005; BCL:0; PCL:0; RULEID:; SRVR:DB5EUR03HT005; x-forefront-prvs: 06036BD506 x-forefront-antispam-report: SFV:NSPM; SFS:(7070007)(98901004); DIR:OUT; SFP:1901; SCL:1; SRVR:DB5EUR03HT005; H:DB3PR0202MB3452.eurprd02.prod.outlook.com; FPR:; SPF:None; LANG:; x-microsoft-antispam-message-info: B+Z237ijNm/7ooJBc1WYwJaV2D2N4XIruj5o+HUShbf3/j/ZEjG5wMvXpBM+uACDF3jHPp5jCo3WjDAh59gL4/JahvlLHamdBvh6Ng9Gm7yxaqrLYWSbvu0Btpc/Cm5lczZqPXGIgOx5OzUM+Sza25kEaPnwSf7hYDqzgC63/b3aWD01bMeZkrXSRTJlEMKH spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 61bc225a-d227-4145-9419-08d5838c241f X-MS-Exchange-CrossTenant-originalarrivaltime: 06 Mar 2018 18:00:27.7658 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Internet X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB5EUR03HT005 X-Content-Filtered-By: Mailman/MimeDel 2.1.20 Subject: [FFmpeg-devel] [PATCH] avcodec/mediacodec_wrapper: blacklist more software decoders 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, for hwdec on Android the wrapper attempts to blacklist known software decoders also provided through the mediacodec API. The list isn't complete however and ffmpeg might e.g. prefer slower "external" HEVC software decoding over its own software decoder. This patch completes the list of known software decoders, which are: OMX.ffmpeg.*  see https://github.com/AOSB/android_device_lge_hammerhead/blob/master/media_codecs.xml#L89 OMX.SEC.*  see https://chromium.googlesource.com/chromium/src/+/refs/heads/lkgr/media/base/android/media_codec_util.cc#288 OMX.qcom.video.decoder.hevcswvdec  see https://github.com/moonlight-stream/moonlight-android/blob/master/app/src/main/java/com/limelight/binding/video/MediaCodecHelper.java#L83 From fbc876a8763db254d4e26d00c8b4fcf9ea7e7183 Mon Sep 17 00:00:00 2001 From: sfan5 Date: Tue, 6 Mar 2018 18:47:35 +0100 Subject: [PATCH] avcodec/mediacodec_wrapper: blacklist more software decoders Additionally blacklist ffmpeg, Samsung and Qualcomm software implementations offered through MediaCodec. --- libavcodec/mediacodec_wrapper.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libavcodec/mediacodec_wrapper.c b/libavcodec/mediacodec_wrapper.c index dbc37bf463..b12528500d 100644 --- a/libavcodec/mediacodec_wrapper.c +++ b/libavcodec/mediacodec_wrapper.c @@ -465,7 +465,12 @@ char *ff_AMediaCodecList_getCodecNameByType(const char *mime, int profile, int e goto done; } - if (strstr(name, "OMX.google")) { + /* Skip software decoders */ + if ( + strstr(name, "OMX.google") || + strstr(name, "OMX.ffmpeg") || + strstr(name, "OMX.SEC") || + !strcmp(name, "OMX.qcom.video.decoder.hevcswvdec")) { av_freep(&name); goto done_with_type; } -- 2.16.2