From patchwork Tue Jan 9 15:41:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 45543 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bf2f:b0:199:de12:6fa6 with SMTP id gc47csp241730pzb; Mon, 8 Jan 2024 23:41:48 -0800 (PST) X-Google-Smtp-Source: AGHT+IEvU65ko/JBYX+7HJdf4iDopKLSTFCnvoh4PVnvJHCzP+EsmxC0uxgG7CULCAcPkV2lSY4M X-Received: by 2002:a05:6512:3e24:b0:50e:c6fd:eb7e with SMTP id i36-20020a0565123e2400b0050ec6fdeb7emr1183015lfv.126.1704786108364; Mon, 08 Jan 2024 23:41:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704786107; cv=none; d=google.com; s=arc-20160816; b=XnwbwGs7noDk/8egTQHrBuCwOf/BcZTgM46aAnpeH8gady4peqMyIDAfdM4YmDO9j3 BGjDnR6/sgT3rl1p+DFdb3AiOz8CRvvmvSFTeGlbCadrjkc0TVrhPMzzoTRLdRw1dv/1 V02jB/pjScaT1eyRAoPTc1Qd292vKcP/vHG7J2nGF0bwKWPkIC/bU9NQhALSmOFgtKer eV85LcZyaIP0SFA5xo8tT+FbsqEg0L2MVhksBmwtNcIAhRvWQPWIpE1eYU+AIPGfO/rU skBEBi7za7WOJ9eYRmfLqofpzPt22VB2Y6Bds7q02WY+4R7L61PAzrAqtX2zuEnxX7tM DKhA== 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:date:to:from:message-id :dkim-signature:delivered-to; bh=/YeZiWbB3HBvD+30r1Vim1ycIt4ALBj2RgGU/iKEBLQ=; fh=HnHYuZ9XgUo86ZRXTLWWmQxhslYEI9B9taZ5X1DLFfc=; b=Na+IRaVI88Oed7zHRvnPEUarxgjGFdQCxCmAU9W/Si/DCxN0bg4TAv5tg0bgf1ylSN wYHizHlp4J6PdYyPY/ueRiTIIzWYbtHlUBmZdCakL+OvpAxyImwzCS4Zy1hMV5BBCYV6 ey+saIkhVKQS/WI1fUUMy+owKy/SgdjydbJNvvfLQIUKK77ID1ULpdMA4D4CgBEBGbuu ZW9qdOB4q+WPyx4E4NaAq7YNmHUP7pi0eFwdBDPMb+4wzAAlno4QlNGG7W4kEDnwjlBn sV9dpAwFijqyQmr+i1aZbu9a+pCC5WNP8Ehrm2EVbl4ojAP/h6ksMG6fI5nTg79Qj8ta 3tyw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=glhiI6eF; 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=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id l18-20020a1709061c5200b00a26b02a74afsi556646ejg.66.2024.01.08.23.41.33; Mon, 08 Jan 2024 23:41:47 -0800 (PST) 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=@foxmail.com header.s=s201512 header.b=glhiI6eF; 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=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1991368CDF3; Tue, 9 Jan 2024 09:41:20 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out162-62-58-216.mail.qq.com (out162-62-58-216.mail.qq.com [162.62.58.216]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1949D68AA33 for ; Tue, 9 Jan 2024 09:41:10 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1704786061; bh=JaOyPjNS9eV6xmmkGsgQ9voDMJLziDKcTqoBE+CTNQQ=; h=From:To:Cc:Subject:Date; b=glhiI6eFzpXV6+S5msJtxPx3cgGboBCfBe3o/jl1ByN/BIZeD8KpBvOQ8X0PHhn5C n2C0XvrPTTZqVUUjzbgM5GrwDOSUFSmtM6MfckxjEROVaDdq6PYf0+R/3u01AlZ5qS A38i5598pMuXGY51Ufthxxrw9apDQNg2lXoTSAds= Received: from localhost.localdomain ([113.108.77.53]) by newxmesmtplogicsvrszc5-2.qq.com (NewEsmtp) with SMTP id A4039CE5; Tue, 09 Jan 2024 15:41:00 +0800 X-QQ-mid: xmsmtpt1704786060tehhp8jfw Message-ID: X-QQ-XMAILINFO: MhK4DKsBP06iqnEjNkUD/p9U/WXLeTuLpOlFc9lxv0q9vN5RVy/8rrZGtA02iA DVpp6WXIEp+C3gmdbB8gTlFjiTEnhJKprqlZDoPlG25YJTneV3QrC6QQK65+JL7CmsWlTg+Oj+T5 scn0b1cEOf8tpCtqWDD/CDLbp0YeBO1HhqwRpXbfQkPa1hfKzheX++UihMaAP3eYoKfxlfYgBVkq X8FqvOxKDm53Wvv4F9cR1+ugyOu6MVKZf2vn+e6SvmfL1cKjEJadXRPCw1HGQ9FhWrdJ7cs2luBf CEAgdCmXOxdAVR1LHVQBG0kjsYtDzyk6t0qLd6ufmmbkif7ZHWY2uBFpHOVjejIxyy8DutTgxZrJ sF8WlxnBy8X99qy8kRUYeLqJrenn9G5O8eZ8+tIrFxdmGFvZS3EsdgJ2B8cOybaCzqpekosTDQYC RZCUyaBr9vDYQiIfS2xq/JxKTDOK3My+wOBQzwDXEGXEDX9JU6CZSw7llqoMXbcEzjwas+k026ga GSs/acbs1ZyShkMM9D97QwpBAkGN4ZKhvOKu5ZNgMadaIf0hlf/9b7moEZn2zD8UcAKLg7tt7XXr xOHcvYN9QUQeQIu4coVJEwXIjTawGPJZmex6P6K/Ngj1gRETUEzwb+SbMwt/rFjGBGRrq228OqV9 r/QtsaKGcFonJ/01QfRYfAg8ecj9dAdszwdX/AWyuOmNVFTV6Wd9OUmXFbFMyEMq0MazDXv8H5+2 XS8DfKLdR0o1puQ4NdUJQ6yk1za72mGxm7d+56ivsbgNjjzaluafkTaOPcFaXicHyyMTwCtFAWvi rZAPvCwf7xqiwivyheAdzubwwsLEvQplrjwUtVuCKiGOxjGClyIls7iV9ADTYXLyywxMcOuE/JPu dCp0ABBIavSLpbY9OUtMOXDXSQAC8uzKAgLMWconBb9vvsduqJoACKn/xgJGbLp8Ap4ew6oKmEUf IH4oGFEYnmAhVT0b42PBDbuBOYUcbMhmGoohmKpuw= X-QQ-XMRINFO: NI4Ajvh11aEj8Xl/2s1/T8w= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Tue, 9 Jan 2024 23:41:00 +0800 X-OQ-MSGID: <20240109154101.316950-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] fftools/ffplay: fix missing hw_frames_ctx when config avfilter 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: Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: ObInnb7lw/un From: Zhao Zhili --- fftools/ffplay.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/fftools/ffplay.c b/fftools/ffplay.c index 17861e60be..3c378bca2c 100644 --- a/fftools/ffplay.c +++ b/fftools/ffplay.c @@ -1858,6 +1858,10 @@ static int configure_video_filters(AVFilterGraph *graph, VideoState *is, const c const AVDictionaryEntry *e = NULL; int nb_pix_fmts = 0; int i, j; + AVBufferSrcParameters *par = av_buffersrc_parameters_alloc(); + + if (!par) + return AVERROR(ENOMEM); for (i = 0; i < renderer_info.num_texture_formats; i++) { for (j = 0; j < FF_ARRAY_ELEMS(sdl_texture_format_map) - 1; j++) { @@ -1893,6 +1897,10 @@ static int configure_video_filters(AVFilterGraph *graph, VideoState *is, const c "ffplay_buffer", buffersrc_args, NULL, graph)) < 0) goto fail; + par->hw_frames_ctx = frame->hw_frames_ctx; + ret = av_buffersrc_parameters_set(filt_src, par); + if (ret < 0) + goto fail; ret = avfilter_graph_create_filter(&filt_out, avfilter_get_by_name("buffersink"), @@ -1959,6 +1967,7 @@ static int configure_video_filters(AVFilterGraph *graph, VideoState *is, const c is->out_video_filter = filt_out; fail: + av_freep(&par); return ret; } From patchwork Tue Jan 9 15:41:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 45542 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bf2f:b0:199:de12:6fa6 with SMTP id gc47csp241597pzb; Mon, 8 Jan 2024 23:41:23 -0800 (PST) X-Google-Smtp-Source: AGHT+IENBw4R11J0L5pJq5BitMWrcCwEIg2oMR5RDMubOZcTJPve/ljBKjIe4sQQGumPofMNLsxs X-Received: by 2002:a50:9506:0:b0:556:d522:89b6 with SMTP id u6-20020a509506000000b00556d52289b6mr278228eda.32.1704786083513; Mon, 08 Jan 2024 23:41:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704786083; cv=none; d=google.com; s=arc-20160816; b=jhE/EmZ4rP/ofZtdXI2/YegQpXoHBgxir+JaCjIN+S0xz10r3kbvFwemrwt14EuY1i t6J6Yk4UsMjxTj33c5fPSNy0Dgg86i1ndWpdH11E5l5zADtodyeXb6GUiHmw74Xp0dDE cjVe9zLx9PhhJ0LRsN/wkr6zq/EOfso8/+x2D7kGC8HfH+vccICG990Qn7sIaIg6Zq0W z+eGwv+QIOFLu9WhBIQAghZ17zAz6ZlUv3cUX7aDlH/ICp2EqTrhd3a01pAoyDjp1qIA pBZfFDW03bMN+8OsASJhGs/kUND67QVcccBLry38QCEFVtF86gs6Z1XK0XH327tfXSK1 xkxQ== 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:references:in-reply-to:date :to:from:message-id:dkim-signature:delivered-to; bh=ODa649i+bbG0OQZ6XfhEvQ0SyFYWKJnT32PWdpfesto=; fh=HnHYuZ9XgUo86ZRXTLWWmQxhslYEI9B9taZ5X1DLFfc=; b=um5c9caIgzh1u/SwQkgFsuc3LGYLzbdRfrM6RZNYWJhffHE/TwMgsd0C0fMfdxHHJs OPWKRSM+K8z9WBW2CL3/uZHgp6VI8m/uGtyv85sqs0c1oV9EYrG/WR/v6MpsB+g+uAOV CItU6yZiYheb5kuNVEM5ZGim1KgPiKw7ZEGdXY2dDYvJGs1uQQ0Si6I1kFmpIn8QsgBV 8A8x1l7uvU6c+0VDBYwUVHk9wjoUB4tAM0NoeA9ZByOMCMh8V6Oc8eLTl3sFscKmoWlW zbwveyaGCBKTE7DwFbN42nMh3ivWEX8pCixFbxWjK2kM6eiREQF6my9CQlbSOofgJhl9 tqhQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=SkzKT8XT; 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=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id f11-20020a50d54b000000b00553756f10aasi554384edj.592.2024.01.08.23.41.23; Mon, 08 Jan 2024 23:41:23 -0800 (PST) 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=@foxmail.com header.s=s201512 header.b=SkzKT8XT; 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=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C9C4868CDD1; Tue, 9 Jan 2024 09:41:18 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out162-62-58-216.mail.qq.com (out162-62-58-216.mail.qq.com [162.62.58.216]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1BEB868CCF6 for ; Tue, 9 Jan 2024 09:41:10 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1704786061; bh=JGG9NrWr/dq0EcqenUaqLUExbb+5mwYQAthP1A81yQs=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=SkzKT8XTUnczimyRDxqCmCg0KKAkVpVHvX8cHYmPUF6q29CZyMPOsL5wO6eECSkau OsaZNXceRpqwrhHA9Dv6tR78HJJWz/W/nHkllTC9SujO8ENQlbdnoLgU7KQzlCO9Lv t5Oh3UT03Fjnp1sGL3sSVOPja50viwW0/uKa9gng= Received: from localhost.localdomain ([113.108.77.53]) by newxmesmtplogicsvrszc5-2.qq.com (NewEsmtp) with SMTP id A4039CE5; Tue, 09 Jan 2024 15:41:00 +0800 X-QQ-mid: xmsmtpt1704786061tvr3k6bmd Message-ID: X-QQ-XMAILINFO: OGZxhFXqN7PJ3fTpqebm631HzQr1gDUFyWrySMYu+LLjCSVrYYqOgcWRAH5jgn Oeqo0m0QMbOHp9XRBUvwfDfgHctOb6KRGKotq6C9YxOwrDCchxr3mG5eBGlAK13EqPIIQNjRKTxp K0srB4AjNTPChlaCgU36hSPdBDhGbkkbYuB9fVzrofbOrWacUKDm8W84uWFrdM00iuLE7c3xNZgA WoIPJoegtT5F/GZljXFC/zAJBnRAMuefdDJY+hPNK6f2Qix9K6kWUoaA4Pxk7iwg3uadzh5vQK6d RjQnOeUXS5t9hcu0O/pdq+ke4N8XwO09NeoNFOyoAgTifcyfs7OJ+pkUPU/ToNKcdSEEZSFTvYJW AtqU8OiJAHOsebKBkdp2x/xeOnu7Nqe5JNHOVZflxMgaiEyXe6qD7rV9aez1NLd1AvFuBCasLl4t NJZqvZRfgtSw5oj+BTniShP6aEywlYqGO91ulqFKZNblppC7/b9fQOPJUxQGPK9Ab5/Rk/F3FU/6 JqUyH0Dq6YtZVshXjRIYWc5DrUXDTPA+iuyh93sduVFEZbULjfItcXugyvXprQBUiQNGKA2H02Ha YaDXQh87FZIJzWYJ5pPSih5VwiFZKiDlMyzhmgKyOWcRmpjU07Yi7bQGnZbs4x/Mvm7zmhzgsK4z 5bYFXAVsWTlxNYORIPzUEK4p++EvPV4mRPe/ycUcAVeCbgRD8MRMGuBkJk1VON00p0Z3Uc++mXCc xuo1uuxIPAM+hG7deLZFCY2AOxI0539qMirzG5Cj8MdqP+Yk+Qxu8xpqB6BpG8JFzAJbX+/HsrXw 7Ie3/hVepG34CPiz8XyhiW2c+GlkB+nbH6vhtI1StZPfOayYCLkTNO/9v/gmuVJspe+q6HiLM/jM o1ROjuS34Sox5KUGwnpzNJopQJpk9qR6JPOTWxMZzpjXAquTaZ1kifBfPVqw49PmkDQrsiu3FWIB LsTw5wWUINvu+iDbLKkZfQd6FAmErZ5EEWVGGaB0w= X-QQ-XMRINFO: Nq+8W0+stu50PRdwbJxPCL0= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Tue, 9 Jan 2024 23:41:01 +0800 X-OQ-MSGID: <20240109154101.316950-2-quinkblack@foxmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240109154101.316950-1-quinkblack@foxmail.com> References: <20240109154101.316950-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] fftools/ffplay_renderer: Add device selection 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: Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: HcGC4zVaOOxQ From: Zhao Zhili The device can be selected by GPU name or index. For example, ffplay -hwaccel cuda \ -vulkan_params device="NVIDIA GeForce RTX 3060" \ foo.mp4 ffplay -hwaccel cuda -vulkan_params device="0" foo.mp4 Please note that select device by index only supported by hwcontext, not by libplacebo. --- fftools/ffplay_renderer.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/fftools/ffplay_renderer.c b/fftools/ffplay_renderer.c index 4e9e33b675..e1c2f07896 100644 --- a/fftools/ffplay_renderer.c +++ b/fftools/ffplay_renderer.c @@ -209,6 +209,16 @@ static int add_device_extension(const AVDictionary *opt, return av_dict_set(dict, dev_ext_key, ext_list, AV_DICT_DONT_STRDUP_VAL); } +static const char *select_device(const AVDictionary *opt) +{ + const AVDictionaryEntry *entry; + + entry = av_dict_get(opt, "device", NULL, 0); + if (entry) + return entry->value; + return NULL; +} + static int create_vk_by_hwcontext(VkRenderer *renderer, const char **ext, unsigned num_ext, const AVDictionary *opt) @@ -229,7 +239,7 @@ static int create_vk_by_hwcontext(VkRenderer *renderer, } ret = av_hwdevice_ctx_create(&ctx->hw_device_ref, AV_HWDEVICE_TYPE_VULKAN, - NULL, dict, 0); + select_device(opt), dict, 0); av_dict_free(&dict); if (ret < 0) return ret; @@ -367,6 +377,7 @@ static int create_vk_by_placebo(VkRenderer *renderer, .opt_extensions = optional_device_exts, .num_opt_extensions = FF_ARRAY_ELEMS(optional_device_exts), .extra_queues = VK_QUEUE_VIDEO_DECODE_BIT_KHR, + .device_name = select_device(opt), )); if (!ctx->placebo_vulkan) return AVERROR_EXTERNAL;