From patchwork Fri May 5 09:07:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 41482 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dca6:b0:f3:34fa:f187 with SMTP id ky38csp329564pzb; Fri, 5 May 2023 02:07:56 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5MqTdQwtaFejj4pZNPPOoYHFFL0exwfZhrt5kUgzqa+cfAOAS2bM4zSeZEbmtiUtjaDdQh X-Received: by 2002:a17:907:961c:b0:94e:98da:ef97 with SMTP id gb28-20020a170907961c00b0094e98daef97mr755750ejc.27.1683277676168; Fri, 05 May 2023 02:07:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683277676; cv=none; d=google.com; s=arc-20160816; b=I14UKeM8ZV1L7/eYwipTD6CXJVdcLYT7TQ1gzFrsFDvvmneJvMys2TSoR4DhCePkKR wqPDMlVxw+KKRemXUmHY/enCHhPPBwIByF5VPHkMT21ealaw88cNYQX/dzJmwFpJmgnG FC/rqY/A3yCyCT1/nNZQOQ8XGWDkTrjAnjoX+7Y3kAvvRN23bJVRoENNpHNFNqNNfcUc 6lPTguskmiaL+2abADkvm1QgXwsME7Qs4ldHMI0jiIQWzWpXx9KIGztrxUxSVUE97yLb EGX5RQMMjiSgdOaEjUXBPiH4CpY174D7gXBeXivCyud3fa8LD/Q3/Hmyuu325hO0zawa Ofbw== 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=6L/dU/jKo4dBv3XMyeTwZWfQ91xTs5e8Eb4GVqxcB3U=; b=uRugcVLFB2gm7cAVEgxdCEgntznGHh63I+ZcuCUD1vq5JCRnRCORIjhoxtWfr2plxH qxuj6zscgMjjFRWmyfIJfVdiDfSQQC2DCdJcZKND1SovxUBX5vooAAYNO4v33boIfZN6 eRw/8Tn/inZIkIq/zte9cNWM4OQf2QXCBjggdLGHNd+W3o5SQmlMsUVA9mHUaiu1dwLl skvPc4vn+8Rj2f7lYZ2aJ0clNYoHSjii2aWOqR5Nb6bfqx2xGioaTTbidaxwTI0O8nQy KU8+Sv+K1v8LtRA312pa2OjA/skCDYh+AlEn9PuI7A1bxrSCqRGs2tLLpkJCoqT0z+/t tFbg== 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 jw23-20020a17090776b700b00959b7e024a6si875188ejc.365.2023.05.05.02.07.55; Fri, 05 May 2023 02:07:56 -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 8DEBE68C0FE; Fri, 5 May 2023 12:07:39 +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 6064068AB4A for ; Fri, 5 May 2023 12:07:31 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 299812404EC for ; Fri, 5 May 2023 11:07:31 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id vJbohDwo5BHJ for ; Fri, 5 May 2023 11:07:30 +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 000C82404EE for ; Fri, 5 May 2023 11:07:29 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id DFA063A1267 for ; Fri, 5 May 2023 11:07:29 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Fri, 5 May 2023 11:07:18 +0200 Message-Id: <20230505090723.24872-6-anton@khirnov.net> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230505090723.24872-1-anton@khirnov.net> References: <20230505090723.24872-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 06/11] fftools/ffmpeg_filter: move InputFilter.displaymatrix to private 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: 9ZBFSlycxAvW It is not used outside of ffmpeg_filter. --- fftools/ffmpeg.h | 1 - fftools/ffmpeg_filter.c | 15 +++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index 0231ebc84f..8a2254d2a8 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -291,7 +291,6 @@ typedef struct InputFilter { AVChannelLayout ch_layout; AVBufferRef *hw_frames_ctx; - int32_t *displaymatrix; } InputFilter; typedef struct OutputFilter { diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c index 5d9242f476..087ef8b894 100644 --- a/fftools/ffmpeg_filter.c +++ b/fftools/ffmpeg_filter.c @@ -61,6 +61,8 @@ typedef struct InputFilterPriv { AVFifo *frame_queue; + int32_t *displaymatrix; + // fallback parameters to use when no input is ever sent struct { int format; @@ -270,7 +272,7 @@ void fg_free(FilterGraph **pfg) av_frame_free(&frame); av_fifo_freep2(&ifp->frame_queue); } - av_freep(&ifilter->displaymatrix); + av_freep(&ifp->displaymatrix); if (ist->sub2video.sub_queue) { AVSubtitle sub; while (av_fifo_read(ist->sub2video.sub_queue, &sub, 1) >= 0) @@ -1061,7 +1063,7 @@ static int configure_input_video_filter(FilterGraph *fg, InputFilter *ifilter, // TODO: insert hwaccel enabled filters like transpose_vaapi into the graph if (ist->autorotate && !(desc->flags & AV_PIX_FMT_FLAG_HWACCEL)) { - int32_t *displaymatrix = ifilter->displaymatrix; + int32_t *displaymatrix = ifp->displaymatrix; double theta; if (!displaymatrix) @@ -1407,6 +1409,7 @@ int ifilter_parameters_from_dec(InputFilter *ifilter, const AVCodecContext *dec) static int ifilter_parameters_from_frame(InputFilter *ifilter, const AVFrame *frame) { + InputFilterPriv *ifp = ifp_from_ifilter(ifilter); AVFrameSideData *sd; int ret; @@ -1423,10 +1426,10 @@ static int ifilter_parameters_from_frame(InputFilter *ifilter, const AVFrame *fr if (ret < 0) return ret; - av_freep(&ifilter->displaymatrix); + av_freep(&ifp->displaymatrix); sd = av_frame_get_side_data(frame, AV_FRAME_DATA_DISPLAYMATRIX); if (sd) - ifilter->displaymatrix = av_memdup(sd->data, sizeof(int32_t) * 9); + ifp->displaymatrix = av_memdup(sd->data, sizeof(int32_t) * 9); if (frame->hw_frames_ctx) { ifilter->hw_frames_ctx = av_buffer_ref(frame->hw_frames_ctx); @@ -1567,9 +1570,9 @@ int ifilter_send_frame(InputFilter *ifilter, AVFrame *frame, int keep_reference) need_reinit = 1; if (sd = av_frame_get_side_data(frame, AV_FRAME_DATA_DISPLAYMATRIX)) { - if (!ifilter->displaymatrix || memcmp(sd->data, ifilter->displaymatrix, sizeof(int32_t) * 9)) + if (!ifp->displaymatrix || memcmp(sd->data, ifp->displaymatrix, sizeof(int32_t) * 9)) need_reinit = 1; - } else if (ifilter->displaymatrix) + } else if (ifp->displaymatrix) need_reinit = 1; if (need_reinit) {