From patchwork Wed Feb 17 15:51:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: sfan5 X-Patchwork-Id: 25723 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:6d42:0:0:0:0:0 with SMTP id i63csp2143020ybc; Wed, 17 Feb 2021 07:53:53 -0800 (PST) X-Google-Smtp-Source: ABdhPJx1gdm+QDjp61ZRwNqOHYWeuG5h9Nr2UxeSCql+roq28MUIaEupE6ls85+ramvZL6mxFDHt X-Received: by 2002:a05:6402:3582:: with SMTP id y2mr27033419edc.345.1613577227580; Wed, 17 Feb 2021 07:53:47 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a3si1928375edm.520.2021.02.17.07.53.46; Wed, 17 Feb 2021 07:53:47 -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; arc=fail (body hash mismatch); 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=live.de Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 624CA68A141; Wed, 17 Feb 2021 17:53:45 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075067.outbound.protection.outlook.com [40.92.75.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 67231689D9F for ; Wed, 17 Feb 2021 17:53:39 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MO3bfKucSeZrbluBcYBK09E/7yTmOTZ1FbeaqWaukAOqL9qXmUtxIXWQC9TU0lV0w/BE7bVQeOIFGegyCFNCd6RWRlJkGNFJv1EvZ1tHMZuwRJj29HX8UItwS/y1IFYTMhBcOZOH4k8KqBTEUnKgZGCbIpweA57ngT3bgm+MhZa1kwqHLNIgW0lcXNGf10c0I0UhuIG+3xmVM6iBtlsRDVeGM12kOU6IWT9k33T/5fxpIa6r6ko69QZjTayldAWK/2PwiF6TkdE4lxaeZHi0v6xb7lTtsoUyV3LCs0ZS/HAwMigJ1+1hWeGe4P5lH8CRUG7xv++/xPgu37NCIBcbeQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=2HVxQ9jajSF2NSK/M6wCnmA6cbipgaUoEbciQ9VSQQo=; b=LCqUeyg2ETKK9I4AXiwf8c/HgHGyqQIBvBztG/IirudpXJ1s7DZDe+I2jTghfgag6pcWp5ZvsO7OtkU+in2ai/f1w4DNgAk765x6sgwZznN4aS4+K8mnP+aOAJvWG0kigTgM728DLT5yjhkpoUthtpVSB7kcD7fXEdLHKrzHEbKI4PBrC2U08UAnwraW5pbDsXig92RBAj6jb7Bc3NXg4c3+VmTxXEqRuAEkVsz6SUx9CDzi4JxoA+IqbZNfIwZKCZE4iS/1cweUGcvhRyovYPFn5OtCunu1Gnp5C/erk0i4Sopwfj33hiJwpf4tNlTAbXjIPYlKBjW33TyAZIYrFg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none Received: from HE1EUR04FT027.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0d::4c) by HE1EUR04HT008.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0d::127) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3868.27; Wed, 17 Feb 2021 15:51:10 +0000 Received: from DB6PR0901MB1495.eurprd09.prod.outlook.com (2a01:111:e400:7e0d::49) by HE1EUR04FT027.mail.protection.outlook.com (2a01:111:e400:7e0d::286) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3868.27 via Frontend Transport; Wed, 17 Feb 2021 15:51:10 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:FE5F064B278A0F4FA1D481F3E98EF945434305D8ABEDB23B290FCBD4C8C60587; UpperCasedChecksum:107235539D7C954184C276D818E02E7F756357B1F02603EEA378CDADF6865702; SizeAsReceived:8694; Count:46 Received: from DB6PR0901MB1495.eurprd09.prod.outlook.com ([fe80::5c07:7420:c23b:869f]) by DB6PR0901MB1495.eurprd09.prod.outlook.com ([fe80::5c07:7420:c23b:869f%2]) with mapi id 15.20.3846.042; Wed, 17 Feb 2021 15:51:10 +0000 To: ffmpeg-devel@ffmpeg.org References: From: sfan5 Message-ID: Date: Wed, 17 Feb 2021 16:51:09 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.7.1 In-Reply-To: Content-Language: en-US X-TMN: [509CR1hJG92ROPfvHgkbV9l3t4a6LGwk] X-ClientProxiedBy: AM0PR06CA0096.eurprd06.prod.outlook.com (2603:10a6:208:fa::37) To DB6PR0901MB1495.eurprd09.prod.outlook.com (2603:10a6:4:7a::9) X-Microsoft-Original-Message-ID: <261e8095-855e-7e89-e8f3-0e1e87dd3c5f@live.de> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from [10.13.164.99] (185.189.112.27) by AM0PR06CA0096.eurprd06.prod.outlook.com (2603:10a6:208:fa::37) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3868.27 via Frontend Transport; Wed, 17 Feb 2021 15:51:10 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 46 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: dc47b353-cbd9-413d-2f31-08d8d35bd8c2 X-MS-TrafficTypeDiagnostic: HE1EUR04HT008: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: mJKtJ8XGvallX0d3jQLHHamDDI0FshoRSaqkE8PYJRLGgq1nlQIpU8o25RWDZv90U0hMZPvmuQokEk0qGoq5q86Ot88l8UUC6y9cPweMXBxQoELiRt81eXHFNeD7GRvm X-MS-Exchange-AntiSpam-MessageData: E3qIQaJPENXGllS0Sb2EjgeKUc2qTUXlSTDDWBEiwTsJZHXoDY2I0VgSbAV5VllFZG0EH+gCWRsoNfwUBz8OR4iTwnycSuhnWCax8VPyrGVZBZlTKLWU6syyi49+V9WS+OqQjPso8sPpxhdYICi4fg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: dc47b353-cbd9-413d-2f31-08d8d35bd8c2 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Feb 2021 15:51:10.7883 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: HE1EUR04FT027.eop-eur04.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1EUR04HT008 Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/mediacodec_wrapper: use MediaCodecInfo.isSoftwareOnly() when available 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" X-TUID: B8hdPk/nNuOo Content-Length: 3690 Subject: [PATCH 2/2] avcodec/mediacodec_wrapper: use MediaCodecInfo.isSoftwareOnly() when available Added in Android 10 it provides a reliable way of filtering out software decoders, unlike existing string-based checks. --- libavcodec/mediacodec_wrapper.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/libavcodec/mediacodec_wrapper.c b/libavcodec/mediacodec_wrapper.c index f1945bcfc0..c829941d6b 100644 --- a/libavcodec/mediacodec_wrapper.c +++ b/libavcodec/mediacodec_wrapper.c @@ -45,6 +45,7 @@ struct JNIAMediaCodecListFields { jmethodID get_codec_capabilities_id; jmethodID get_supported_types_id; jmethodID is_encoder_id; + jmethodID is_software_only_id; jclass codec_capabilities_class; jfieldID color_formats_id; @@ -81,6 +82,7 @@ static const struct FFJniField jni_amediacodeclist_mapping[] = { { "android/media/MediaCodecInfo", "getCapabilitiesForType", "(Ljava/lang/String;)Landroid/media/MediaCodecInfo$CodecCapabilities;", FF_JNI_METHOD, offsetof(struct JNIAMediaCodecListFields, get_codec_capabilities_id), 1 }, { "android/media/MediaCodecInfo", "getSupportedTypes", "()[Ljava/lang/String;", FF_JNI_METHOD, offsetof(struct JNIAMediaCodecListFields, get_supported_types_id), 1 }, { "android/media/MediaCodecInfo", "isEncoder", "()Z", FF_JNI_METHOD, offsetof(struct JNIAMediaCodecListFields, is_encoder_id), 1 }, + { "android/media/MediaCodecInfo", "isSoftwareOnly", "()Z", FF_JNI_METHOD, offsetof(struct JNIAMediaCodecListFields, is_software_only_id), 0 }, { "android/media/MediaCodecInfo$CodecCapabilities", NULL, NULL, FF_JNI_CLASS, offsetof(struct JNIAMediaCodecListFields, codec_capabilities_class), 1 }, { "android/media/MediaCodecInfo$CodecCapabilities", "colorFormats", "[I", FF_JNI_FIELD, offsetof(struct JNIAMediaCodecListFields, color_formats_id), 1 }, @@ -441,6 +443,17 @@ char *ff_AMediaCodecList_getCodecNameByType(const char *mime, int profile, int e goto done_with_info; } + if (jfields.is_software_only_id) { + int is_software_only = (*env)->CallBooleanMethod(env, info, jfields.is_software_only_id); + if (ff_jni_exception_check(env, 1, log_ctx) < 0) { + goto done; + } + + if (is_software_only) { + goto done_with_info; + } + } + codec_name = (*env)->CallObjectMethod(env, info, jfields.get_name_id); if (ff_jni_exception_check(env, 1, log_ctx) < 0) { goto done;