From patchwork Fri Jun 7 13:01:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 49667 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:c209:0:b0:460:55fa:d5ed with SMTP id d9csp1012595vqo; Fri, 7 Jun 2024 06:09:58 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWw/abj/x1RkxaxQS9zxSNWvQaelHTcF9hU5EWsSvb7FfAEPPFBqfABjC/ELW7ZtCzRzgRoPc88knUT9ro6nYGezyNc+z1FK1jm0Q== X-Google-Smtp-Source: AGHT+IH5wOn3VP6TpyVDjPgIuwZxaY/LjEM94pKeyiYeMnY7KR938+t2i3erQAnhbgvQqu6yNtQq X-Received: by 2002:a50:ab1b:0:b0:57c:5764:15e7 with SMTP id 4fb4d7f45d1cf-57c576416ccmr1141229a12.36.1717765798155; Fri, 07 Jun 2024 06:09:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1717765798; cv=none; d=google.com; s=arc-20160816; b=FeKZVnQVgELEOE5JYtQtKG/FXFrbMSKYB70QQeBMnMyMxc2G3Fw9CTKXvwpV2lmf97 aD54zltocVJjH7ynmWHOlJClMHYspJnOcPFmztIJHSyQE1lrl17B+FSzm/LTJlxe9VzM kQYlmbH67uxcZIylbGLq22pUPVGV8tOKesdgpVNXx7mtSiMzo7zo8ZKIimPIGsoGWlDr 2VaAQpgDvP9mLOD6X+2LTgS8ujmyqiLZLifpBbZ8pB8V/COxpF54eMOVYQ06itPPxnqV 2RjQj+3ckbk5hpM86gZA8tv102ZGEU+X0GSVTdJVR0O4Leda5vFcKd5sguEiaij2oTJF pIKA== 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=KQfDf2IL5HshzBtcXY+hN+1gnmBexmFXkthJPFm/IMg=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=yFLh6rQDR/swJFfbsWyYrc62xiyWrOZJ/7Wv+vC/d4/G/vrU3qaDUA0ILKTOyofZsc Iv+5VE423Mo4v0chH6HdHOsGDHWFnvDegOYdm7SbabsKiEYvRbdmUppCsBGOAtKMyayH xcTufPxsxtLqE3I2HSkUpJZNqjfMZX+BGifoe/9eEe1ONIO411gQXtbfUj7SGoBf17wj aXKwVVKr5yIdqa0hA8WNu7adT9cNvcs5o3PEv6ZZaxsB4NVhKpzS+LgXkEXF5b2qxMa3 tEhyHkjL1Dqm722l/q33QVsdw+KhBVNGlbTHKBNPET1UUTl0YL0b1DFcf/yRpZhN5+HM fsjw==; 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=fm+L7mKP; 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 4fb4d7f45d1cf-57aae260c5bsi1824696a12.492.2024.06.07.06.09.57; Fri, 07 Jun 2024 06:09:58 -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=fm+L7mKP; 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 0578A68D86A; Fri, 7 Jun 2024 16:04:36 +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 0E7DB68D7DD for ; Fri, 7 Jun 2024 16:03:50 +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=fm+L7mKP; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id 6EDC54DBA for ; Fri, 7 Jun 2024 15:03:46 +0200 (CEST) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id w_-Lec-Yy-66 for ; Fri, 7 Jun 2024 15:03:46 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1717765421; bh=hrlMtgDR5cXtxq6dl4fjhXanHRhIXE14jc/r8VBsw7Y=; h=From:To:Subject:Date:In-Reply-To:References:From; b=fm+L7mKP1zIh1ULFT/FN70p0aVM6ZVtT7c3YmketJhDVjPJiQ/2N10cVPqthWtA/a 746gIsjxbc8x04PGJA5fxV8eJ8kyEbbwwYMhdpGqiDajm2NT92S/a8s8YVGWXLisNc 89PRG2oSGGs4lduOyqIeUJhgQPU0S1ODuZ1GzjEHpZZ/RIy2ChZPm+KqBUbl0g24EL 939TnDKdIXAZamCLOQyG2bWQOXAgqf+FLtPfhL0IBmvB5p5Av0YV3k/AwLidBsAeCG hVphxYBKxpU3vwDE/yQIjl5XRdjrFpPHY7lbhGEuqM7W5dvFO8DtL7qHsAqBgi0II/ 9jvyzDIMv/pfQ== 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 B5EF24DEC for ; 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 E5D0A3A0BB7 for ; Fri, 07 Jun 2024 15:03:34 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Fri, 7 Jun 2024 15:01:09 +0200 Message-ID: <20240607130135.9088-13-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 13/39] lavc/hevcdec: drop an always-zero variable 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: kPzsUc+KjyTz --- libavcodec/hevc/hevcdec.c | 9 ++------- libavcodec/hevc/hevcdec.h | 1 - 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/libavcodec/hevc/hevcdec.c b/libavcodec/hevc/hevcdec.c index 6dda923df5..d599373c9d 100644 --- a/libavcodec/hevc/hevcdec.c +++ b/libavcodec/hevc/hevcdec.c @@ -984,13 +984,9 @@ static int hls_slice_header(HEVCContext *s, GetBitContext *gb) unsigned val = get_bits_long(gb, offset_len); sh->entry_point_offset[i] = val + 1; // +1; // +1 to get the size } - if (s->threads_number > 1 && (pps->num_tile_rows > 1 || pps->num_tile_columns > 1)) { - s->enable_parallel_tiles = 0; // TODO: you can enable tiles in parallel here + if (s->threads_number > 1 && (pps->num_tile_rows > 1 || pps->num_tile_columns > 1)) s->threads_number = 1; - } else - s->enable_parallel_tiles = 0; - } else - s->enable_parallel_tiles = 0; + } } if (pps->slice_header_extension_present_flag) { @@ -3697,7 +3693,6 @@ static av_cold int hevc_decode_init(AVCodecContext *avctx) if (ret < 0) return ret; - s->enable_parallel_tiles = 0; s->sei.picture_timing.picture_struct = 0; s->eos = 1; diff --git a/libavcodec/hevc/hevcdec.h b/libavcodec/hevc/hevcdec.h index 3b7442e5c1..c58ce05639 100644 --- a/libavcodec/hevc/hevcdec.h +++ b/libavcodec/hevc/hevcdec.h @@ -532,7 +532,6 @@ typedef struct HEVCContext { /** The target for the common_cabac_state of the local contexts. */ HEVCCABACState cabac; - int enable_parallel_tiles; atomic_int wpp_err; const uint8_t *data;