From patchwork Sun Nov 14 18:59:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 31417 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp4805250iob; Sun, 14 Nov 2021 11:00:51 -0800 (PST) X-Google-Smtp-Source: ABdhPJwdDy3XjH/xgevtCoHrUL5x9BxqolUzhe2vlGpvYNxI38lr+8w1nOK5Khxwd0bPcathsLDL X-Received: by 2002:a17:907:1dd5:: with SMTP id og21mr43012475ejc.233.1636916450833; Sun, 14 Nov 2021 11:00:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1636916450; cv=none; d=google.com; s=arc-20160816; b=VtpWm8VvXU4UDus+yY138+iY+IJFrlSXgJ88P95+Wzcx+UEakeeJhIRS8PI0bXHpN5 q8FfRTqUxqq4RBE2WSccYGUHX+CDzkVDj366TR8e6VpHaMgJYfZWFH2zl8CtUpqRAp4R 6fX4ntu6pEKIra/E/YVpbHksLfkneYcRWGGUDfANpHxIjFNHuxrQF+Y2S9lO26Kw22cu /RzQPf0PHzk++Sg5tDUhsLweO9uMxKOTNbkvqj3Ynj9tuWohDUsjyZ4SlwYmoMvaLsUH /2W9eB5a6mPX2pBJz3ZCuTSC33dpw4NgIP/11ARcXkgR2ol0ux8yk0CkquFYRYRioeKb bWNw== 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:dkim-signature:delivered-to; bh=6Plw7/YwN8o+vHTblYWqTTeqlEeUNMRBBBkk+AIuUwQ=; b=LJCe8Gg/OcYjTnW1/TyIMow7KCPgyRpw5q0nlMluW7fR6y8mMMNwkeezWMkTcWBre0 6GGGeUEaFDgb2ZTr1+F/Q5zwEE/9R91syH30jB8IHez5rE8aT4beYgNMPu9eMOuH8Bd9 N2ba6RLFrhi4O1W5Bwh5r2QsQZbg9bmJr6KKtmn35Jcd7ViIyaAVaJewCRTrfVoaDfcS pq9fUyurkwMYdVzapV40qyMPVk0AbcO671ntQiMQe2aNBujMYZRpWdcvCCsq7+QgZQ3s gctv28mLo7pSBs2HbSPS6cABjNLlYtndaRpL8dAs/KfCu9OTubLyPMiZxH5xeMK4BmzS 9DcA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=F8VpfsLa; 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 a18si22633538ejp.26.2021.11.14.11.00.50; Sun, 14 Nov 2021 11:00:50 -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=@gmail.com header.s=20210112 header.b=F8VpfsLa; 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 A262F68A61A; Sun, 14 Nov 2021 21:00:35 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ua1-f42.google.com (mail-ua1-f42.google.com [209.85.222.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A8890680CAB for ; Sun, 14 Nov 2021 21:00:28 +0200 (EET) Received: by mail-ua1-f42.google.com with SMTP id w23so7289494uao.5 for ; Sun, 14 Nov 2021 11:00:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=Cv9Jq4jgQYnjHiXsRh1ewF2RAtLRMweKvCwx138+mcQ=; b=F8VpfsLa7hofWTUJAdjf3S0tNdY9UMj7ZpFd84SpDgH51WdutS0FouzpVx3Ibn1DGN xZ3sDyV2QSPBm9E6q3v8kpp8n1+9KR9dDjP7vLxwJoiquo5ztJROsCmXBKBjI5v/yPg/ f/oJqzTK6XG4oBNchyorlXfyyIhX0WdFURS55SEBzqvkFJ6ZLIyb5BKhVmJKre77DKPb rXDV0IXDSKDiDlsxWow4h9paMwqzdIneXlSvZvr8o5c7XH3wzqbTdvNtxPzvKDXOSbgt Pk6XCkPCC1HQoi1pxNGhaevoeHdAvQbo4cAc1XUKQbjtzCp5pvETOL4mYl2htsEPTYl1 9V9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Cv9Jq4jgQYnjHiXsRh1ewF2RAtLRMweKvCwx138+mcQ=; b=l6vhnIwbXH1kDIAQLuYyu0EH5hwcLO4VuoYX0MiyAohyVDJDjTcz+uY8gw7Nt1Hl33 hN2gJtyOpaGRaOu9pRk8A0viQToErTnhxwyYML1mQT4XWMmwIPMFuHIr0duN+44mz1bf V1Y/WpdhJpQvrJZ3K4TKTwPJ7EEa4ZqT2f3HWCZxC06ymTqeIbJVu93unFTDKnAgUBxz 8SkxZmUtagTfjASIWlG1o7tEFt91H4eF211c7LnMc1gHmqb18Ybvkaf0hdTlmU5eLBSl yebwaSSBjpUevhDA1Pv4GUXkABhKc3UIwzWA9jYfQRIp30b/P2ICXWmUscLrXaJipAlK EAcA== X-Gm-Message-State: AOAM532OV22DPKMrlHixZ2UJd8r+CYNM4pBR3+7MVx84d6TdY5MzmJSa qxfXepoBxVK108TDWF/ESsl65Xex2qM= X-Received: by 2002:ab0:6cea:: with SMTP id l10mr49144031uai.27.1636916427134; Sun, 14 Nov 2021 11:00:27 -0800 (PST) Received: from localhost.localdomain ([181.23.88.82]) by smtp.gmail.com with ESMTPSA id l190sm8180638vsc.26.2021.11.14.11.00.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 14 Nov 2021 11:00:26 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 14 Nov 2021 15:59:55 -0300 Message-Id: <20211114185956.53923-2-jamrial@gmail.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211114185956.53923-1-jamrial@gmail.com> References: <20211114185956.53923-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] ffmpeg: remove unused hwaccel_get_buffer function pointer 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: gT9xdsJusEu1 As well as the custom get_buffer2() implementation which would become a redundant wrapper for avcodec_default_get_buffer2() after this Signed-off-by: James Almer --- fftools/ffmpeg.c | 11 ----------- fftools/ffmpeg.h | 1 - 2 files changed, 12 deletions(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 26030ed25e..bde5a2f603 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -2938,16 +2938,6 @@ static enum AVPixelFormat get_format(AVCodecContext *s, const enum AVPixelFormat return *p; } -static int get_buffer(AVCodecContext *s, AVFrame *frame, int flags) -{ - InputStream *ist = s->opaque; - - if (ist->hwaccel_get_buffer && frame->format == ist->hwaccel_pix_fmt) - return ist->hwaccel_get_buffer(s, frame, flags); - - return avcodec_default_get_buffer2(s, frame, flags); -} - static int init_input_stream(int ist_index, char *error, int error_len) { int ret; @@ -2963,7 +2953,6 @@ static int init_input_stream(int ist_index, char *error, int error_len) ist->dec_ctx->opaque = ist; ist->dec_ctx->get_format = get_format; - ist->dec_ctx->get_buffer2 = get_buffer; #if LIBAVCODEC_VERSION_MAJOR < 60 FF_DISABLE_DEPRECATION_WARNINGS ist->dec_ctx->thread_safe_callbacks = 1; diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index 17135cb830..2d6c5416c4 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -377,7 +377,6 @@ typedef struct InputStream { /* hwaccel context */ void *hwaccel_ctx; void (*hwaccel_uninit)(AVCodecContext *s); - int (*hwaccel_get_buffer)(AVCodecContext *s, AVFrame *frame, int flags); int (*hwaccel_retrieve_data)(AVCodecContext *s, AVFrame *frame); enum AVPixelFormat hwaccel_pix_fmt; enum AVPixelFormat hwaccel_retrieved_pix_fmt;