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 50CEE42FA1 for ; Thu, 15 Jun 2023 02:16:51 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 977ED68C402; Thu, 15 Jun 2023 05:16:48 +0300 (EEST) Received: from mail-pf1-f180.google.com (mail-pf1-f180.google.com [209.85.210.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1D425680CCB for ; Thu, 15 Jun 2023 05:16:42 +0300 (EEST) Received: by mail-pf1-f180.google.com with SMTP id d2e1a72fcca58-6667defb5a3so785359b3a.3 for ; Wed, 14 Jun 2023 19:16:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686795399; x=1689387399; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=PAm/jo8zKTB34lfruNQhF7gmKZwA2fDV65Twgp/6xJs=; b=H8prPVZ+TTDUu6+Mzffkwv0YP9BQp3nRTX6+v6wXBZvx+pke/he8wu+vc/22AZzHVR J77tJiJL6grSNDz6brTaR1bxYoIboXPQ53USB5s25W5rHpr4zBQ7vIWMnsSvx88vbfUW +2gToJJa7daw2liTzDsR8ZVkdISgCDCHfdUKvrB1jIz46fahiaFOyMPjfzMWxcupREdu veQ37gOR0I00iz+Oe223J7FnBXo80+76czW/LzW1H5oQ9vDZcRYHPMx6B2hay2i6ATop QYWyHhtgHGvxJMkcVIl7kaUJvSBjexvL6HFVFzvippcM5bmHk85+7ctxICUjLCyQw3zD sDtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686795399; x=1689387399; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=PAm/jo8zKTB34lfruNQhF7gmKZwA2fDV65Twgp/6xJs=; b=jVvkivXrPXn1x0oLrrJCxlblttDZQTvKmxPWgsDUm0Y3JeC/3i6DPMDDmc+jxOzLnW m9twTvGo6wlMbObbFZlQrHUoZdVEpNE5J7fpq5J26xHmhp3B8QKtIe6quBicqpf7TNgo q1vRF4xLlXZ1l8J6HNiLjQPvCJrsI+1qtF2aGbyrLttV2Wa/+v4n9UqGWmo3b6s38Ovo ztV05/4PhNnyB4U2Vis6Mi8ubuiThm3ln5BdOyL1CzK1hu7TTAiSPJBc+DKzUzRdruou /LjSsFYD0CC8lJqq/+rv4N+0oI2vauMylYDtVjPL4UzAY/cscDz7ZTRXOjabFlVNHH35 BrJA== X-Gm-Message-State: AC+VfDyDCpAQhnN21SNd3EMqLe4z7PzkBoowwywHlTUEmI3dMo0RZOpm QyNdco9rzR/opYM58PH+NfXOcFO/PtfDog== X-Google-Smtp-Source: ACHHUZ6ykvXgphTq6YxOi9hAsplt5nxu5tawFAIQlWutgCjQ8ls6eHHzT9I3F77GZc3wT59v5cqlnw== X-Received: by 2002:a05:6a00:884:b0:663:83ad:4804 with SMTP id q4-20020a056a00088400b0066383ad4804mr4483494pfj.1.1686795399142; Wed, 14 Jun 2023 19:16:39 -0700 (PDT) Received: from localhost.localdomain ([202.172.120.234]) by smtp.gmail.com with ESMTPSA id i8-20020aa787c8000000b0062cf75a9e6bsm10963512pfo.131.2023.06.14.19.16.37 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 14 Jun 2023 19:16:38 -0700 (PDT) From: Iskandar Safarov To: ffmpeg-devel@ffmpeg.org Date: Thu, 15 Jun 2023 12:16:31 +1000 Message-Id: <20230615021631.9139-1-sapharow@gmail.com> X-Mailer: git-send-email 2.39.2 (Apple Git-143) MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec: Align AVFrame memory to page size for access via Apple Metal 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: Iskandar Safarov 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: --- libavcodec/get_buffer.c | 52 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 51 insertions(+), 1 deletion(-) diff --git a/libavcodec/get_buffer.c b/libavcodec/get_buffer.c index a04fd878de..b18af3be4a 100644 --- a/libavcodec/get_buffer.c +++ b/libavcodec/get_buffer.c @@ -33,6 +33,11 @@ #include "avcodec.h" #include "internal.h" +#if __APPLE__ +#import +#import +#endif + typedef struct FramePool { /** * Pools for each data plane. For audio all the planes have the same size, @@ -81,6 +86,51 @@ static AVBufferRef *frame_pool_alloc(void) return buf; } +#if __APPLE__ +/* + When compiling for Apple platform the frame buffer data pointers need to be + page-aligned for cases when in-place GPU processing may be required + https://developer.apple.com/documentation/metal/mtldevice/1433382-newbufferwithbytesnocopy + */ +#define POOL_BUFFER_ALLOCZ aapl_buffer_allocz + +static void aapl_buffer_free(void *opaque, uint8_t *data) +{ + vm_deallocate((vm_map_t) mach_task_self(), (vm_address_t)data, (size_t)opaque); +} + +static AVBufferRef *aapl_buffer_alloc(size_t size) +{ + AVBufferRef *ret = NULL; + uint8_t *data = NULL; + + kern_return_t err; + err = vm_allocate( (vm_map_t) mach_task_self(), + (vm_address_t*) &data, size, VM_FLAGS_ANYWHERE); + if (err != KERN_SUCCESS || !data) + return NULL; + + ret = av_buffer_create(data, size, aapl_buffer_free, (void*)size, 0); + if (!ret) + free(data); + + return ret; +} + +static AVBufferRef *aapl_buffer_allocz(size_t size) +{ + AVBufferRef *ret = aapl_buffer_alloc(size); + if (!ret) + return NULL; + + memset(ret->data, 0, size); + return ret; +} + +#else +#define POOL_BUFFER_ALLOCZ av_buffer_allocz +#endif + static int update_frame_pool(AVCodecContext *avctx, AVFrame *frame) { FramePool *pool = avctx->internal->pool ? @@ -155,7 +205,7 @@ FF_ENABLE_DEPRECATION_WARNINGS pool->pools[i] = av_buffer_pool_init(size[i] + 16 + STRIDE_ALIGN - 1, CONFIG_MEMORY_POISONING ? NULL : - av_buffer_allocz); + POOL_BUFFER_ALLOCZ); if (!pool->pools[i]) { ret = AVERROR(ENOMEM); goto fail; -- 2.39.2 (Apple Git-143) _______________________________________________ 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".