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 3B4B8427D3 for ; Thu, 30 Jun 2022 11:47:12 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2559068B6F9; Thu, 30 Jun 2022 14:47:10 +0300 (EEST) Received: from mail-yw1-f180.google.com (mail-yw1-f180.google.com [209.85.128.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 74DA568AD28 for ; Thu, 30 Jun 2022 14:47:03 +0300 (EEST) Received: by mail-yw1-f180.google.com with SMTP id 00721157ae682-317741c86fdso176177907b3.2 for ; Thu, 30 Jun 2022 04:47:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=qVh/X0XEuiMvfj8NMMmyCw6FkmrEn676S7MwExkpkbs=; b=TOP2TkKuVnLi2mOLzmAsTg9Pmcdq8KXd8dKtEGqZ0aZvmQETV00RmjxirYbFiEU1fn 4yfiAcbJU9NoPqzc6OAc65zWPF5AfMcsK+IfrZX+R5smbVp+lNfapRTa0a+mO+UwDl5V FwXEuIzY+NqW6q0RNFASjz971HQwdpGVqjrrRv8T76ewKXOUEM+yn3xWjuA7sSJRNOxH 2sai6+zMReeDRg5s+hshMbpkb2qmalqqqmYfRMcStXZ613ID1cpKAf+qGy+C+vfxtUM6 MNH9HtOE4vXaso/z28lj6ndp3zhYA1WMSp/6GDuOj2lLd2KAcfTCDeMwm2FEPahETDDw smBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=qVh/X0XEuiMvfj8NMMmyCw6FkmrEn676S7MwExkpkbs=; b=6BpojtNG1MSNzUF1sGTNv9oBkoe4sMAwt/bgJnXnbnYG4OtX9Nahvl5wHDKd4WR63R WK6DqdkeRu7/w/lX48vptO3gzf8iFdwmdEO7bGazlhCaaER/PEmv1aMYFGXWFLsCYBAv fpjlO7N2pYNcGlmWEvSmDVSpnm8UgErQ2dbchUkA/VloaKhcfS7jKvRZDwnm5ZnLVYWD 3xoYuqlH0uFUJi1gyx/21sDlpgmaIBMajw/5hEtldsPk29FL+5fq3bj9oGGasqOlRyuX rfJXTxJVhNO+RGafZj5Gtxs8cVYRL3dMRMHYvIcJs6pJRZ1w/RHdAzUIMYxfA3ohW+2w Xfpg== X-Gm-Message-State: AJIora/Nn2y+k1psNb7jNdRFDHVcqb78M7TfpG0Q13h4nYBUHVm4b0pv mlEEf5Zmshpo6lxRdbymjTK+Rdi+TQoVHm/NHa+5Lwj9gKY= X-Google-Smtp-Source: AGRyM1t1vbQAi5h5ajcNMGzElYMzy9GNcLakpop0LBTKSXWbXO7jUJO5mRAy3jQ0j9kwVbkqoZRDEvg01YzMMmTwXb0= X-Received: by 2002:a0d:d708:0:b0:31b:840a:a957 with SMTP id z8-20020a0dd708000000b0031b840aa957mr9835583ywd.177.1656589622093; Thu, 30 Jun 2022 04:47:02 -0700 (PDT) MIME-Version: 1.0 References: <20220630024558.1444-1-tong1.wu@intel.com> <20220630024558.1444-2-tong1.wu@intel.com> In-Reply-To: <20220630024558.1444-2-tong1.wu@intel.com> From: Paul B Mahol Date: Thu, 30 Jun 2022 13:49:47 +0200 Message-ID: To: FFmpeg development discussions and patches X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: Re: [FFmpeg-devel] [PATCH v2 2/3] avfilter/vf_hwmap: get the AVHWDeviceType from outlink format 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: Tong Wu 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: On Thu, Jun 30, 2022 at 4:47 AM Tong Wu wrote: > When a derive_device_type is not specified, the hwmap filter should be > able to retrieve AVHWDeviceType from outlink->format and create > corresponding hwdevice context. > > Signed-off-by: Tong Wu > --- > libavfilter/vf_hwmap.c | 17 +++++++++++++---- > 1 file changed, 13 insertions(+), 4 deletions(-) > > diff --git a/libavfilter/vf_hwmap.c b/libavfilter/vf_hwmap.c > index 2e03dfc1fe..136980c982 100644 > --- a/libavfilter/vf_hwmap.c > +++ b/libavfilter/vf_hwmap.c > @@ -70,23 +70,32 @@ static int hwmap_config_output(AVFilterLink *outlink) > device_is_derived = 0; > > if (inlink->hw_frames_ctx) { > + enum AVHWDeviceType type; > hwfc = (AVHWFramesContext*)inlink->hw_frames_ctx->data; > > if (ctx->derive_device_type) { > - enum AVHWDeviceType type; > - > type = av_hwdevice_find_type_by_name(ctx->derive_device_type); > if (type == AV_HWDEVICE_TYPE_NONE) { > av_log(avctx, AV_LOG_ERROR, "Invalid device type.\n"); > err = AVERROR(EINVAL); > goto fail; > } > + } else { > + type = av_hwdevice_get_type_by_pix_fmt(outlink->format); > + if (type == AV_HWDEVICE_TYPE_NONE) { > + av_log(avctx, AV_LOG_ERROR, "Could not get device type > from " > + "format %s.\n", > av_get_pix_fmt_name(outlink->format)); > + err = AVERROR(EINVAL); > + goto fail; > + } > + } > > + if (!device || ctx->derive_device_type) { > err = av_hwdevice_ctx_create_derived(&device, type, > - hwfc->device_ref, 0); > + hwfc->device_ref, 0); > if (err < 0) { > av_log(avctx, AV_LOG_ERROR, "Failed to created derived " > - "device context: %d.\n", err); > + "device context: %d.\n", err); > Looks like mixed re-indentation and functional changes in same commit. > goto fail; > } > device_is_derived = 1; > -- > 2.35.1.windows.2 > > _______________________________________________ > 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".