From patchwork Fri Aug 30 11:20:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hendrik Leppkes X-Patchwork-Id: 51250 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:612c:4027:b0:48e:c0f8:d0de with SMTP id ky39csp559471vqb; Fri, 30 Aug 2024 10:40:11 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUodqSj0HedqrpaBVidLgJypeftP/0W6X0z6HGhto3gVpEbxqRhXVtBPwVnjmdHLMHlpDejmkGyuCqLRI8P2uta@gmail.com X-Google-Smtp-Source: AGHT+IFKzrVoL77pYhM2DwKRkt/xFxpfQcfMxXV97FpUn4mhPCnCPwLFmDZSOhJlSt3LbXOJjM0v X-Received: by 2002:a05:651c:19a6:b0:2ec:637a:c212 with SMTP id 38308e7fff4ca-2f610520a6cmr48854041fa.39.1725039610831; Fri, 30 Aug 2024 10:40:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1725039610; cv=none; d=google.com; s=arc-20240605; b=bFGspEIrFSH9EoO1s2v9jb4z9lYQFRGY7OlO5/6crN6MpLBUbi/0pGWsc1nglBX11N 5JkjXUCB9qOo2JmAxcqNh+eVSKozRulBgr3rH011iYOqoZz15bFY4R93mJVR5MsKCRcE YApgvtTU8Z0wcjTEQd/pKqZGWyUsporBLNVrN1HmUufcZ8MTRulJqydJ/zH0EeT4oyAD LDGfcHMOFHMiuveJIOyPculBuLWBaiP362oAZYzTan9/Wu4m2Ds8iOvHqeyjB27Id6hC ue1Ohu1Q/TiflyPqa+eV+qlE408Vlbt0qkyUZUvmvbamLJLKxxmEo12B6IfEcZjhathQ 0aCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:content-transfer-encoding:cc: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=4evkJa69N1w8SgaBmOnKQusFOLFbZFGnf+mayN3VKjQ=; fh=qodK2FA6DnZouia+N5s4CkBzYDETrJXzq86cBF299gs=; b=GK5zgaeeJR0ZiuEfrI80gSaCsXsMVeyo2nEGIZvuwG+CX+WiTNFaD3a1HFM5Yrd3x5 a1Fon3QFbg1JtbT9o3KoW6IWDl7Q1VvjDnWlQMeaJo2NEktImYvO/XiA5GY6LGiHARii X/FvAIIt+IStZ8NFOSMSVRJqBFiQ/slZ4BbP7NsLx5u293j0+hvxysx60KLo3IU2D+SV sxAqsnTJ/Xt5x2NPY/f7V1a1EbcyIKS/Dcv/8r7AlJJ9qxIgtLzyNuL6hYEUPTGobXO7 ZSB11H60hxa49S9F7XhLdk+/8okvY84jD3p0FLtUDj3LBqn2M/D5M9BhO/2PfXh3+Ctf tVPg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=CF7aLL05; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com; dara=fail header.i=@gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 38308e7fff4ca-2f614ecdfb4si12674851fa.135.2024.08.30.10.40.10; Fri, 30 Aug 2024 10:40:10 -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=@gmail.com header.s=20230601 header.b=CF7aLL05; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com; dara=fail header.i=@gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7A31168D7E0; Fri, 30 Aug 2024 14:20:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f45.google.com (mail-ej1-f45.google.com [209.85.218.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 15D7B68DC3A for ; Fri, 30 Aug 2024 14:20:48 +0300 (EEST) Received: by mail-ej1-f45.google.com with SMTP id a640c23a62f3a-a8682bb5e79so212974366b.2 for ; Fri, 30 Aug 2024 04:20:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1725016847; x=1725621647; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=CTFhiFcKOKdt1OMpVIi28soEfDqmWT39HWo5NKziFHo=; b=CF7aLL05IaMmskMn85JUsnwAjFg5LtRMtwmav/Dbz6EghciF8g4Rzoag2mIC8xf20Y MdjARNQrRrXQqrVxlklTBSqAK1+BCt1hfAFjg3Th3tbDME/dfmdHbzvnypX8mcAuOLCb kSQRKZHJUoTyv4dPdQ8oONW5GQ7J5dZzT5OC6meutnvhy35v3ZS/ibb9Uixi8baBJjhe jU/zcwLK+hfOPCMmZgJqgnNrebHgESaoocJChZOKP7b4VNy/XkzR8xAljFdd+UHtWzTF xdE5FQR/keLWzcmJagruSw2MQ0lkZO3b2kwlceXrDTLOP7NZcLxHHmWyJ+sL7V1O/b49 znxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725016847; x=1725621647; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=CTFhiFcKOKdt1OMpVIi28soEfDqmWT39HWo5NKziFHo=; b=kOAEqPUPoVCp7voDRo9BHzu5J+fPUhKdNkGEitaKPo16Enkp3vsBOoZFGQchL7wC8I r67GiIQlvW9f2+3r+eaZ15INPJcVdJp8LEWAUOrp6rFDpm8D/88jHvQS9EUETX2Ka2kd FEtg6U3QJtBUyNvSZ+WlYPahR+GJJyf3V2jvkOYVtbcKmk+oAQCAiO7ghtIQJOKDOUxq +71RKjD3YhrDTClIV3GqQBoRb++oFt4Fjd/9PxtvDq/uYVNedIb+mnOA28j7sCRXhfsa fvZku0ljY664ebm8cyZulgKTdLtJPwbvQH9v5KJXBA9SKiMCwO9x/pxFMnk8SObROoXB /d5w== X-Gm-Message-State: AOJu0YxJ+IOhgeA6DpboJAv/VtiT7ph4yyYQtcQH65MWJciexXoto0rF IS0ZpDpiGpL7ZJDkQ75v9pd8AdiXrG0s0bMHH50oCU0uXVpXDyDMY8+a5g== X-Received: by 2002:a17:907:3f9c:b0:a77:eb34:3b4e with SMTP id a640c23a62f3a-a897f775b9bmr492598966b.7.1725016846640; Fri, 30 Aug 2024 04:20:46 -0700 (PDT) Received: from localhost.localdomain (i3ED6FEEF.versanet.de. [62.214.254.239]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a898900f62fsm204886566b.63.2024.08.30.04.20.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Aug 2024 04:20:46 -0700 (PDT) From: Hendrik Leppkes To: ffmpeg-devel@ffmpeg.org Date: Fri, 30 Aug 2024 13:20:26 +0200 Message-ID: <20240830112033.227-1-h.leppkes@gmail.com> X-Mailer: git-send-email 2.42.0.windows.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] hevc/sei: return INVALIDDATA when a referenced SPS is not available 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 Cc: Hendrik Leppkes Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: HLVxhPS/5FiN The code previously returned ENOMEM, despite this not being an allocation problem, but rather a bitstream problem referring to data not currently available. Fixes playback of such streams, as it allows further processing of NAL units after skipping the broken SEI NAL. --- libavcodec/hevc/sei.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/hevc/sei.c b/libavcodec/hevc/sei.c index e39ac0c38a..b55ba71a8d 100644 --- a/libavcodec/hevc/sei.c +++ b/libavcodec/hevc/sei.c @@ -56,7 +56,7 @@ static int decode_nal_sei_pic_timing(HEVCSEI *s, GetBitContext *gb, const HEVCSPS *sps = ps->sps_list[s->active_seq_parameter_set_id]; if (!sps) - return(AVERROR(ENOMEM)); + return AVERROR_INVALIDDATA; if (sps->vui.frame_field_info_present_flag) { int pic_struct = get_bits(gb, 4);