From patchwork Tue Feb 28 12:00:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 40546 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:d046:b0:cd:afd7:272c with SMTP id hv6csp1541349pzb; Tue, 28 Feb 2023 04:02:25 -0800 (PST) X-Google-Smtp-Source: AK7set9af/vDMBe0/fffdX+kCOVUbnscN9jf0piEmIThV0K42vfL+hxWgxcdn9ERYwYxMedIH/fm X-Received: by 2002:a17:906:3106:b0:8b1:3483:e3d5 with SMTP id 6-20020a170906310600b008b13483e3d5mr2161925ejx.48.1677585745475; Tue, 28 Feb 2023 04:02:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677585745; cv=none; d=google.com; s=arc-20160816; b=pLEKs5vuZA3XTkdWQBzZPvyhQNdzLDjvcFPpwrz6uxdzQj6zs3VcvkbhRwlQy438y5 BrTs5Fc3xpxGrOkjbdfLO97llJCuLlO3+sZ+n7+b/L7be9TMjEuyrcl7OhJAlPmiNjT5 LY9xEJkTxWxzpFKwc1eFixtVIzIlYhvhiKmArCvJldm21KDME4Ni3c5NKkNm6II+zQ3P xH9OK8Y0FKcvP09irlXNWMDh7mJ2BPmr+euLPOzCFVSb5KkBvjJwiVtdHktDOylY9N2U mndbIJVFFy7lr18ByrlhhZKX0bRKWVYLVHkSkh8C9yfPuKBWUhWTXLdIj9UNKxE5LHPx tMag== 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=YL0BONVS0BKDg33zV3yOvnjUHiMqilxceB5ejhQhyNE=; b=BZP/ENKKX/xhA3Y/zJO2bPvYe7tCYfRh6QB9RqkXS0FhoztL3Ugj4gfHeJuuc7kfp+ ajgnlL72KkH+W355mBoMsj4LOh8amn3kG4+sF/Cn4/3kCnGCNRoaMVIAsbtcnaXTHdqJ wdVWi2LtKuIobRmRu21rlrGoIYrno30hIWirNTCma/NOVqaUJae/IBguSilBCZQdmfSD l1slkDMfuk5F4qBzm6GdSpNSk0R18jlBXiyrVy3a+LNkQQk7m24u7bZFNwODCI4Xx7vO JPwSC7Tfq0ZBkvJG07dRHpOKqCWRZOZQkclZnaGNGodZDSAdfzVmEYfJ8xdv4nQWr6Ns a4+A== 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 s20-20020a056402165400b004aad0c7e385si2531292edx.270.2023.02.28.04.02.25; Tue, 28 Feb 2023 04:02:25 -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; 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 BF2BF68AC78; Tue, 28 Feb 2023 14:01:35 +0200 (EET) 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 D66F568ABA5 for ; Tue, 28 Feb 2023 14:01:27 +0200 (EET) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 6A3CB2405B5 for ; Tue, 28 Feb 2023 13:01:24 +0100 (CET) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id KEpVaSmWaV7l for ; Tue, 28 Feb 2023 13:01:23 +0100 (CET) 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 BB6B3240591 for ; Tue, 28 Feb 2023 13:01:20 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 31A813A0370 for ; Tue, 28 Feb 2023 13:01:14 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Tue, 28 Feb 2023 13:00:58 +0100 Message-Id: <20230228120104.2347-2-anton@khirnov.net> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230228120104.2347-1-anton@khirnov.net> References: <20230228120104.2347-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/8] lavc/libvpxenc: drop frame_number 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: QuzqzopkYC0B It is not used, except to check whether the packet is valid before writing HDR metadata to the packet in storeframe(). However, that check serves no purpose, as the encoded packet is already treated as valid higher up in this function. --- libavcodec/libvpxenc.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c index 339d4d8146..eaa4ad8f25 100644 --- a/libavcodec/libvpxenc.c +++ b/libavcodec/libvpxenc.c @@ -63,7 +63,6 @@ struct FrameListData { uint32_t flags; /**< flags for this frame */ uint64_t sse[4]; int have_sse; /**< true if we have pending sse[] */ - uint64_t frame_number; struct FrameListData *next; }; @@ -84,7 +83,6 @@ typedef struct VPxEncoderContext { int deadline; //i.e., RT/GOOD/BEST uint64_t sse[4]; int have_sse; /**< true if we have pending sse[] */ - uint64_t frame_number; struct FrameListData *coded_frame_list; struct FrameListData *alpha_coded_frame_list; @@ -1220,9 +1218,8 @@ static inline void cx_pktcpy(struct FrameListData *dst, dst->sz = src->data.frame.sz; dst->buf = src->data.frame.buf; dst->have_sse = 0; - /* For alt-ref frame, don't store PSNR or increment frame_number */ + /* For alt-ref frame, don't store PSNR */ if (!(dst->flags & VPX_FRAME_IS_INVISIBLE)) { - dst->frame_number = ++ctx->frame_number; dst->have_sse = ctx->have_sse; if (ctx->have_sse) { /* associate last-seen SSE to the frame. */ @@ -1232,8 +1229,6 @@ static inline void cx_pktcpy(struct FrameListData *dst, memcpy(dst->sse, ctx->sse, sizeof(dst->sse)); ctx->have_sse = 0; } - } else { - dst->frame_number = -1; /* sanity marker */ } } @@ -1289,13 +1284,11 @@ static int storeframe(AVCodecContext *avctx, struct FrameListData *cx_frame, AV_WB64(side_data, 1); memcpy(side_data + 8, alpha_cx_frame->buf, alpha_cx_frame->sz); } - if (cx_frame->frame_number != -1) { if (ctx->hdr10_plus_fifo) { int err = copy_hdr10_plus_to_pkt(ctx->hdr10_plus_fifo, pkt); if (err < 0) return err; } - } return pkt->size; }