From patchwork Thu Jun 15 02:16:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Iskandar Safarov X-Patchwork-Id: 42086 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c526:b0:117:ac03:c9de with SMTP id gm38csp456229pzb; Wed, 14 Jun 2023 19:16:53 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5a0Ico5DdU4UPGCf/dCYPFCqBpzJpf+z6uQcCbdYWYY894uPf0QV5xa8sNWur5FnyCIZ0d X-Received: by 2002:a17:906:730b:b0:973:bcf6:1d4 with SMTP id di11-20020a170906730b00b00973bcf601d4mr20406876ejc.76.1686795413254; Wed, 14 Jun 2023 19:16:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686795413; cv=none; d=google.com; s=arc-20160816; b=Zli9tMQzesw0vMhCMJkXFc2gXxYnnElb+XV7cXEoUZZEuqD7Cz6HmMUf6wpUrPexuy tQw4KNbi7KuTIMeOPFGbhUmuQFS+lVYjs9Nfefb1ELrmciFyiiGLpcBJvl1RwOhD096d 6T5MpvsAEnXs3JQSnVK8i3odpsEt6ir9QgjyImg6X7r4AbXXNwQ8tddjjPJVhwEiOsIV ooO2nLD9hrN7E/AnLdTInTyw+Zoywj/7UuqExN4F0BLbClaLNUOArtJbgg5xzr4Zkl7K +bdgtNvvIr5ctuXzNdWe2oxK5Hi2jjVjK+JTVJ82iTrOt3IwkZNIfL4cv08AyFZluQkQ fSZQ== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=zewhFcQk/zff3F9H5qzMR2cnonRwuwXR9DEDEDuw/AE=; b=Rcr74Qo+D8zEiighT5ud9GszS/afrpk2PPN4zuhbZv2YzDbV2alOdhfvJjhjuavnys BXDfTdMMvpir20hMcUMMzGba4AzVIzLyl7Fhp7jRBWD7Vd0w+Q8gptSlysgFAjqa8S4Y ls177Mf6awp4RxbJQRIonflcGZ9PyvASK/bCwK3m3ObHdRvLPsaKTup2fJFMEMYND5zd bRF687QXm/LRck03yalZhLB/TQKcCJEq2bkN9iqnykUcSJynmKD2+4uXrcHaofSGKR5R 9sUH67MBlLSIXT+i10g1EnBc8RknVEodXcI1nJlQ4+SqeinRkUjEmHTNsDin3QvZpmBi cn1Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=H8prPVZ+; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ka17-20020a170907991100b00977ead30c92si8303228ejc.559.2023.06.14.19.16.52; Wed, 14 Jun 2023 19:16:53 -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=@gmail.com header.s=20221208 header.b=H8prPVZ+; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CECD168C49C; Thu, 15 Jun 2023 05:16:48 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org 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-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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: tDlEYRTF7vGk --- 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;