Message ID | 20240607130135.9088-2-anton@khirnov.net |
---|---|
State | New |
Headers | show
Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:c209:0:b0:460:55fa:d5ed with SMTP id d9csp1008597vqo; Fri, 7 Jun 2024 06:04:26 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUl7sgxX7pxPDNHZQYeA2DSGoJ2l0ZdqKUDggXnvp3rz2JhA1RsMlUrzf+mXAGAZITccSNtqBqMS7H2vQDlbPvloy/mC8zaJ18h4Q== X-Google-Smtp-Source: AGHT+IHpRQoVH6BpvHEeOuTJRVARyRFxQCRHuEGjyH7bWoyungd9Lf0NFkijvR6ZcW41Hhn9hoYF X-Received: by 2002:a17:906:714f:b0:a6d:f547:7029 with SMTP id a640c23a62f3a-a6df556b429mr126894466b.22.1717765466029; Fri, 07 Jun 2024 06:04:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1717765466; cv=none; d=google.com; s=arc-20160816; b=DY/3wGemFL0geIzupYmeiwXpCHm1/dHgx1xXlTRcNEDK+mf77BhPCV/bMj9dbCpNHS 17JOc9qVygdYDagszgDFEPwvyftrBNYqaMo1YBOfdIScRAFlSSXaJLC/g501R/Ebklwr eQzF061Z/kbb7AgATyh9Ujb4puTPhzwz1ndNTYNchKGRPf5zLnRJIlDk56AMPdpZi/hq IhQmnUAksmFOWl9xzd5Hg0MMrf+z/J8O5lXDXOkO/kHa1Ty+dgH9UGYFlqWLZtXr+fO2 59Gu6KIU54T2Ww6qMpjEAK5mPMatzlXxn/38/kSVr//4+OHpdpDrMj+VO6SHgzECwKu4 dSAA== 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=e8pdzklWyiTrEOvVlUAQy63MC0e5PWNW2OCpATvJ1vo=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=JqnQrWBc1n8+djQuiQE7rbu+7efsAJq+C6Vsi0T/Q9XhMdh4wjAqzfIG/sw34b11dI l1G24hHd7nFENyNENtN5i7wVeW/WK7LN7s4LZhag3FtcBEOm1aTVkb25kSGo5DwRKm5B 0TPIncO12TCeeFD7t3dcaNsokhR+DH6vRm2zOxrRDVqIucN7Wwg2wHY14cnOj4Qk6Pic hjGuxjG6vju1fBev6cJNW08vvmjq9SXDUQfWsIzck1av7pLv9CcXfgfpA6PiKn8AJIcl uuapuIV2Mzd+GcVU2gCt86NvqDQHAHJSun7CnT1UzXbaayQT/XveL0WgznINDzLav+tS 8EwQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@khirnov.net header.s=mail header.b=R3sToDYn; 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: <ffmpeg-devel-bounces@ffmpeg.org> Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a640c23a62f3a-a6c807280d3si182505266b.774.2024.06.07.06.04.25; Fri, 07 Jun 2024 06:04:26 -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; dkim=neutral (body hash did not verify) header.i=@khirnov.net header.s=mail header.b=R3sToDYn; 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 68B2F68D7D8; Fri, 7 Jun 2024 16:03:54 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6CBE868D759 for <ffmpeg-devel@ffmpeg.org>; Fri, 7 Jun 2024 16:03:44 +0300 (EEST) Authentication-Results: mail1.khirnov.net; dkim=pass (2048-bit key; unprotected) header.d=khirnov.net header.i=@khirnov.net header.a=rsa-sha256 header.s=mail header.b=R3sToDYn; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id 278124E12 for <ffmpeg-devel@ffmpeg.org>; Fri, 7 Jun 2024 15:03:43 +0200 (CEST) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id taQozSO5AsfD for <ffmpeg-devel@ffmpeg.org>; Fri, 7 Jun 2024 15:03:41 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1717765421; bh=Bi7ihegtPOkk6Xyy4MiO56+E5wxVasdIfXMiWPULUaA=; h=From:To:Subject:Date:In-Reply-To:References:From; b=R3sToDYnDHhrZeH4uJdyGOR0PWTs7SrIfDOrHOrC4bWzONLyunilgHI5IfzGzq0Q4 m4IYjo26oKcx/yggXrY2rCaCsRe6JFc602606OYl+bDyQZBIepfBR4RRlNDmw29v6c qX2FYBkTzCmwbCXNYAM8sTTCRBeq53kXK3zmctIPePdZuzfnp4zUzJTEw0Frc1W2Bw 540/uzZ6ROpLDGMtgVhKoGks2TsyPyhYx9HuTS3UbzAYH7P1KzF9oUBczVPwlSCJPA 5r3DJpAYhw5aKMfnAoKGTVl3gx1FLYYBKUsF+SmbwS+8gzsgLCr7KxnItAzBAsEGN7 J04QkF0Z365wg== 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 mail1.khirnov.net (Postfix) with ESMTPS id 154244D76 for <ffmpeg-devel@ffmpeg.org>; Fri, 7 Jun 2024 15:03:41 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 5AEB43A0552 for <ffmpeg-devel@ffmpeg.org>; Fri, 07 Jun 2024 15:03:34 +0200 (CEST) From: Anton Khirnov <anton@khirnov.net> To: ffmpeg-devel@ffmpeg.org Date: Fri, 7 Jun 2024 15:00:58 +0200 Message-ID: <20240607130135.9088-2-anton@khirnov.net> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240607130135.9088-1-anton@khirnov.net> References: <20240607130135.9088-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 02/39] lavc/hevcdec: simplify condition X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches <ffmpeg-devel.ffmpeg.org> List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>, <mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe> List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel> List-Post: <mailto:ffmpeg-devel@ffmpeg.org> List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help> List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>, <mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe> Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org> X-TUID: aHjmN3v5mePl |
Series |
[FFmpeg-devel,01/39] lavc/hevcdec: do not free SliceHeader arrays in pic_arrays_free()
|
expand
|
Context | Check | Description |
---|---|---|
andriy/make_x86 | success | Make finished |
andriy/make_fate_x86 | success | Make fate finished |
diff --git a/libavcodec/hevc/hevcdec.c b/libavcodec/hevc/hevcdec.c index d317c1471a..43cbc45062 100644 --- a/libavcodec/hevc/hevcdec.c +++ b/libavcodec/hevc/hevcdec.c @@ -3115,7 +3115,7 @@ static int decode_nal_unit(HEVCContext *s, const H2645NAL *nal) ctb_addr_ts = hls_slice_data_wpp(s, nal); else ctb_addr_ts = hls_decode_entry(s, &gb); - if (ctb_addr_ts >= (s->ps.sps->ctb_width * s->ps.sps->ctb_height)) { + if (ctb_addr_ts >= s->cur_frame->ctb_count) { ret = hevc_frame_end(s); if (ret < 0) goto fail;