From patchwork Wed Jun 26 12:43:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 50161 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:ccd2:0:b0:482:c625:d099 with SMTP id q18csp405993vqv; Wed, 26 Jun 2024 05:44:21 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXteZdk1e7SXTXKkHPmRL76ZNsPBuF1885hyaAVul1zMtgZoESPw2PN/e3YNB/jVmVXRZgkKpvPxWDOv0ilMUzZPDZ+Fp0mdV0a4A== X-Google-Smtp-Source: AGHT+IGFYFfGHznCZh2q79OG6cuT8FW3xlcQXrDjuwPIHhc8akOhJJRZbE9Lsdd3NOvWONkiJdyn X-Received: by 2002:a17:907:8dca:b0:a72:631d:6de1 with SMTP id a640c23a62f3a-a72631d6eabmr548106666b.20.1719405860782; Wed, 26 Jun 2024 05:44:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719405860; cv=none; d=google.com; s=arc-20160816; b=ar4ykEW9YmTNVf5Dgx3RxP8eTCuLjkN1Wi2YBk6IVJZwC+D1PpIj/1mQAF7FKMjSwy DTPE9iq1M0UqLBGpyhPCzVFMuG4YOCPEGU+lDBEnRdJU/kfodQsdpP+RmJ+L0NOZelJH 3Z3s0cQ6yfVqtmDTT5LtxGRGiVQebaD505D4811Kk8SmBSx6m0tz/LLfoFfH0pZgPLDi BGC0g543L0PNL7L7IFFW5o2rISJd74B4V57it63UypsV4lKrbiHwFoxbKNK1EJ4UoWJt bLtRRjHpTVU6a0GYbI302bOPM58+NAZoqy3GlTzg/cmaHws3ZE+rrm/1urSLJcGVfYz2 8QAA== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=ydNE3mai7DLTXRXhtCPsyX3fxxm529p1FAXKjkkngr8=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=Ay8k2Qn/i7NFGLcNsyTsqzxh+PuW1hZC/d0ZX3zny1py6x47vv5HNdD2qR3bQpqaNj Ic4olVCqXLy9hCFzCn/Zp1+k7f5JN7j7bzFceUT0iUgJr2GE9Q6s3ygCsht4MgnbG8Va RO9OO6LqEBd6PkhBo9p46fHTKOMeDdkTh5yb092aaq+gvencPEyYK3pQ2Lk0Y/feQg0X 6/41/P2Ydf/TmFVnfI9K8Xs7+79rmv7mNAE09ftO140P2bnDkpC46OmEwrsCZglZg1aR p8ulm36Q6SsPjHe74m6saTVMch5/NBJiNQVjSQfE95v6KuyfZxsdMevTwQOuWn3zwE6+ 0p6g==; 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=YxZkBF+y; 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 a640c23a62f3a-a6fcf54d067si571472466b.344.2024.06.26.05.44.18; Wed, 26 Jun 2024 05:44:20 -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=YxZkBF+y; 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 EE08A68D428; Wed, 26 Jun 2024 15:43:53 +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 E677F68D265 for ; Wed, 26 Jun 2024 15:43: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=YxZkBF+y; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id 01AE94DBC for ; Wed, 26 Jun 2024 14:43:43 +0200 (CEST) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id ytrp6OGD_7N3 for ; Wed, 26 Jun 2024 14:43:42 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1719405820; bh=Xw+cuTO21WtGQ+MLApiZoRuYHioFhiIzdeo6ymIO4oE=; h=From:To:Subject:Date:From; b=YxZkBF+yWbfqCwzh8Tax4XO/GtEsf2INURsDWMPswQOtZ/U8pD6VsjVH8gEQocelM 9O9pRC/u1xFn9D8i5tr4jPFfAqfM9XiT0mtNlIo+D/CLuRBzZ/maip5hcOK6UswQrO bWM5ReJnT4069VJBHffhzCGgFlaAHHm3t6N/0v4kw+UAMCYD4Lz7bsHFgCjVzN62lh rsYFWb4YQ088SH6yFSiZ44Hb2QepLh2h3eR3YFG82vHlg8aAcQAdlDsI63t93yqRtB U78COeDvH6+QMVpEM3z8Z2loNgNOvfvt0BZqTvqGKXdzpBnDlxGxGofQ6LfISWQnSc BJz5tR5wnLLQQ== 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 D1C974DBA for ; Wed, 26 Jun 2024 14:43:39 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id AACAB3A02EE for ; Wed, 26 Jun 2024 14:43:39 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Wed, 26 Jun 2024 14:43:33 +0200 Message-ID: <20240626124337.14478-1-anton@khirnov.net> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/5] lavc/hevcdec: call export_stream_params_from_sei() before ff_get_buffer() 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: el7vLbldw2/8 So that correct values of color_trc are set on the allocated frame. --- libavcodec/hevc/hevcdec.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/hevc/hevcdec.c b/libavcodec/hevc/hevcdec.c index 1d2e53afc3..e80f2f28c7 100644 --- a/libavcodec/hevc/hevcdec.c +++ b/libavcodec/hevc/hevcdec.c @@ -2964,6 +2964,10 @@ static int hevc_frame_start(HEVCContext *s) if (pps->tiles_enabled_flag) s->local_ctx[0].end_of_tiles_x = pps->column_width[0] << sps->log2_ctb_size; + ret = export_stream_params_from_sei(s); + if (ret < 0) + return ret; + ret = ff_hevc_set_new_ref(s, s->poc); if (ret < 0) goto fail; @@ -2984,10 +2988,6 @@ static int hevc_frame_start(HEVCContext *s) !(s->avctx->export_side_data & AV_CODEC_EXPORT_DATA_FILM_GRAIN) && !s->avctx->hwaccel; - ret = export_stream_params_from_sei(s); - if (ret < 0) - return ret; - ret = set_side_data(s); if (ret < 0) goto fail; From patchwork Wed Jun 26 12:43:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 50162 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:ccd2:0:b0:482:c625:d099 with SMTP id q18csp406087vqv; Wed, 26 Jun 2024 05:44:30 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXZmHKfooCEHLXxCvlDhuDZbL/pP6CnyKzlHJE4xAXDvWeoIgKajIyOdsyo6PEPO7VrokxUbE1j82Lubu3qsqkYiiYXvX9fEBhY8w== X-Google-Smtp-Source: AGHT+IEKYNCJYcneQ1JNUPToi4xFKY0nMDIAGWatKFml2fh+pRiavPae1i69xM3onyKVmiOfbBPC X-Received: by 2002:a17:907:72d3:b0:a68:86b9:52e8 with SMTP id a640c23a62f3a-a7245c64ab2mr787987266b.68.1719405870139; Wed, 26 Jun 2024 05:44:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719405870; cv=none; d=google.com; s=arc-20160816; b=UQ2xpSMP3zrOX2KHyZ1ZUIgE8tI3FbBxCyo7mQA0AYMVfL8vS2rVXqkxtpm16dl/Dx Qu+2rnhcnOlYGX/Hxf5l39TTx0M0TAQaJGdX/KhxcD+nmpuWETJZexwWgp/cw34Nbmin Nzz/9bXC2UdKhb73wn/X3F3+A9fjWhKyt275Ih2XNvjw71GWbtfmV26+ZcfQwInaFflO dEySZBE1A/oHhuqNIzJmyaveqUNsY/FILYXzcoXMRtiG/mkyYqvKSNA+6yUHwmNoEkAi 9B/+h2aaCTQtPV0hzCIC1MkWWhTPK0g6YQCX6PlBo8vUW9/DdA1DLTDYIi5o5lndCZZM JRJQ== 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=F9X1y2iKr5EPAqikAxNAL1yooQgSDhq3JAm3ECDS29Y=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=k08Otqiop7e4CixCtQRY7o5eJU/2H1w36/03IyQtZ/tI/nKo9rZnom5/9t7J8SMd9j onRLVv0bYtEy/EAF2t1m5Kf6FRHRmyrnPi7l64OciVRh3CpVTytfJFKyIgcsRMi0Er4r KEM6nE0/h9EHL89QBJZAZ9PsgENegZUUn5kzc9LoQ7pkuIrnKMbHvgb2AdbGKwBJxKcr QG0kD3zNBAz8yKgUVRXqGk75kQvooJgASj4+ENUj9Cyc1TD/UigGY1mKqfmsdCtsk3TB CLMyLEkuUYCjipDbiD8lT96HMxyrqktEI/hWdPTCqjdR1YZNUmjDocCTpl9qrRsw27Xm LRlA==; 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=qaUjnavO; 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 a640c23a62f3a-a6fcf460e8bsi589164266b.172.2024.06.26.05.44.29; Wed, 26 Jun 2024 05:44:30 -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=qaUjnavO; 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 1778168D59F; Wed, 26 Jun 2024 15:43:55 +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 0044368D3C6 for ; Wed, 26 Jun 2024 15:43: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=qaUjnavO; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id F3ABB4DDB for ; Wed, 26 Jun 2024 14:43:42 +0200 (CEST) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id nbXFsUV2vv90 for ; Wed, 26 Jun 2024 14:43:42 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1719405820; bh=qHXZaDDzPETznnQedAlX7qBgKLjRvqiwmbsGQtH/W44=; h=From:To:Subject:Date:In-Reply-To:References:From; b=qaUjnavOJNkVMQomQSO6i8BRUWiOY0lcvbbxe2bf+do4SUDp1phZgwu6wqa4QdGpg JckEvRRgm7BSnbTb3eS5746UiuXrRg4HhwbhsCQWXWLAXSbzETPiUIbKkcB9c/WjWR sTfmfICJUatB2ldhwgp2IKXKe8L8NNrpG4JBiZk4S47whT5DmrsoQFLnLAskt86+gH gcC+5e/xrAUopMjAqkeP0wh0yW/fplKB63RDLLZcS9J1SjEarp4+hNvn+iBJMyyWuM 3UqB9hsKGG61hZFPxb/RacSzWCPbUR3eb977QHAJGFnpci0aRFNkKLpFJWLy7zjAUr gFB0K95uFZwTw== 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 CFE984D9C for ; Wed, 26 Jun 2024 14:43:39 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id B7F9E3A05C5 for ; Wed, 26 Jun 2024 14:43:39 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Wed, 26 Jun 2024 14:43:34 +0200 Message-ID: <20240626124337.14478-2-anton@khirnov.net> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240626124337.14478-1-anton@khirnov.net> References: <20240626124337.14478-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/5] lavc/hevcdec: do not call export_stream_params_from_sei() in update_thread_context() 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: qsUrPEUFnxmr It is redundant, since it only sets AVCodecContext fields that are already copied by the generic code. --- libavcodec/hevc/hevcdec.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libavcodec/hevc/hevcdec.c b/libavcodec/hevc/hevcdec.c index e80f2f28c7..4a62170073 100644 --- a/libavcodec/hevc/hevcdec.c +++ b/libavcodec/hevc/hevcdec.c @@ -3637,10 +3637,6 @@ static int hevc_update_thread_context(AVCodecContext *dst, s->sei.common.content_light = s0->sei.common.content_light; s->sei.common.aom_film_grain = s0->sei.common.aom_film_grain; - ret = export_stream_params_from_sei(s); - if (ret < 0) - return ret; - return 0; } #endif From patchwork Wed Jun 26 12:43:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 50160 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:ccd2:0:b0:482:c625:d099 with SMTP id q18csp405888vqv; Wed, 26 Jun 2024 05:44:08 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWFswRifnQmlPIG5WdAduhjIqZ5Zrz3FNXxHUwY8kIWXHV4VoBlTuupkcyFhBMQv4NUYEm7QAftahPeOoZtPPV15N4Ye8GTR0fbig== X-Google-Smtp-Source: AGHT+IGpgY/bCHeCkresdJKFj2OUgZ/H0fltcfZgeXqn8SC4K6eM/tPkzYZzPSplxNfJ8ispDQGq X-Received: by 2002:a50:9b42:0:b0:57c:672b:ca34 with SMTP id 4fb4d7f45d1cf-57d4bdcabacmr7359239a12.28.1719405848113; Wed, 26 Jun 2024 05:44:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719405848; cv=none; d=google.com; s=arc-20160816; b=yjoKsikMNcCID/2dfu3htdqWLr0n241tHrdyNAarRmJeHZ75+Y55rhONvU+YSGeoQa o+DZdnSK/JKUnsuuZe5YrIO3WKm7q2Sdyf6tjXnZJdpqd6HOv743eoI8MMPm8aaPx/t1 9oeoyxF7kmvBYGNo6DIkyj+e1ArZ2alWWSGQfTfDovDPuXzQcGv0jWZBOQWlUFHURrUA g/yPMNLGWJUsE0F4RBsNQv/duqzVhdYaKyM6dpP7N2/34G9IOrXBuHaAkk46xjbDnwrw LiLY67INw5JC+LTPpRnxa1rNZ6WWbodjJlWnBCIIavn8JoaKSRVPoBqEb1ENG5h63tgs VRzA== 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=PqB0ZtV7NpF0CMhUH0BL+3g0jr9VGBlf6FICDgFcQRI=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=HevFdwzqNmfaPTr0mbhrlFD4hOtMVM0gpwb1DhS2YA124LFw30sUSlurWEPp4jAECc NRNcS/p3VKl8ounDX67I+kf7L52tvuwJEBUsKDmMYCMHdtnA9viWEItyybHFxUfJIeZj R9rSuN+Q7nZUqrZaLXXVlEAIeqxCuxlOHVTXHRtVb7/UiRGQW5zumFDWzwEALuoZcG8+ fBbMEMy5wcD/Oi601G+9ugW9GuY3doj+2hxgtjhWbD0rP8/7TG2fsWKf0hcC96Vzpfx7 tnEvitZ3Flja1T4wVhhMwCWBfcH7zE3Dh6RBVX6LPhwB4+8EtfNr89hgUAuVve3qU8GC 4z1A==; 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="QEdB/qaO"; 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-57d30632bdesi5889684a12.79.2024.06.26.05.44.07; Wed, 26 Jun 2024 05:44:08 -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="QEdB/qaO"; 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 774E268D516; Wed, 26 Jun 2024 15:43:52 +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 00EFD68D3E3 for ; Wed, 26 Jun 2024 15:43: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=QEdB/qaO; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id 3A8EC4DE4 for ; Wed, 26 Jun 2024 14:43:42 +0200 (CEST) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id 9YZKw3XluO-n for ; Wed, 26 Jun 2024 14:43:41 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1719405821; bh=ba5DQlTj2RNsqNkP92cDxEL8C//I+25OZdgn1Ad1TO0=; h=From:To:Subject:Date:In-Reply-To:References:From; b=QEdB/qaOJgwlq5OtCBLFmE3fbPqFDP2vMZSFBBHReL7kpMHtna0FxwHoEmxUG7LVe Ux1/fOnYNdYIbeKXgZBqnJS0spyyK0qsjHBpSW/fi+C7lcslZGQC4ZIihFSJuO63DO 92SxTxLEBmR4nPltcOKF/MUNwGMKYPmg5LZBiXrvhCuAJ+p60PSSHsCEGd7s9V3nSD 7y6cn4GtAOPZJSWoSBjIPO8fwbmQrVLGKV0irJdF3Atq6js3yskyS5QkDup5LVASCd 50KdQEnCjZcLjwAgtKoP+OyHdIrL1iOKpy9DX1nDTTvTLbuZKhYg5npPerOiUZWfar ZeJgkxlRg1U0g== 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 D44624DDB for ; Wed, 26 Jun 2024 14:43:40 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id C3E353A083A for ; Wed, 26 Jun 2024 14:43:39 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Wed, 26 Jun 2024 14:43:35 +0200 Message-ID: <20240626124337.14478-3-anton@khirnov.net> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240626124337.14478-1-anton@khirnov.net> References: <20240626124337.14478-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/5] lavc/hevcdec: do not pass a pixel format to set_sps() 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: R6gd5+aWp/aw It is merely copied to AVCodecContext.pix_fmt, which serves no useful purpose. set_sps() is called from two places: * when a new SPS becomes active - then the pixel format is overridden immediately after the set_sps() call by the result from ff_get_format(); * when a new SPS is propagated across frame threads - then the AVCodecContext value is already set to the same value by the generic code. --- libavcodec/hevc/hevcdec.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/libavcodec/hevc/hevcdec.c b/libavcodec/hevc/hevcdec.c index 4a62170073..5136bb53d9 100644 --- a/libavcodec/hevc/hevcdec.c +++ b/libavcodec/hevc/hevcdec.c @@ -526,8 +526,7 @@ static enum AVPixelFormat get_format(HEVCContext *s, const HEVCSPS *sps) return ff_get_format(s->avctx, pix_fmts); } -static int set_sps(HEVCContext *s, const HEVCSPS *sps, - enum AVPixelFormat pix_fmt) +static int set_sps(HEVCContext *s, const HEVCSPS *sps) { int ret, i; @@ -544,8 +543,6 @@ static int set_sps(HEVCContext *s, const HEVCSPS *sps, export_stream_params(s, sps); - s->avctx->pix_fmt = pix_fmt; - ff_hevc_pred_init(&s->hpc, sps->bit_depth); ff_hevc_dsp_init (&s->hevcdsp, sps->bit_depth); ff_videodsp_init (&s->vdsp, sps->bit_depth); @@ -2918,7 +2915,7 @@ static int hevc_frame_start(HEVCContext *s) ff_hevc_clear_refs(s); - ret = set_sps(s, sps, sps->pix_fmt); + ret = set_sps(s, sps); if (ret < 0) return ret; @@ -3592,7 +3589,7 @@ static int hevc_update_thread_context(AVCodecContext *dst, ff_refstruct_unref(&s->pps); if (s->ps.sps != s0->ps.sps) - if ((ret = set_sps(s, s0->ps.sps, src->pix_fmt)) < 0) + if ((ret = set_sps(s, s0->ps.sps)) < 0) return ret; s->seq_decode = s0->seq_decode; From patchwork Wed Jun 26 12:43:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 50159 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:ccd2:0:b0:482:c625:d099 with SMTP id q18csp405791vqv; Wed, 26 Jun 2024 05:43:56 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXlcP9WNyDv9kpLAvp5jRw0RJHGXHIgOD5M7w/+4GU01xk9dJW/sC+ymHdZYHhqYCFUafW7sjyGGd1sSxAxNq5JVaWP0tQhsOfy5Q== X-Google-Smtp-Source: AGHT+IHE79QKxi2DekILqU5LsmlYWFfGicrYFWH+a1ROC4pIbBAyj15l8F/SZrcuX9EFl/jQrzmu X-Received: by 2002:a17:906:9c94:b0:a72:8320:e75f with SMTP id a640c23a62f3a-a728320f193mr222768766b.47.1719405836030; Wed, 26 Jun 2024 05:43:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719405836; cv=none; d=google.com; s=arc-20160816; b=VGV5ejKGioshSfZxffkAQNjgO77SYm1tBYqsLhIzHLytl89gLlORCdP/i67tzokoM7 8srwEtrzoDDdm5opSKJFWzgGOQnleZxS10WDlcRnJPvaLzkHnnFkH7wBa63yYcJKl4Sh eULo1URpDdKccaYTP62UdtNyFK7ybduGBIHRXo8cn4QIkXVzK3zlM2v0JdE/e3Oujvl1 FXML0zRvEEABV6VCLU0pZLGoL6nrrBt7CWsC9d66DSu/cAPlwIV6tE5ny/xjLTRlISO4 88veUnAjJb3kploVSaBIBx26DypVQnPHUH+RnRUuLXVDCupC8iezg/wVezv1nCbZGE6D PgdA== 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=diTEh39o58nyWwa9keo5Ip8F/okgZjxfYAXauOotRcU=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=A7V8uyEgEPZTdEU4AgzBT4JrZOh8y+lBRM2VTGcPpeCp4C3orS83qrCCxk00z0oBHn 9zIE4DbIvGezEE2QiWbGFdTTqWX7a8PnUcvN8R0Vvge/mKaL1vKtukAKa22ulrJ0CLuf 2O2Qh+WHCmKkUriIy4hK6YKDlQB2pIpuXgVZIo1wAdZRHBgIeYQOeIu78AFEQrbQ2sBb uhxLXcfBCrQ/h5Lu5LU0++iEUcOQmfOffPI7M+Vb1UKrnhzGIPnijfjrLVBpvX4PdlIx bDAFrmF+2eqpN1eChk1mlVO2YJqYi89gyd8VEy/BBEaRtBAQkMPlIb4NF+PxV4i9qSzG GKwg==; 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=QVWyI3FX; 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 a640c23a62f3a-a7291faef11si19935366b.844.2024.06.26.05.43.55; Wed, 26 Jun 2024 05:43: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; dkim=neutral (body hash did not verify) header.i=@khirnov.net header.s=mail header.b=QVWyI3FX; 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 2A15868D3C6; Wed, 26 Jun 2024 15:43:51 +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 E2A4B68C41D for ; Wed, 26 Jun 2024 15:43: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=QVWyI3FX; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id 1CB824DE2 for ; Wed, 26 Jun 2024 14:43:42 +0200 (CEST) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id fgj15y7mCBNQ for ; Wed, 26 Jun 2024 14:43:41 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1719405820; bh=6UTU3UgBb5Z4yEmrdoTT7ZmGhgZJra3IJY8FpYCS46Q=; h=From:To:Subject:Date:In-Reply-To:References:From; b=QVWyI3FXzJ6K1+VzWSuL04iGhpjDBTh8aVPI6vnGQKSRlnPefeQGe+lst2TJ2AvA8 86TzXjHjCBo4l5+kOAsADO1r5aORbBQeTAGmO1JfUgN2S4NcU7wjApDdH8SS8n6D08 TXHt7CdJr2g+1Ytjf4GyJ1vcvbNN2ZBBt/yAvXUwDkkVTqoB941yYQEQ2UsXzO+JJi 1zkdhN47CygE1tRJkOGTCbk2+ZAFXORmAoxK6nhaH78FpyYtsFNOAQu48+FFyE18+T whnEsDYzQlPeEbu7ywNrroHdDziBJBRLzJqr8gsAJ+roKHq9UBUDr/4BvXMgHep42p 9HrlZ5wy3mE8w== 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 81EC84DBC for ; Wed, 26 Jun 2024 14:43:40 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id D07D33A083F for ; Wed, 26 Jun 2024 14:43:39 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Wed, 26 Jun 2024 14:43:36 +0200 Message-ID: <20240626124337.14478-4-anton@khirnov.net> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240626124337.14478-1-anton@khirnov.net> References: <20240626124337.14478-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/5] lavc/hevcdec: move export_stream_params() from set_sps() to hevc_frame_start() 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: Rvq0XiMuyXjJ The only other caller of set_sps() --- hevc_update_thread_context() --- does not need to call export_stream_params(), since it only updates AVCodecContext fields that have already been updated by generic code. --- libavcodec/hevc/hevcdec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/hevc/hevcdec.c b/libavcodec/hevc/hevcdec.c index 5136bb53d9..01d32086f2 100644 --- a/libavcodec/hevc/hevcdec.c +++ b/libavcodec/hevc/hevcdec.c @@ -541,8 +541,6 @@ static int set_sps(HEVCContext *s, const HEVCSPS *sps) if (ret < 0) goto fail; - export_stream_params(s, sps); - ff_hevc_pred_init(&s->hpc, sps->bit_depth); ff_hevc_dsp_init (&s->hevcdsp, sps->bit_depth); ff_videodsp_init (&s->vdsp, sps->bit_depth); @@ -2919,6 +2917,8 @@ static int hevc_frame_start(HEVCContext *s) if (ret < 0) return ret; + export_stream_params(s, sps); + pix_fmt = get_format(s, sps); if (pix_fmt < 0) return pix_fmt; From patchwork Wed Jun 26 12:43:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 50163 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:ccd2:0:b0:482:c625:d099 with SMTP id q18csp417209vqv; Wed, 26 Jun 2024 06:02:55 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV+qZbe3Yn03ASXYQ0rb1E9wo4cKRN3hmBgSTSAIywFYbJXB1wPUz8BLqdpxWfiDLAHyZzjRxa/vyizb/0380k3vyYZ0RGh/prS3A== X-Google-Smtp-Source: AGHT+IHVGXhtrUG6Z40qeb6YgThWEJQHISenpIE4paeAGqmIO9bEwtQv3lbq0bp5b+HhYVOOLmsu X-Received: by 2002:ac2:5ed0:0:b0:52c:dc20:64a with SMTP id 2adb3069b0e04-52ce1835910mr7963211e87.37.1719406974637; Wed, 26 Jun 2024 06:02:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719406974; cv=none; d=google.com; s=arc-20160816; b=iif1m5riWg3tGIzNNSJnOJKfN+XN5671w0QiQFXZQXSJbHYTXGiITrWSUDXAPIPLcO T51xV/GE+9fSJCNOBxeyfodWUuDNdvQNyq2grlJMYtyWpRHHqnpF3M3VDH5Us6yrbk6R Ym3SDlQGrr7YOdLfzuIDOb9AvorJJ7b8ZYWM+b2DOL4qxaPqLUUcJU29nx2jzXdRuS9w 7cF93BT+1MJv5bMeiKT3dblQR3IYw+a30xzmfimesjDGL2tQhUYY/JIex6IzQNy0Ns3W NhfLIOl0k83glCCUMLq/Oq+1tqHaz64LdgoSRrWPWzW76fmMPb06JP3CA+pQY61wQQRY dNKg== 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=B8fy7hScVtPLs/NpC2Tf4qXqinQFirEZS87O/k1RHRY=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=WpJXDZ1zHMi152zPEzZIwThVmumlwDDua1qQmCC9wzrjxsOWloMx0tAYr1qUbyxxwD Kt53hlTjJoOmsRUgJyvkk9VBCmXnpIwGCO2iJhSqzMYWI/4dEV9flyQDSiHjGKtVznjW DovyJXmAnzyNqOLKSrZmBy7mGdnnv6D8YTcnnETM8/cYqy3PS2Ks1corwqre4h7X+yXg xX45Zb7IX3OmrlMiNnhU4nR9lsgB4he3BZzsao7c7CjSB87//y3J2WHoXoYX8nSNbzl1 I6kGTb6VUoE6QxVfmmbhAhIPPlVB+aOpkiBt7Z48Gi5v8oR6DEwH5VIFpxYZfkI/OU9W mfnA==; 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=gw5i0ytO; 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 a640c23a62f3a-a726e50eb56si193032866b.480.2024.06.26.06.02.48; Wed, 26 Jun 2024 06:02:54 -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=gw5i0ytO; 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 3B03168D5B1; Wed, 26 Jun 2024 15:43:56 +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 E996B68D321 for ; Wed, 26 Jun 2024 15:43: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=gw5i0ytO; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id 5DBD14D9C for ; Wed, 26 Jun 2024 14:43:43 +0200 (CEST) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id Q_Qor08aZ5-u for ; Wed, 26 Jun 2024 14:43:43 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1719405821; bh=XN4EdyiRnq/lKi6crxVjf3cFSFg8fiU1mFqW088z2Bk=; h=From:To:Subject:Date:In-Reply-To:References:From; b=gw5i0ytOuYjSwHyc6jdTI3zfG+wAXmleJeJJTWceh7jbOHAy9gKnCZMI3BHHurDH3 4bQM+kk5VYdk/y46X/x+ik4KnV0nobqqZ3v8szYrDr1+BgWCTrtX2N7TSMEjfWnUTI iPjlLL8Lb01LWMUiGnaikAzMcwlEWvcPGK5/upI4NJ8TiUZDNc/eEMSF8yKSEmLr+j Tb84fJCXyy4mexlCUA/TSh9VpyF0bo8LXHmjj0frpLUF+D8X7CBO/IC1w4yUPhQGoH 5wmat3biGlJ6PMA1fq1xs7Wp4de6erjzPwx3wOqB57ba9REJdnVlANhWWM6KKqPZ/b L1QTAhCcSTodw== 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 CF06E4DC2 for ; Wed, 26 Jun 2024 14:43:40 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id DD0E73A09EE for ; Wed, 26 Jun 2024 14:43:39 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Wed, 26 Jun 2024 14:43:37 +0200 Message-ID: <20240626124337.14478-5-anton@khirnov.net> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240626124337.14478-1-anton@khirnov.net> References: <20240626124337.14478-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 5/5] lavc/hevcdec: improve check for PPS changing between slices 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: LULyNZfKLsNF Compare actual PPS objects rather than just PPS ID, as the former might change while the latter stays the same. Reported-by: Michael Niedermayer --- libavcodec/hevc/hevcdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/hevc/hevcdec.c b/libavcodec/hevc/hevcdec.c index 01d32086f2..fd143cddab 100644 --- a/libavcodec/hevc/hevcdec.c +++ b/libavcodec/hevc/hevcdec.c @@ -603,7 +603,7 @@ static int hls_slice_header(SliceHeader *sh, const HEVCContext *s, GetBitContext av_log(s->avctx, AV_LOG_ERROR, "PPS id out of range: %d\n", pps_id); return AVERROR_INVALIDDATA; } - if (!sh->first_slice_in_pic_flag && pps_id != sh->pps_id) { + if (!sh->first_slice_in_pic_flag && s->ps.pps_list[pps_id] != s->pps) { av_log(s->avctx, AV_LOG_ERROR, "PPS changed between slices.\n"); return AVERROR_INVALIDDATA; }