From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id EA47C44D3A for ; Sun, 20 Nov 2022 06:52:12 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C4F3F68BC69; Sun, 20 Nov 2022 08:50:55 +0200 (EET) Received: from out162-62-58-211.mail.qq.com (out162-62-58-211.mail.qq.com [162.62.58.211]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A65AB68BBB0 for ; Sun, 20 Nov 2022 08:50:41 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1668927039; bh=5Ri5rc1eAkHl+juMSGZx4mt+uhR3FLzwZsKSSEiozzM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=xP/aHfLF55vUZmbhXC7lf2TceFfzwTk8Mj6M9gDge0jUoXYl7wv/7KrmV6Pkt5Rk7 ZjZKmKxs2lcVjHjOKzEBbsf3g6gO3Uq8LzVc/mfgDnFtQXgzaJ5U6NGVhFWFQgMivj T7va2UlgTU7V5KLiFaMG63sJtyCEL4Dv6QJB10WM= Received: from localhost.localdomain ([14.153.77.200]) by newxmesmtplogicsvrszc2-1.qq.com (NewEsmtp) with SMTP id C8F0626E; Sun, 20 Nov 2022 14:50:15 +0800 X-QQ-mid: xmsmtpt1668927038tq7ll02b6 Message-ID: X-QQ-XMAILINFO: Nfm/+M6ONQ57+w/TWXDBVmaXymjLZs8BbOZQy5IxqTFT8qx7BQr4Pcbew1H8lS IVbMOUUAgapHTN70qjPKQahZ7XN004K66VOQT1BZpbGfuBVJary6A01/SlHMFgdnQ8jMCQ3MS+qU whFtJ7QpJz73HG/37PD4mn3bPYBvQcjN5YZgavfFyrpQMcfbeots8BCq9OuSj+Pp+z0WiryqdKDI kKMTsEA8Op47d3Fgf9Xf3c+DbTIpgOx5+vnk2zOzkyS9901ZfH+xi97H6H7IvAscNBmCnbB1lrqG frBnpHmumHbnBBSn2iscd4pYR8oXD/729T5Z4MweFJlPBLiXCqc1JvZm+HiGbMbOOTX0Ni9uAzmY CD1W1NARYlB9OSaedXhMTlDKdL+vfFTCv8EFdsyidMtWNcH/ZMHV061pvT+UjWsPyWwtQc6HQmfO szCtzVWWh3ZBzFNa69LkiDDiLdL3KD7XbD+WgOmLMIyLUXcmYADJ384XXyQ+qhHHFO9cIpcOE+ts Qrgwu2Lg05vPsyX0j4UMmTS/FRWaAPPlPnFHOPzdFbNhdp+72BJl1Ig9pBCrdV9EK1JcWCWPurwM aTpVaL9hCBj/mxGzspAHcEFIX2dcexKsvcVefjNsT+zb+fxU3HBDMqro6D0D2KeFO7EYxgWp2oQ7 /nG+Kc9mNPIgFKLN0GBEdTuXzvZb+PKZY6/ooZmW7XltC+xeEbYJycGBkeUT6ww9xP6ID1Zelj8K OqIlXVMgA3BC3RMQrtnRjSH79LUIXzzTcj34f9pT05FDPs+GCRcshg2zabSU44WmQoupFQZg0RCv fRHBfiiFsefqWLCnA9i0p3ZCbUTZhcGePhtjgxjU1j0iWhUxUScIKg+OBJnwm0GUDTwk980GE/r9 VsSRFtYLWvrRDntZpKrisuP/gGbGcCVLFNAxsf1/NRjC4ODEdaO7+3dwouoYgUXiV6/8hs03sBiE Rc0Mvpx8uyRovGXVyESuIV7yYUu0y9WLa+Rgt00iqOKAlz+HSXhg== From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Sun, 20 Nov 2022 14:49:43 +0800 X-OQ-MSGID: <20221120064947.94540-9-quinkblack@foxmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120064947.94540-1-quinkblack@foxmail.com> References: <20221120064947.94540-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: From: Zhao Zhili Signed-off-by: Zhao Zhili --- libavutil/hwcontext_mediacodec.c | 56 +++++++++++++++++++++++++++++++- libavutil/hwcontext_mediacodec.h | 11 +++++++ libavutil/version.h | 2 +- 3 files changed, 67 insertions(+), 2 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 9b9eea2946..3b616ea489 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -79,7 +79,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 57 -#define LIBAVUTIL_VERSION_MINOR 42 +#define LIBAVUTIL_VERSION_MINOR 43 #define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ -- 2.25.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".