From patchwork Wed Dec 27 15:30:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 45347 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6623:b0:194:e134:edd4 with SMTP id n35csp3461071pzh; Tue, 26 Dec 2023 23:30:37 -0800 (PST) X-Google-Smtp-Source: AGHT+IFkPArk55dROL4rRJDsr1H1nAiggJq0J/HsKGTtRJ8f7yAYpH7CNr0Dbw+Wy7hBZSOZ6knU X-Received: by 2002:a17:906:d183:b0:a26:5d51:871 with SMTP id c3-20020a170906d18300b00a265d510871mr8857023ejz.3.1703662237360; Tue, 26 Dec 2023 23:30:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703662237; cv=none; d=google.com; s=arc-20160816; b=pnOUkh+MzSxzbKJsaoKURTReV5MjKlsbD3CMQL0q9d5wn2ojdzcI56JKEkMsZE+5v+ zQhnRgUvyFkcMMMNnWF/IfBHj/ZC8oPWONtbWaJ684LXR6bqXIis2EwahB8Fe0zRJ5ab j/zNi2YhcKL/ytYJDO+08H5lNg1wVGTtMMFdYH+hp32kMdne5RXZKgOc7n0ReZRzjr2g SZKPoCMJPSCT3Oynt3J0Mo5ZLTV1xsU8VfFb2PzHonKnOuxidM0S5mjY7Dm5lTT23GCm nxrwFMKSXCLtKcoHJ+mfS+PePjIl+9mLGsROc+KEqHXyZu+P1vnjgMxX7BjdwTotX8Xl THMA== 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:date :to:from:message-id:dkim-signature:delivered-to; bh=RN2gJqd/R9t+h8qW7v1s15+i1pdIu6lM9Y8bgwT0Ouw=; fh=HnHYuZ9XgUo86ZRXTLWWmQxhslYEI9B9taZ5X1DLFfc=; b=Zr/TARs/iQcOLoxviDZwpj2QAVDvkrfB2LWEo22xyadzVZJ44LjLKisR9a8IlHsL+l Q1hWeLOiyykFrTlGNvJgM4lmp1dymhEa9Bbdo9YiON52b7MNzzv9mrXU4v7SuVDllARI ZmevvDyaGVVSjoxlN3eJk6N7p3S5dcmqfqsCKEPqF2qn67CwqDqrtSoNUNLav6vvRPMs 3fcH50woRY4VhWB3pgxihBJ2RVMP6O4uZXeyUT1oBb6QoJX5orFb9tfut3PWcRyeT3uW ZGKIfKnRYhkAANl9A/RI5mKaA+fbk0/FrWRlBwZdp29Y4N6c/G9w6b4xNktTq0poH1Rp KfaA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=ULOU6Bxk; 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=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id gh37-20020a1709073c2500b00a26dc904216si3355093ejc.190.2023.12.26.23.30.36; Tue, 26 Dec 2023 23:30:37 -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; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=ULOU6Bxk; 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=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 73F0768CC2A; Wed, 27 Dec 2023 09:30:32 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-221-149.mail.qq.com (out203-205-221-149.mail.qq.com [203.205.221.149]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 712FD68CA1F for ; Wed, 27 Dec 2023 09:30:23 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1703662215; bh=Q/xXzDAtEru23iFRfsNWpwpoObHqQFUoGbum9aFwWqM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=ULOU6Bxk5pNHBn16q3hZblY2IEzG0jhaR656ZwD6eNEUrotMF5xso9HWTbnpc2vFM lUO/zyi48AsG+6J/Jf+UyE5/3Z4NnR9Bu3ZgXYEYjPmijfgGoJcGLyoWqNjIF8BCwl gr/pRfuDoY0iBCgzqDkA9YCJOfGLdTbGuV3sLb/w= Received: from localhost.localdomain ([113.108.77.50]) by newxmesmtplogicsvrszc5-2.qq.com (NewEsmtp) with SMTP id 78E2FCB2; Wed, 27 Dec 2023 15:30:14 +0800 X-QQ-mid: xmsmtpt1703662214t40ca0gvn Message-ID: X-QQ-XMAILINFO: M/NR0wiIuy70pgZa/WcfiCNZPuiJkSShpV8E1kIO23wiguHnLm15H7roGZzGj2 7Vpnoa1f/eufVT6DgjfAAMhwWe1Dp+kP44qxe2JdkQeDd2lCcKU5FAXlJG+aIwKbgsh54UmyIPy8 JTHl5+3ZpTQ7OngydjrcK6g385+Mw+0X3W9O7Fa1B8trZchaTvthi1zCU//5guC7OSEYCjtY8I6S L68MDLdhnFGOM48HivUkpesLBGiyB3dVnurSNJhV4bjLodX3gvWqpg7uN878Ep8x5i1lgZzc9/3B kf5gnoA6rvH9oNZ74EPbucFi/DCQ3cY7tPfYeVJtiXL3qLAI1NTE4MrwVESim9Adls1iMH1KbSOl +sYQsdARpXdIhF7H30HrFLUulBnivXbBoKFKNp4gdfhsK8TvOrHTDqD+jP19rATKRY3NtevsD7qS kzpSf+t+jKWc+aKT7hxR3D4m/rJeztymP+M/zRC8WVaPDADVUeHHnxyP36cDdQfWABQtA48rSPB6 pbLBFE1zFjGk1h6ToaP4DDC2UoPHMbTpJ7Qj0UzCwPX1HgoQ5aUjT/CPD34Pkezo7h4EbEVf+R0h RY16hI1UXV4dmTOjYT4378gIO2Pgwc1XriMWt1eJlM3ZYWwTfP9rg/GjdyDabYdmk85kgygJ5ENJ S8h/UVffupzyrZ/UyfxiI9OCPsPa6VZYJJpNFpAVf11NUs4jFFY2DSc4tfYuvbR/ABtkXuIXWE9s C24WVTaUETONRmSsVMfJL6lhONFy045nZ3yxYoKbE3pIm/ckhGQGeDASv3oN1CUk8NK4CX4krY+7 CM3FVQ1osJpUGwzfLkXR9m4nIGk1qiTQJK1zFZU45C6dk4q1Qb/JEAl1QA7OEXaP5ahyETLOA3Q3 HIVnEzThqYvVU9e++1x88H5FzCrAcu2V9LI0jMDhSIFDJ0ov3qmYzMYTkMXIYRDZDTLr04vLjot7 /MdHcpGEpSRbNPq+nUwtqu46K7ItUyQIMgpY9TMKopZO4aRLy2Lx96uEFzl0pM X-QQ-XMRINFO: NI4Ajvh11aEj8Xl/2s1/T8w= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Wed, 27 Dec 2023 23:30:16 +0800 X-OQ-MSGID: <20231227153016.993862-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 2/2] avcodec/hevc_parser: fix missing zero_byte at frame beginning 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: Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: hVsssF3tKzR7 From: Zhao Zhili The start code is matched against 0x000001, zero_byte was treated as last byte of last frame rather than the beginning of next frame. --- libavcodec/hevc_parser.c | 4 ++++ tests/fate/hevc.mak | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/libavcodec/hevc_parser.c b/libavcodec/hevc_parser.c index 87270cffb4..99a4272fad 100644 --- a/libavcodec/hevc_parser.c +++ b/libavcodec/hevc_parser.c @@ -278,6 +278,8 @@ static int hevc_find_frame_end(AVCodecParserContext *s, const uint8_t *buf, (nut >= 41 && nut <= 44) || (nut >= 48 && nut <= 55)) { if (pc->frame_start_found) { pc->frame_start_found = 0; + if (!((pc->state64 >> 6 * 8) & 0xFF)) + return i - 6; return i - 5; } } else if (nut <= HEVC_NAL_RASL_R || @@ -288,6 +290,8 @@ static int hevc_find_frame_end(AVCodecParserContext *s, const uint8_t *buf, pc->frame_start_found = 1; } else { // First slice of next frame found pc->frame_start_found = 0; + if (!((pc->state64 >> 6 * 8) & 0xFF)) + return i - 6; return i - 5; } } diff --git a/tests/fate/hevc.mak b/tests/fate/hevc.mak index b3c6792140..4889ee8237 100644 --- a/tests/fate/hevc.mak +++ b/tests/fate/hevc.mak @@ -222,7 +222,7 @@ FATE_HEVC-$(call ALLYES, HEVC_DEMUXER MOV_DEMUXER HEVC_PARSER HEVC_MP4TOANNEXB_B fate-hevc-bsf-mp4toannexb: tests/data/hevc-mp4.mov fate-hevc-bsf-mp4toannexb: CMD = md5 -i $(TARGET_PATH)/tests/data/hevc-mp4.mov -c:v copy -fflags +bitexact -f hevc fate-hevc-bsf-mp4toannexb: CMP = oneline -fate-hevc-bsf-mp4toannexb: REF = 1873662a3af1848c37e4eb25722c8df9 +fate-hevc-bsf-mp4toannexb: REF = 73019329ed7f81c24f9af67c34c640c0 fate-hevc-skiploopfilter: CMD = framemd5 -skip_loop_filter nokey -i $(TARGET_SAMPLES)/hevc-conformance/SAO_D_Samsung_5.bit -sws_flags bitexact FATE_HEVC-$(call FRAMEMD5, HEVC, HEVC, HEVC_PARSER) += fate-hevc-skiploopfilter