From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 169FE48337 for ; Wed, 26 Jun 2024 15:46:04 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EA22E68D398; Wed, 26 Jun 2024 18:46:01 +0300 (EEST) Received: from sender21-op-o13.zoho.eu (sender21-op-o13.zoho.eu [185.172.199.227]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1FD4F6898CB for ; Wed, 26 Jun 2024 18:45:55 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; t=1719416750; cv=none; d=zohomail.eu; s=zohoarc; b=UGjdqmb2Dl/q2tT5vBBfvoIlRdY48esl3OZOiNJaBMobRwTIlpTbZ/yRjAYs14t+lhDQKVJSpW2yzO3DvK/AD2WW/MRrnVoWt9hPpRQd87taWnR1H7Jgdn+bwumga0Mhxs+NkK19JB879zO1MggWxs2stOMsMnsB33zb7gIbvlU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.eu; s=zohoarc; t=1719416750; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=hFIceNhdfdzfGbMpj9EZ+YkLjeYSeygQP/LMYeDU/Mw=; b=G4kb3xqU1IbTBHjYUBamfLoKqbBSkL1TKlyJdBzh4HtOQpj6r8nOFHI2BIrca75DOWQWQjPono0afLhPoTh73GocBwOWzCjQIsG2mB4Ar1eyLjKjDYOtr51mv/4iPKPCsx2Dgohle8FYsUD2jAvxPWBFN8rVyrQ7LJICzcwC1kw= ARC-Authentication-Results: i=1; mx.zohomail.eu; dkim=pass header.i=frankplowman.com; spf=pass smtp.mailfrom=post@frankplowman.com; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1719416750; s=zmail; d=frankplowman.com; i=post@frankplowman.com; h=Message-ID:Date:Date:MIME-Version:Subject:Subject:To:To:References:From:From:In-Reply-To:Content-Type:Content-Transfer-Encoding:Message-Id:Reply-To:Cc; bh=hFIceNhdfdzfGbMpj9EZ+YkLjeYSeygQP/LMYeDU/Mw=; b=bp3EzPDLJit9L+1ht0/Ev0sfYAQVhjtwrm6orwPvWQzHMcEM03J61AlTInLwdMIv lTL6v4zVFNFAUMW7m7rKq5HI2Mi4aRSN8NU2Eeur3VaNRluhdOExpCMfC8V8a44uyDY LGxIUbHT2oWt3OZSEZUfymKFoAkabnO/9+bYOLdM= Received: by mx.zoho.eu with SMTPS id 1719416748499703.428083777616; Wed, 26 Jun 2024 17:45:48 +0200 (CEST) Message-ID: Date: Wed, 26 Jun 2024 16:45:47 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-GB To: ffmpeg-devel@ffmpeg.org References: <20240626124337.14478-1-anton@khirnov.net> <20240626124337.14478-5-anton@khirnov.net> From: Frank Plowman In-Reply-To: <20240626124337.14478-5-anton@khirnov.net> X-ZohoMailClient: External Subject: Re: [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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On 26/06/2024 13:43, Anton Khirnov wrote: > 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; > } LGTM. -- Frank _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".