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 A152240BE6 for ; Tue, 28 Dec 2021 22:02:08 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 13E1C68AF00; Wed, 29 Dec 2021 00:02:07 +0200 (EET) Received: from mail-yb1-f177.google.com (mail-yb1-f177.google.com [209.85.219.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 86E7868AE57 for ; Wed, 29 Dec 2021 00:02:00 +0200 (EET) Received: by mail-yb1-f177.google.com with SMTP id d1so36971204ybh.6 for ; Tue, 28 Dec 2021 14:02:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to; bh=xK++JTOn5UYGcv47q9zlYZQqklokrst0vCSoMghqz1Q=; b=YZc4ftwSZ/5MMYGqrQ1qLWY4dt4VyhpGJqM6zLzq7u1vB7EKSARApotts8QuFgyy+i bydFuvy/p1lGuTTrOlIo7vJlmr+nKa0u9RgNUfWbFnx3+fFK6SukKKgDVOWnxfLBWrpa rImF8lAsRgmuuWkpsJU4TDur65eZ+ETxRzg0qM0CBbxbkuLdUiiK76w71lgsRun7QrYL f1bu9XY3fewIjOfYV3g65lwE7NRI1nkGbj0U41RHRQt2YMZqc51Y1LQE4qXhowtQeMGq o7I4Tuqls4WH5Y0ACCOkFJMYd7R4qEzlA5jP0eZ9angueKnoO3AD+hJLdwKpiWOeRrW6 LgYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to; bh=xK++JTOn5UYGcv47q9zlYZQqklokrst0vCSoMghqz1Q=; b=p3qlvf1rTxtixOIr3gMXFLw7iicMax7IVPNwYqp/OapF14qlX+6KGFzsephs0dk7s0 WEXC5rxlBuC3Ri6cAvWaRmLa+3Hx1v5BpgS3haWux9DASq8xb8nZVkN/X+eSF6zgDYp+ 3muby091aQKRg0vcVUCtSENyr63huVsfe0bG/OrIfgO9L87U0MaRS4rbfA6BL0hdgU4H ff8SY5YK99ETQFOyPHVwX8s1o3WxLg8C9yavXK0T+LdEyxD54heEy65G0PoM1EpgfYDq I4AZU/yTHogWfXzX1VjW7DPny+UhEo/Fxgl31GR1UkUW7jOw4H3M19qevyRtDmBFZrkQ lbYw== X-Gm-Message-State: AOAM530uHhZtJi7J6YmewIcl6yE9IcjL8BesZjqQ9Q6j2R2HaYOozWNy j33bEXCTQ9Rv62ggI/58Yu5Y6kaKG86qsCsabyt0x+uE X-Google-Smtp-Source: ABdhPJy9BlnH3RNPR+hkRBSAHBsgDELqSQtTAR7YNPNn8CKYLL/4nsBs1JeUUcSeAMWyG+dRoyg+zNpSEP/Mt87hsD8= X-Received: by 2002:a05:6902:110d:: with SMTP id o13mr31161272ybu.715.1640728918322; Tue, 28 Dec 2021 14:01:58 -0800 (PST) MIME-Version: 1.0 References: <20211228134929.1164-1-h.leppkes@gmail.com> In-Reply-To: From: Hendrik Leppkes Date: Tue, 28 Dec 2021 23:01:45 +0100 Message-ID: To: FFmpeg development discussions and patches Subject: Re: [FFmpeg-devel] [PATCH] hevcdec: skip slices with missing PPS instead of skipping the entire packet 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 Tue, Dec 28, 2021 at 3:26 PM James Almer wrote: > > On 12/28/2021 10:49 AM, Hendrik Leppkes wrote: > > Aborting decoding of the entire packet on a missing PPS can result in > > missing the actual PPS on streams with badly ordered NALs, where the > > SPS/PPS/VPS are stitched to the back of the previous frame, instead of > > the beginning of the next frame. > > > > Instead, skip the undecodable slice, and let the decoder process further > > NALs in the same packet. > > --- > > libavcodec/hevcdec.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c > > index 3aa70e2245..c2451d682e 100644 > > --- a/libavcodec/hevcdec.c > > +++ b/libavcodec/hevcdec.c > > @@ -575,7 +575,7 @@ static int hls_slice_header(HEVCContext *s) > > sh->pps_id = get_ue_golomb_long(gb); > > if (sh->pps_id >= HEVC_MAX_PPS_COUNT || !s->ps.pps_list[sh->pps_id]) { > > av_log(s->avctx, AV_LOG_ERROR, "PPS id out of range: %d\n", sh->pps_id); > > - return AVERROR_INVALIDDATA; > > + return 1; // skip slice with missing PPS > > The decoder should IMO also set the output frame's decode_error_flags to > FF_DECODE_ERROR_DECODE_SLICES in this scenario. > There is a variety of error conditions that can lead to a slice being skipped, not just this one. I can potentially add it here, but it won't be a very exhaustive flag. If its also the first slice, the frame will fail to decode entirely as well, although the point primarily here is to allow parsing of non-image NALs. - Hendrik _______________________________________________ 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".