From patchwork Tue Mar 26 15:09:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Gaullier X-Patchwork-Id: 47493 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9f96:b0:1a3:b6bb:3029 with SMTP id mm22csp17341pzb; Tue, 26 Mar 2024 08:10:18 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVnz/77QticMkRxCCxceXiToIfLLfoM3oBcLM7hLniEMYMafSqhC0CIqI93QhA11vOXktrCNiX4QxGoEySU4a4j47lXptqpLCK3yA== X-Google-Smtp-Source: AGHT+IHdRMdhDgN5rZb+7J8qrbT8cC+yjNw0WBDxQajhRVCqt3fV1607HeduyW0t4D5ENAyDj3bd X-Received: by 2002:a17:906:830a:b0:a4d:fbde:ce2c with SMTP id j10-20020a170906830a00b00a4dfbdece2cmr331213ejx.3.1711465817944; Tue, 26 Mar 2024 08:10:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1711465817; cv=none; d=google.com; s=arc-20160816; b=dl/RI4//8/eSsgINNsiOyAksUntdNHYiT9mqH2Sh001c82/KiC5eGnciQRr2tvUW4A qqSqku3fX+UOA/Uo9XHa4KfQ55Y8JbEJmLG/+2FrBtWmXcRRzLIUywZKWVy9hiXxLwV4 BAj18UtrQIeT9O1CmWQtHLR2lfZfPp6ZrnIclT+D2aPwzIi6niF8ediaeDQT5Qt/Ia2w LZ/vg9SBpLTT+1inu6fRGo9LD2Kcj9LH70MyW4k40W+eK5lEU1Z2hNfcvelqUNgDKUqW rQLGdEde9fQBDP8fkh4DROI/vN4AbjweRl+YEB8agkK19AKbePDbFS6G/5AS8VM0JARN pJzg== 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:references:in-reply-to :message-id:date:to:from:delivered-to; bh=e70kC0noSBzbJvkb6+Ol6gym5IcdkBhIm+BijVHzWf0=; fh=zgMS+X4RExv2k7fU8QdWClnqVJdqO/9UbUuBS5xxJDs=; b=XCEeUNP0OBIrV8JkmM4893c/sadSrnk6gIqcHWehdLvb9dKnQ2EM5dm0XWuO2KznNF Rp8qV7Sy90KpM3lPiB/uaeqQpeO5OBVVExs8BchD06SWg3CD1GKUTFrYez8deZJWyCai CPFOnl2jvQyjZnZQf2Apk+Gst6ijOB1VGIRQeA3IkEs7zq1VjZBRcKFKv1896VY3HE+W 9DySAmoVObWtfGwBtkXRkssg98UAOo5QNpdzYaY/Db1/jMSw3mYtiTN0YUtCZ5SYJq2X LndcvFH3Aqah7USz/17cbat9xCFGaIBez3nPSIKfxpQenajEjgbRguHSGE7MXtlqvdxN PBHA==; 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 g3-20020a170906394300b00a4df37e345bsi738785eje.626.2024.03.26.08.10.16; Tue, 26 Mar 2024 08:10:17 -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; 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 43C9268D26A; Tue, 26 Mar 2024 17:09:57 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from srv-infra-2.infra.inf.glb.tvvideoms.com (www.inf.tvvideoms.com [213.205.126.156]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F40ED68D0A6 for ; Tue, 26 Mar 2024 17:09:49 +0200 (EET) Received: from cji.paris (unknown [172.16.3.159]) by srv-infra-2.infra.inf.glb.tvvideoms.com (Postfix) with ESMTP id F2CB44135E; Tue, 26 Mar 2024 15:09:48 +0000 (UTC) From: Nicolas Gaullier To: ffmpeg-devel@ffmpeg.org Date: Tue, 26 Mar 2024 16:09:46 +0100 Message-Id: <20240326150946.314054-2-nicolas.gaullier@cji.paris> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20240326150946.314054-1-nicolas.gaullier@cji.paris> References: <20240326150946.314054-1-nicolas.gaullier@cji.paris> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/1] 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: WX/NY7jpeT1n --- 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 ||