From patchwork Mon Oct 24 03:16:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 38942 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp1997872pzb; Sun, 23 Oct 2022 20:18:21 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6Spoj5Uoypi1jIF1+rX+Zdy68MIJIpkgChqcM/H6UcW939PgUL6PlZUcu4ofahdybwJLGb X-Received: by 2002:a17:907:1dda:b0:7a6:8ffc:7dc with SMTP id og26-20020a1709071dda00b007a68ffc07dcmr3669017ejc.163.1666581501770; Sun, 23 Oct 2022 20:18:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666581501; cv=none; d=google.com; s=arc-20160816; b=Yq4Xtrm8BmENv4tfOM57v0apuhpcVNRQ8t0O43ppfSiQJ//tWUzt2oHUjEqNvsQbem EAKziU37NiVjFaxWKMFVuSPbiJ+75I1KMmcQwvthBYvE/i6VE+D5JGz6bTJBrYkhUTgW t+isHquylDGarvUT8EBiwDYHtzaLEJbw20g7IUnQJVRREJJMsUIwAos+UXwfaPYPY3Eg pvNSyFSKYtwRTIlu9fQCDQRSoL/O/ZOZo2HDaR8uRVcsfihb8OEbbOrBOrGhruXTS7VZ AUhwF09miRCQ8GLCfSIsItIn9x9zCvBA+YLJpzTYKdAOsTqN2IdRW/VxJPBZoLolI5Zk x9vQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to:date :to:from:message-id:dkim-signature:delivered-to; bh=x/uJdbBlCIACugD4XHgFfqxDSKrgDXImiyvCYtiFslQ=; b=txBdnfEntr2mz3OIXpFERF0gSF8jbh/ePXhkmLC+7spQu8e7sLjHly/Tx7p0Qr705I b2Jn2BiW+U9wBoXarJ+C41cswdnHB5WaRJDBYOFSawKdPOd8PLPCxoEfL1/jLDsfoAFt B7OPIwGejq7xsYG1okXSrMmoAxEltPIPEDZYgexCGyTEmDW6TJTmQJOmTqiqfgm1/esO w1/hAsdsEY3baPf5PPXVmTJpa6B4Rq4WjInzu4UQIU/hiQMxP9ZcLnXjke5iYrXcw0Ju GIRYTCnvQ12qec3bDMF8PcD0P+dUCv6dA82H9At1/paLdatK+vluRMsezlVQM8asYZkS VWbA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=gI41qgAu; 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=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ne41-20020a1709077ba900b00780328a0868si27025588ejc.110.2022.10.23.20.18.21; Sun, 23 Oct 2022 20:18:21 -0700 (PDT) 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; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=gI41qgAu; 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=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0A58468BD4C; Mon, 24 Oct 2022 06:17:34 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-221-242.mail.qq.com (out203-205-221-242.mail.qq.com [203.205.221.242]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 59B6B68BD3D for ; Mon, 24 Oct 2022 06:17:26 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1666581444; bh=9BnfkiiBfux8cKi8l9K5MWN2BnVweN+WILGD7of8wTc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=gI41qgAumHYQsBZpUYcFLRWO5pA3BnhCzxoC9t6pFd7DBRrTX1uZgfHzCh1fD29oR YFrSQ1aQNsmRzWSZUyVT546bMp7YFEuKuCuqtV3BWuoh78ZZuv3bhcDk/RobfPgKoY CqT893D9kxDuBEBFnVprzi9vspxi3peWmtLWSDsk= Received: from localhost.localdomain ([59.37.125.102]) by newxmesmtplogicsvrsza31.qq.com (NewEsmtp) with SMTP id 44A14270; Mon, 24 Oct 2022 11:17:10 +0800 X-QQ-mid: xmsmtpt1666581440t5phm0krn Message-ID: X-QQ-XMAILINFO: Mrv6PNPZjcp66JUX8FFyYklFuzJnOCED/BYloNalfjiv+K54aCldZWQEkK24ie vtKCnSxCRw9Iwl6/SMaFB/JJxVhiCgYo7APRIdpJcoKO09TT9THf8bd0MiOc7zrH+diPqbhDh4x4 zFF401BBsbQBk6VIm4sWiSJ03QluD4sZg4jteylLT4U9dML3kJdnjF3sLwG4gSxZkrcfyAnRwH0Q 2AjWdApmoQKSmLhMhrYrmZCUJyvBNZyemFOpSbpX87NK/Xz1dqSROEQVliaoZoVcmqwkSrBfwGIf NclgoKf+2c2rrHE/42K1T3YZB/BIU+oDSuGbxmRqks4MAnSEaCa/qjD9Zhw+hFrD/wGjBmhW0dEx 2GT8iRnHqpFxkayTC9C2o2sawPNyT7hB4HBTAMUtIj7a6T3Ms5UtwajKUjWkNAh7QpNHCjRLdCyZ BCGBBjur2jPHj+9wlaThvtpFxnV1F0Y5TPuNgwb3AWV84zYk0XBrPK58Bsuu062K12iOx0A33GJN xsJpdFVeHnGD1o80AIjWC4q6N1YvQzwxtOo5NTSvOKJG70geVx9EfzjdmY6+3LHO4NjBu6iKJtHq Yu3iFdBMbfGOHdsKf8QP0ugWRZPj4Qsr6KbiwqxGwNRFFEsZVQEuLR0eEu7ZIfXadDEMBzZgXrbM 7wxXGkdqL+TV4TGBVgOQO054bqxVI3l47396x/FTbw+mnCfeN5BOjtJ+4pXeV6dlot34eGHKwCUd lmRGGk39qMfuDhIxWuW5Fag0zsu8Je6Zq5lA410Cgr6qoOiIzCymCtQmVmgkNlDwC1aNQ1Y6CiGE 8vMJ0DBHDQsW/U+eIr5GfauDa6wecE41+lDYHY1mfpKf0/JR1YeAxzNgeZ22fYAtS4qNXMy46RFV 61uzXlzWBBm7l0uspqIBELi4V9ECwfZd9msru7ofXbSzQXy6SSq4m1QetEJFN9TTQxFisuKFekCq fvNGvXzjXM9whh5bypi7wmO/9PTvckfE+h1h54pd4= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Mon, 24 Oct 2022 11:16:54 +0800 X-OQ-MSGID: <20221024031658.1026118-9-quinkblack@foxmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221024031658.1026118-1-quinkblack@foxmail.com> References: <20221024031658.1026118-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 08/12] avutil/hwcontext_mediacodec: add ANativeWindow support X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Cc: matthieu.bouron@stupeflix.com, Zhao Zhili , aman@tmm1.net Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: hC9dRjporax1 From: Zhao Zhili Signed-off-by: Zhao Zhili --- libavutil/hwcontext_mediacodec.c | 56 +++++++++++++++++++++++++++++++- libavutil/hwcontext_mediacodec.h | 11 +++++++ libavutil/version.h | 4 +-- 3 files changed, 68 insertions(+), 3 deletions(-) diff --git a/libavutil/hwcontext_mediacodec.c b/libavutil/hwcontext_mediacodec.c index b0d8993e15..bb1779d34d 100644 --- a/libavutil/hwcontext_mediacodec.c +++ b/libavutil/hwcontext_mediacodec.c @@ -18,12 +18,24 @@ #include "config.h" +#include +#include +#include + #include "buffer.h" #include "common.h" #include "hwcontext.h" #include "hwcontext_internal.h" #include "hwcontext_mediacodec.h" +typedef struct MediaCodecDeviceContext { + AVMediaCodecDeviceContext ctx; + + void *libmedia; + media_status_t (*create_surface)(ANativeWindow **surface); +} MediaCodecDeviceContext; + + static int mc_device_create(AVHWDeviceContext *ctx, const char *device, AVDictionary *opts, int flags) { @@ -35,13 +47,55 @@ static int mc_device_create(AVHWDeviceContext *ctx, const char *device, return 0; } +static int mc_device_init(AVHWDeviceContext *ctx) +{ + MediaCodecDeviceContext *s = ctx->hwctx; + AVMediaCodecDeviceContext *dev = (AVMediaCodecDeviceContext *)s; + ANativeWindow *native_window = NULL; + + if (dev->surface) + return 0; + + if (dev->native_window) + return 0; + + s->libmedia = dlopen("libmediandk.so", RTLD_NOW); + if (!s->libmedia) + return AVERROR_UNKNOWN; + + s->create_surface = dlsym(s->libmedia, "AMediaCodec_createPersistentInputSurface"); + if (!s->create_surface) + return AVERROR_UNKNOWN; + + s->create_surface(&native_window); + dev->native_window = native_window; + return 0; +} + +static void mc_device_uninit(AVHWDeviceContext *ctx) +{ + MediaCodecDeviceContext *s = ctx->hwctx; + AVMediaCodecDeviceContext *dev = ctx->hwctx; + if (!s->libmedia) + return; + + if (dev->native_window) { + ANativeWindow_release(dev->native_window); + dev->native_window = NULL; + } + dlclose(s->libmedia); + s->libmedia = NULL; +} + const HWContextType ff_hwcontext_type_mediacodec = { .type = AV_HWDEVICE_TYPE_MEDIACODEC, .name = "mediacodec", - .device_hwctx_size = sizeof(AVMediaCodecDeviceContext), + .device_hwctx_size = sizeof(MediaCodecDeviceContext), .device_create = mc_device_create, + .device_init = mc_device_init, + .device_uninit = mc_device_uninit, .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_MEDIACODEC, diff --git a/libavutil/hwcontext_mediacodec.h b/libavutil/hwcontext_mediacodec.h index 101a9806d5..920e17764f 100644 --- a/libavutil/hwcontext_mediacodec.h +++ b/libavutil/hwcontext_mediacodec.h @@ -31,6 +31,17 @@ typedef struct AVMediaCodecDeviceContext { * This is the default surface used by decoders on this device. */ void *surface; + + /** + * Pointer to ANativeWindow. + * + * It both surface and native_window is NULL, try to create it + * automatically if OS support. + * + * It can be used as output surface for decoder and input surface for + * encoder. + */ + void *native_window; } AVMediaCodecDeviceContext; #endif /* AVUTIL_HWCONTEXT_MEDIACODEC_H */ diff --git a/libavutil/version.h b/libavutil/version.h index cb0c928bd0..2df788e529 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -79,8 +79,8 @@ */ #define LIBAVUTIL_VERSION_MAJOR 57 -#define LIBAVUTIL_VERSION_MINOR 39 -#define LIBAVUTIL_VERSION_MICRO 101 +#define LIBAVUTIL_VERSION_MINOR 40 +#define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ LIBAVUTIL_VERSION_MINOR, \