From patchwork Fri Feb 23 11:53:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Gaullier X-Patchwork-Id: 46454 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:26a3:b0:19e:cdac:8cce with SMTP id h35csp904556pze; Fri, 23 Feb 2024 03:54:10 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCVBFQjMZOMYSB/aFLM6u4mb8LtX/PLUsxzZFB+kCPMZ/uzSZIRxeCDw1J4OPgtXS36sLSGkkRHLFzUSo8soWHH0d5YZv+owMa+Ygw== X-Google-Smtp-Source: AGHT+IFnVQu9YqTHKjn/pzCXA45rUhNsdTE0zBzd2zJc0Yo8FYkJc01Ok6xyMvGhuiZcYf1bXawR X-Received: by 2002:a17:906:2a8c:b0:a3e:5ae8:5777 with SMTP id l12-20020a1709062a8c00b00a3e5ae85777mr1024223eje.44.1708689249853; Fri, 23 Feb 2024 03:54:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1708689249; cv=none; d=google.com; s=arc-20160816; b=YPQzkRWRvwCg9oFQJlLSVL2x4OvGPonpsxOo9i5VGag9nSqg640IVZdMvACehr3ln1 nZYbXjFuh+YUDhkweH3BBNa9Bs0o2JHUNN26QLDgxn+RAccPJI/REkDq/sbfUKdHMG78 fK09Q0Gu2f2xj3nK+HfJ9zCsnXpcTtqPsfxMx6L0r1Qp03n3X4+dw60zdVVu4bP234sK S40RYEbORLyA8IHVtgUbtstKrq9VDIqPkYE+Vcl+EYOUVn+1gDKKWMBdTNwGsoJdc+oC Q9l8zf9o0G/amBnUL8aPsGABFfNYUQce8gSD5/3SUBDctITLLcsvteAZKHjpq3FBQ4Cf nsuQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; 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 :delivered-to; bh=e70kC0noSBzbJvkb6+Ol6gym5IcdkBhIm+BijVHzWf0=; fh=zgMS+X4RExv2k7fU8QdWClnqVJdqO/9UbUuBS5xxJDs=; b=aQTy2uSOr93Ut2JpgyqvPS0Ne5847zHnq8C0v02i5qL/o379DB6UTCtclr3z0cXKt5 /Dkf4/O7qdbODCzIbfe3/kgdft8mqHhnJfrzbDW08wpANJppI2G2qTIlq7DiIdOAHdIu Ol71/nVtrPY2enO5655ALZGc8bkvu7qb0GNWgfdQrmhrfGmFWXjH0+hcvDG82Wg3DGG+ sXrTOV6Ilrv8K+fgpNKpF81pmu4nRzSGNTrMdWk40GRHAB7lS2kKVpwwl4qzZAOmnzZz N4DXZd3eWhuwCuus7033w4iudRryRmH9WYfudxSq+fmrsvRWsWNBSr3SPhRIbXXdVkiO /i7A==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; 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 cr13-20020a170906d54d00b00a3f11d50d9bsi2957532ejc.914.2024.02.23.03.54.09; Fri, 23 Feb 2024 03:54:09 -0800 (PST) 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; 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 AECA068C5C8; Fri, 23 Feb 2024 13:54:05 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from srv-infra-1.infra.inf.glb.tvvideoms.com (www.inf.tvvideoms.com [213.205.126.156]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BA2ED68C462 for ; Fri, 23 Feb 2024 13:53:58 +0200 (EET) Received: from cji.paris (unknown [172.16.3.159]) by srv-infra-1.infra.inf.glb.tvvideoms.com (Postfix) with ESMTP id 7037E2070B; Fri, 23 Feb 2024 11:53:56 +0000 (UTC) From: Nicolas Gaullier To: ffmpeg-devel@ffmpeg.org Date: Fri, 23 Feb 2024 12:53:54 +0100 Message-Id: <20240223115354.367881-1-nicolas.gaullier@cji.paris> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] avcodec/h264_parser: fix start of packet for some broken streams 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: Nicolas Gaullier Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: /IeWrNvjjPem --- libavcodec/h264_parser.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/libavcodec/h264_parser.c b/libavcodec/h264_parser.c index 94cfbc481e..6b721ec253 100644 --- a/libavcodec/h264_parser.c +++ b/libavcodec/h264_parser.c @@ -124,7 +124,16 @@ static int h264_find_frame_end(H264ParseContext *p, const uint8_t *buf, if (nalu_type == H264_NAL_SEI || nalu_type == H264_NAL_SPS || nalu_type == H264_NAL_PPS || nalu_type == H264_NAL_AUD) { if (pc->frame_start_found) { - i++; + /* Some streams in the wild are missing the zero_byte at the NAL_AUD: + * it is following just afterwards. + * To avoid any accidental borrowing of a byte in the previous frame + * (which would return a negative index and indicate that fetch_timestamps + * has to get the pts from the previous frame), + * better have the start of packet strictly aligned. + * To make it a more general rule, just test the following three bytes are null. + */ + i += 1 + (!p->is_avc && state == 5 && i == 3 && nalu_type == H264_NAL_AUD && + buf_size >= 9 && !AV_RB24(buf + 5)); goto found; } } else if (nalu_type == H264_NAL_SLICE || nalu_type == H264_NAL_DPA ||