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 2E7F64794E for ; Wed, 27 Dec 2023 04:49:53 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C9F9868CC5A; Wed, 27 Dec 2023 06:49:41 +0200 (EET) Received: from out203-205-251-27.mail.qq.com (out203-205-251-27.mail.qq.com [203.205.251.27]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 49A9668CBD9 for ; Wed, 27 Dec 2023 06:49:33 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1703652563; bh=xy8br2CJIUpaeRHdZUGQ/B6esPdM9ZXXwmiCRJbP0vw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=BL+EvJ8WOp2hcXEBKauAFxkupeWWVmAd9UuiminQE8Mzt2coL7nM2J6UXKuinycxY FdYwClW5P2FsJt2ULDpnJFESlQ6nktGq79ls1BqDlUPe0O/4vTpcvNmInf8x/7vfk6 Rx8yAVmE4Y5AHPDaAniF7QE6kcDAB47oKOy/LBlY= Received: from localhost.localdomain ([119.147.10.193]) by newxmesmtplogicsvrsza1-0.qq.com (NewEsmtp) with SMTP id C55AAC8E; Wed, 27 Dec 2023 12:49:21 +0800 X-QQ-mid: xmsmtpt1703652562ta6ulcl2s Message-ID: X-QQ-XMAILINFO: MQ+wLuVvI2LQdUYbpBrgrk9mSMaQDKf/1nr+MHUifRauEbsyHEUhimSpz/PgyJ 0cpFwbXIrxYyXn+rHqKomz/2HabPzNw4F1L+eshdf7IKTrAMSKvp5EYZhzQmq67eHcE92qBb6GPv dv273YXrKoZRflV0ql61VM7zZdiJKp31F0IrMjSvsKpgT/SAPHWWvEO5Q7noqT8SBmoHddTJEwog w/E65e/CVYqu2BPUpDPdVigYP120CoXZYa3g/0fYYDI5eVedX+O2UmfY1RQuAZqJAL4P5AC2jAxk ksslvaA4sI9qDjsDPqAHYFoGG7KgV75orefi3/B80APRTRMvJ3JGzEIlMEsOKjOqw7+lkfegGRy4 KFumQcuFogKFuWd+wUvI+qY4HAACNU1SOmGPZitwYH02D6ZOvT+9aWXhrdU/ocbYiYsmCTMz3pKZ voNjSckWwhJBd0gc91SobWoee7I1WAn1g0q84J+Iwfc6mxXYmx3jL2mK1ZdeJvkhQWo5rC1/NeDz onN4HBAO5OhVkhcnmslkrBAEw9pupmw6Gs2o+vzs9T9JqDGgOPEHKf5nXdv7wIUxgvLa2jtNgBBV uy+d9F53lFb8h/p9Wtug0kXwD6zU2ah/vb7YCvcXydIvXJxIyRsPsGJ1miLK/OpXqyYjyMtz7BH2 f+Cx9d0Il6Fuqj8C2ujbciELSy8L6bI4PhWEBBLxry65o+I/66g67nilXTIvO4ubcqUIch1zjFMq 2Ek3TPZAWWQ2ZCbKnPdO/wGdCq0ZxXa1dFl+1Tr4X4RPbtcGMS8LYhbJsST4+gOdnhPHyhR9wVV9 On+kamBSsFJ6G+fLWqhsBf+IfQ64tA7HyuSbp3B75V4elLNdnxw+o1OC01xXwnimPlmmzYoPu+lL ELGicK+Km62EBAHX6BmE1reNL9lkQ94vSzeYCubpThWLa03Sy/JojZ1SmkKJa1P2dMsUNC4lch0b L1024tfMplrJFHlarfM5RI7sFGIcRruWvPBHy4gWO2yuKCcZrIEE25L0GnjM+/ERaGR3t78Qw= X-QQ-XMRINFO: Mp0Kj//9VHAxr69bL5MkOOs= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Wed, 27 Dec 2023 20:49:24 +0800 X-OQ-MSGID: <20231227124924.629396-2-quinkblack@foxmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231227124924.629396-1-quinkblack@foxmail.com> References: <20231227124924.629396-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 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 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: 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..32828c5014 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 (!buf[i - 6]) + 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 (!buf[i - 6]) + 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 -- 2.25.1 _______________________________________________ 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".