Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
 help / color / mirror / Atom feed
From: "Marvin Scholz" <epirat07@gmail.com>
To: "Aman Karmani" <aman@tmm1.net>
Cc: Richard Kern <kernrj@gmail.com>,
	FFmpeg development discussions and patches
	<ffmpeg-devel@ffmpeg.org>,
	philipl@overt.org
Subject: Re: [FFmpeg-devel] [PATCH v3 4/5] avfilter: add metal utilities
Date: Fri, 17 Dec 2021 00:13:14 +0100
Message-ID: <6043C5D9-8BA5-4EFA-BD67-04A64AF348AE@gmail.com> (raw)
In-Reply-To: <CAK=uwuwsNg+Ujk0rx_FXP4KEhEzZ9qXJFKCAJkQqgJ8fkNKOHQ@mail.gmail.com>



On 16 Dec 2021, at 23:53, Aman Karmani wrote:

> On Thu, Dec 16, 2021 at 2:45 PM Marvin Scholz <epirat07@gmail.com> 
> wrote:
>
>> On 16 Dec 2021, at 21:28, Aman Karmani wrote:
>>
>>> From: Aman Karmani <aman@tmm1.net>
>>>
>>
>> Thanks for your work on this! Some comments inline:
>>
>>> Signed-off-by: Aman Karmani <aman@tmm1.net>
>>> ---
>>>  libavfilter/metal/utils.h | 35 +++++++++++++++++++
>>>  libavfilter/metal/utils.m | 73
>>> +++++++++++++++++++++++++++++++++++++++
>>>  2 files changed, 108 insertions(+)
>>>  create mode 100644 libavfilter/metal/utils.h
>>>  create mode 100644 libavfilter/metal/utils.m
>>>
>>> diff --git a/libavfilter/metal/utils.h b/libavfilter/metal/utils.h
>>> new file mode 100644
>>> index 0000000000..bd0319f63c
>>> --- /dev/null
>>> +++ b/libavfilter/metal/utils.h
>>> @@ -0,0 +1,35 @@
>>> +/*
>>> + * This file is part of FFmpeg.
>>> + *
>>> + * FFmpeg is free software; you can redistribute it and/or
>>> + * modify it under the terms of the GNU Lesser General Public
>>> + * License as published by the Free Software Foundation; either
>>> + * version 2.1 of the License, or (at your option) any later 
>>> version.
>>> + *
>>> + * FFmpeg is distributed in the hope that it will be useful,
>>> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
>>> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
>>> GNU
>>> + * Lesser General Public License for more details.
>>> + *
>>> + * You should have received a copy of the GNU Lesser General Public
>>> + * License along with FFmpeg; if not, write to the Free Software
>>> + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
>>> 02110-1301 USA
>>> + */
>>> +
>>> +#ifndef AVFILTER_METAL_UTILS_H
>>> +#define AVFILTER_METAL_UTILS_H
>>> +
>>> +#include <Metal/Metal.h>
>>> +#include <CoreVideo/CoreVideo.h>
>>> +
>>> +void ff_metal_compute_encoder_dispatch(id<MTLDevice> device,
>>> +                                       id<MTLComputePipelineState>
>>> pipeline,
>>> +                                       id<MTLComputeCommandEncoder>
>>> encoder,
>>> +                                       NSUInteger width, NSUInteger
>>> height);
>>> +
>>> +CVMetalTextureRef ff_metal_texture_from_pixbuf(void *avclass,
>>> +                                               
>>> CVMetalTextureCacheRef
>>> textureCache,
>>> +                                               CVPixelBufferRef
>>> pixbuf,
>>> +                                               int plane,
>>> +                                               MTLPixelFormat
>>> format);
>>> +#endif /* AVFILTER_METAL_UTILS_H */
>>> diff --git a/libavfilter/metal/utils.m b/libavfilter/metal/utils.m
>>> new file mode 100644
>>> index 0000000000..5df0ed600e
>>> --- /dev/null
>>> +++ b/libavfilter/metal/utils.m
>>> @@ -0,0 +1,73 @@
>>> +/*
>>> + * This file is part of FFmpeg.
>>> + *
>>> + * FFmpeg is free software; you can redistribute it and/or
>>> + * modify it under the terms of the GNU Lesser General Public
>>> + * License as published by the Free Software Foundation; either
>>> + * version 2.1 of the License, or (at your option) any later 
>>> version.
>>> + *
>>> + * FFmpeg is distributed in the hope that it will be useful,
>>> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
>>> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
>>> GNU
>>> + * Lesser General Public License for more details.
>>> + *
>>> + * You should have received a copy of the GNU Lesser General Public
>>> + * License along with FFmpeg; if not, write to the Free Software
>>> + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
>>> 02110-1301 USA
>>> + */
>>> +
>>> +#include "libavutil/log.h"
>>> +#include <libavfilter/metal/utils.h>
>>> +
>>> +void ff_metal_compute_encoder_dispatch(id<MTLDevice> device,
>>> +                                       id<MTLComputePipelineState>
>>> pipeline,
>>> +                                       id<MTLComputeCommandEncoder>
>>> encoder,
>>> +                                       NSUInteger width, NSUInteger
>>> height)
>>> +{
>>> +    [encoder setComputePipelineState:pipeline];
>>> +    NSUInteger w = pipeline.threadExecutionWidth;
>>> +    NSUInteger h = pipeline.maxTotalThreadsPerThreadgroup / w;
>>> +    MTLSize threadsPerThreadgroup = MTLSizeMake(w, h, 1);
>>> +    BOOL fallback = YES;
>>> +    if (@available(macOS 10.15, iOS 11, tvOS 14.5, *)) {
>>> +        if ([device supportsFamily:MTLGPUFamilyCommon3]) {
>>> +            MTLSize threadsPerGrid = MTLSizeMake(width, height, 1);
>>> +            [encoder dispatchThreads:threadsPerGrid
>>> threadsPerThreadgroup:threadsPerThreadgroup];
>>> +            fallback = NO;
>>> +        }
>>> +    }
>>
>> Why not just do an else here instead of the fallback variable?
>>
>
> Well there's two if statements, and we need to run the fallback only 
> when
> both fail. So where would the else go? I would need to duplicate it 
> twice.
>

Oh, is it not possible to just add the [device 
supportsFamily:MTLGPUFamilyCommon3]
after the @available check? Or does that not work, just like its is not 
possible to
negate a @available for some reason?

>
>>
>>> +    if (fallback) {
>>> +        MTLSize threadgroups = MTLSizeMake((width + w - 1) / w,
>>> +                                           (height + h - 1) / h,
>>> +                                           1);
>>> +        [encoder dispatchThreadgroups:threadgroups
>>> threadsPerThreadgroup:threadsPerThreadgroup];
>>> +    }
>>> +}
>>> +
>>> +CVMetalTextureRef ff_metal_texture_from_pixbuf(void *ctx,
>>> +                                               
>>> CVMetalTextureCacheRef
>>> textureCache,
>>> +                                               CVPixelBufferRef
>>> pixbuf,
>>> +                                               int plane,
>>> +                                               MTLPixelFormat 
>>> format)
>>> +{
>>> +    CVMetalTextureRef tex = NULL;
>>> +    CVReturn ret;
>>> +
>>> +    ret = CVMetalTextureCacheCreateTextureFromImage(
>>> +        NULL,
>>> +        textureCache,
>>> +        pixbuf,
>>> +        NULL,
>>> +        format,
>>> +        CVPixelBufferGetWidthOfPlane(pixbuf, plane),
>>> +        CVPixelBufferGetHeightOfPlane(pixbuf, plane),
>>> +        plane,
>>> +        &tex
>>> +    );
>>> +    if (ret != kCVReturnSuccess) {
>>> +        av_log(ctx, AV_LOG_ERROR, "Failed to create CVMetalTexture
>>> from image: %d\n", ret);
>>> +        return NULL;
>>> +    }
>>> +
>>> +    return tex;
>>> +}
>>> \ No newline at end of file
>>
>> Missing newline at end of file
>>
>
> Fixed locally, thanks.
>
>
>>
>>> --
>>> 2.33.0
>>>
>>> _______________________________________________
>>> 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".
>>


_______________________________________________
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".

  parent reply	other threads:[~2021-12-16 23:13 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-12-16 20:28 [FFmpeg-devel] [PATCH v3 1/5] avfilter/vf_yadif_cuda: simplify filter definition Aman Karmani
2021-12-16 20:28 ` [FFmpeg-devel] [PATCH v3 2/5] build: detect Metal.framework and build .metal files Aman Karmani
2021-12-17  8:54   ` Martin Storsjö
2021-12-17 19:52     ` Aman Karmani
2021-12-16 20:28 ` [FFmpeg-devel] [PATCH v3 3/5] avutil: add obj-c helpers into header-only include Aman Karmani
2021-12-16 20:28 ` [FFmpeg-devel] [PATCH v3 4/5] avfilter: add metal utilities Aman Karmani
2021-12-16 22:45   ` Marvin Scholz
     [not found]     ` <CAK=uwuwsNg+Ujk0rx_FXP4KEhEzZ9qXJFKCAJkQqgJ8fkNKOHQ@mail.gmail.com>
2021-12-16 23:13       ` Marvin Scholz [this message]
     [not found]         ` <CAK=uwuxHQ28r6EOQKf7FE-QxRu2XYheLzg54S_YuLdLax=OjEA@mail.gmail.com>
2021-12-17  1:32           ` Marvin Scholz
2021-12-16 20:28 ` [FFmpeg-devel] [PATCH v3 5/5] avfilter: add vf_deinterlace_videotoolbox Aman Karmani
2021-12-17  3:39   ` Philip Langdale
2021-12-17  3:30 ` [FFmpeg-devel] [PATCH v3 1/5] avfilter/vf_yadif_cuda: simplify filter definition Philip Langdale

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=6043C5D9-8BA5-4EFA-BD67-04A64AF348AE@gmail.com \
    --to=epirat07@gmail.com \
    --cc=aman@tmm1.net \
    --cc=ffmpeg-devel@ffmpeg.org \
    --cc=kernrj@gmail.com \
    --cc=philipl@overt.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
		ffmpegdev@gitmailbox.com
	public-inbox-index ffmpegdev

Example config snippet for mirrors.


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git