From patchwork Wed Jun 14 16:48:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 42077 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c526:b0:117:ac03:c9de with SMTP id gm38csp191561pzb; Wed, 14 Jun 2023 09:52:33 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5Sg4N9Vu9HGTrM27ey2DTQwoUakOit/cc1vTRRJF/VKhRt3q/60D1GHZCcLzKU4mWWk0pR X-Received: by 2002:a17:907:a05:b0:96a:928c:d391 with SMTP id bb5-20020a1709070a0500b0096a928cd391mr14625822ejc.4.1686761553339; Wed, 14 Jun 2023 09:52:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686761553; cv=none; d=google.com; s=arc-20160816; b=RXCH4PoWj1P6zTY7R1iTuCrliq9Gw09drXlZMYH61PV4MqFbrzKBJX4xtdC/VtDCNG 8UZtlh/KC7pfuJxn982ni6lDEu5+P28LvXbHJ7zwBVu7CQIrMvOfc+tLuN8d17lN2AiC leqc/svhk0ta/lEdf2zVpTXypqoUM9F2lNsLM2Zy+jjHsTHEhRk7quaP82h+nooMz3hT mjPVt0aeNtf+P1QjzbVK0Jtg8y1GrWolD1AUoBXK43bmx4Sr7gVe+vb8A6QwnLglWh4q X3cSl0PhEj8LyfUPaapS9uM7Zh5/4R1QrnZ9iZBdPbdqbgmUovpG3YoPTmREPI+yqAhs PJig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to; bh=kMDIGq1j/njb85mMS0IEzmunIEdVjvv/4tiETttlemY=; b=xeo6J32ypvE3B8efRHK12stGF84nRcO/Z2tbaasoq9v6JB5fN1ywFTLZ4QsFEJrsy3 AESUTZit3IMjAZR5C5zeCCDlVMokC4MoNreBOjHdyWDi1h2bXbr8SDhhahn+YvdZ0L3D XwKV63SwHRCzbLDVSEA81z0aNqLhZZfab6M0+EJSObLt9bw0LlItZCnxbl7+L/TLmgpl 4XBxrsfAoNnkZlcdfZdlrB5olqtxRhsxGUVwSAu6JZ+qDSlyYq8yz+D4pi4almUAyqFd GFJggfO9T29kBz4J7vP8nhipknGlDABtW/EmtPPmxDO6/rJiAaUIz1/35laJ2SZL6Hxi gnog== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id n7-20020a170906688700b00950ea4cbd16si8198570ejr.271.2023.06.14.09.52.33; Wed, 14 Jun 2023 09:52:33 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B766B68C4F2; Wed, 14 Jun 2023 19:50:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3D56268C4A2 for ; Wed, 14 Jun 2023 19:50:00 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 15B652405F9 for ; Wed, 14 Jun 2023 18:49:57 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id 0sweBHvHvLNA for ; Wed, 14 Jun 2023 18:49:56 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id C9AC1240591 for ; Wed, 14 Jun 2023 18:49:53 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 7B0AB3A07D2 for ; Wed, 14 Jun 2023 18:49:47 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Wed, 14 Jun 2023 18:48:55 +0200 Message-Id: <20230614164908.28712-8-anton@khirnov.net> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230614164908.28712-1-anton@khirnov.net> References: <20230614164908.28712-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 08/21] fftools/ffmpeg_dec: remove pointless InputStream.hwaccel_retrieve_data 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: kzi/NR4pNdGw It is always set to hwaccel_retrieve_data() from ffmpeg_hw.c, so that function can just be called directly instead. --- fftools/ffmpeg.h | 1 - fftools/ffmpeg_dec.c | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index aeecf92fe6..2559225dd6 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -393,7 +393,6 @@ typedef struct InputStream { char *hwaccel_device; enum AVPixelFormat hwaccel_output_format; - int (*hwaccel_retrieve_data)(AVCodecContext *s, AVFrame *frame); enum AVPixelFormat hwaccel_pix_fmt; /* stats */ diff --git a/fftools/ffmpeg_dec.c b/fftools/ffmpeg_dec.c index ca9fbb9bd8..85132050d8 100644 --- a/fftools/ffmpeg_dec.c +++ b/fftools/ffmpeg_dec.c @@ -272,8 +272,8 @@ static int video_frame_process(InputStream *ist, AVFrame *frame) if(ist->top_field_first>=0) frame->flags |= AV_FRAME_FLAG_TOP_FIELD_FIRST; - if (ist->hwaccel_retrieve_data && frame->format == ist->hwaccel_pix_fmt) { - int err = ist->hwaccel_retrieve_data(ist->dec_ctx, frame); + if (frame->format == ist->hwaccel_pix_fmt) { + int err = hwaccel_retrieve_data(ist->dec_ctx, frame); if (err < 0) return err; } @@ -561,7 +561,6 @@ static enum AVPixelFormat get_format(AVCodecContext *s, const enum AVPixelFormat } } if (config && config->device_type == ist->hwaccel_device_type) { - ist->hwaccel_retrieve_data = hwaccel_retrieve_data; ist->hwaccel_pix_fmt = *p; break; }