From patchwork Fri Mar 1 13:39:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Gaullier X-Patchwork-Id: 46685 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a919:b0:19e:cdac:8cce with SMTP id cd25csp1269006pzb; Fri, 1 Mar 2024 05:40:17 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCUdtpQylIc7l0hfN7GdgX47xMgwSpkO5JqdpWQfbRFVuXmy4qgEdT1Su5FVx0GN3xX3d8ZqaNG2p2pqxHAxYMF0ACfDU2nuKYgFqA== X-Google-Smtp-Source: AGHT+IE7q+CcOtxzMMX6xD3KzLWChpjs4fYJCcaWA5ALkFFZIbjJNNbK2uxE9cFIgtZKsYAOyxds X-Received: by 2002:a05:6402:335:b0:566:9d06:1d68 with SMTP id q21-20020a056402033500b005669d061d68mr1178083edw.4.1709300417172; Fri, 01 Mar 2024 05:40:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1709300417; cv=none; d=google.com; s=arc-20160816; b=iBB9l+pKFeYSXXOgpyOUZAkPOlCOF8rJE/pvc4cqKha38+vIVrp1OdiLdL+eew1ERR SiDvQPCH1o6Bk6+HAXZ6eSPzbttw+MLkMmMdh5efy/6dCKn2DIEwNuytVkbijCQQdadY yLPeGrDyU7fmmxwOC3k4zu6OiTxXDszg7PYq3NM7EGlzK/Sd4DN4Kf01FyQZW3QbL9Jx 2+K0vQshfNg8M0hz3jFlsdPLFcA831cG0jTKmE0zaT0ByNYDJ4PbtWVX1j1osiPBnj2J FFZDv31degvxGrS3CmZDGor55n65kjmY993zYvEIkTc47DSFLwkXkUWtmX2MsIPOEFS2 ql6w== 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=+G/mQyyB40ki36C1AhlUcb88yZZPFN1yhXkJym7ryQY=; fh=zgMS+X4RExv2k7fU8QdWClnqVJdqO/9UbUuBS5xxJDs=; b=UkjWEmP2ZsutQKNMp1Re3qCvs+2xho1uBFbMFh5vYhQXH7CWkm/R5JINZ6w6rsMqpf 7246uZGLP7Y7vmAOAseEM5iDDTy361ggZmS8xcKXLAIcHZnfNy6PYi4ymRBRKmu4ci6c tjwRaixLTtg3v7+GQ9NsUqANj//WhAdy9YydSOY/L/QSStN8m2DSIeL7sJxqt3S+IpuI h3UV5O9ZML6v6RwWJx6/tHtYZazQxzgZHcF6ycfXxUH2F/klUCcmwqnPZXjE+asHjEyW urMhGWTpFPn1USyZ+xLwDYiAms1VysjfmMDAKZ+gvxYXRvsv+RpelgS/DDwmyyTvOkDK YEZw==; 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 y8-20020aa7ccc8000000b005657b632d53si1409949edt.579.2024.03.01.05.40.16; Fri, 01 Mar 2024 05:40:17 -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 D023568D286; Fri, 1 Mar 2024 15:39:37 +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 9CD9068D256 for ; Fri, 1 Mar 2024 15:39:26 +0200 (EET) Received: from cji.paris (unknown [172.16.3.159]) by srv-infra-1.infra.inf.glb.tvvideoms.com (Postfix) with ESMTP id 242EE215EC; Fri, 1 Mar 2024 13:39:26 +0000 (UTC) From: Nicolas Gaullier To: ffmpeg-devel@ffmpeg.org Date: Fri, 1 Mar 2024 14:39:22 +0100 Message-Id: <20240301133923.1132924-5-nicolas.gaullier@cji.paris> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20240301133923.1132924-1-nicolas.gaullier@cji.paris> References: <20240301133923.1132924-1-nicolas.gaullier@cji.paris> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 4/5] 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: d69I5F0quwWt Signed-off-by: Nicolas Gaullier --- 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 ||